Fixing Query::count() so that formatters added in beforeFind are not

executed

src/ORM/Query.php

@@ -914,20 +914,19 @@ public function count() {
 
 		$count = ['count' => $query->func()->count('*')];
 		if (!count($query->clause('group')) && !$query->clause('distinct')) {
-			return (int)$query
+			$statement = $query
 				->select($count, true)
-				->hydrate(false)
-				->first()['count'];
+				->execute();
+		} else {
+			// Forcing at least one field to be selected
+			$query->select($query->newExpr()->add('1'));
+			$statement = $this->connection()->newQuery()
+				->select($count)
+				->from(['count_source' => $query])
+				->execute();
 		}
 
-		// Forcing at least one field to be selected
-		$query->select($query->newExpr()->add('1'));
-		$statement = $this->connection()->newQuery()
-			->select($count)
-			->from(['count_source' => $query])
-			->execute();
 		$result = $statement->fetch('assoc')['count'];
-
 		$statement->closeCursor();
 		return (int)$result;
 	}