cs fixes

Author: distantnative

src/Query/Parsers/Parser.php

@@ -34,7 +34,8 @@ class Parser
 	 */
 	protected Iterator $tokens;
 
-	public function __construct(string|Iterator $query) {
+	public function __construct(string|Iterator $query)
+	{
 		if (is_string($query) === true) {
 			$tokenizer = new Tokenizer($query);
 			$query     = $tokenizer->tokens();
@@ -121,7 +122,7 @@ private function atomic(): Node
 				 * Assert that all elements are VariableNodes
 				 * @var VariableNode[] $list
 				 */
-				foreach($list as $element) {
+				foreach ($list as $element) {
 					if ($element instanceof VariableNode === false) {
 						throw new Exception('Expecting only variables in closure argument list.');
 					}
@@ -178,7 +179,7 @@ private function coalesce(): Node
 	/**
 	 * Collect the next token of a type
 	 *
-	 * @throws Exception when next token is not of specified type
+	 * @throws \Exception when next token is not of specified type
 	 */
 	protected function consume(
 		TokenType $type,

src/Query/Parsers/Tokenizer.php

@@ -84,7 +84,7 @@ public static function match(
 	 *
 	 * @param int $current The current position in the source string
 	 *
-	 * @throws Exception If an unexpected character is encountered
+	 * @throws \Exception If an unexpected character is encountered
 	 */
 	public static function token(string $query, int $current): Token
 	{

src/Query/Runners/Interpreted.php

@@ -59,7 +59,7 @@ functions: $self->functions,
 	 *
 	 * @param array $context Optional variables to be passed to the query
 	 *
-	 * @throws Exception when query is invalid or executor not callable
+	 * @throws \Exception when query is invalid or executor not callable
 	 */
 	public function run(string $query, array $context = []): mixed
 	{

src/Query/Runners/Runner.php

@@ -4,7 +4,6 @@
 
 use ArrayAccess;
 use Closure;
-use Exception;
 use Kirby\Query\Query;
 
 /**
@@ -38,7 +37,7 @@ abstract public static function for(Query $query): static;
 	 *
 	 * @param array $context Optional variables to be passed to the query
 	 *
-	 * @throws Exception when query is invalid or executor not callable
+	 * @throws \Exception when query is invalid or executor not callable
 	 */
 	abstract public function run(string $query, array $context = []): mixed;
 }

src/Query/Runners/Transpiled.php

@@ -4,7 +4,6 @@
 
 use ArrayAccess;
 use Closure;
-use Exception;
 use Kirby\Cms\App;
 use Kirby\Filesystem\F;
 use Kirby\Query\AST\Node;
@@ -138,7 +137,7 @@ protected function resolver(string $query): Closure
 	 *
 	 * @param array $context Optional variables to be passed to the query
 	 *
-	 * @throws Exception when query is invalid or executor not callable
+	 * @throws \Exception when query is invalid or executor not callable
 	 */
 	public function run(string $query, array $context = []): mixed
 	{

tests/Query/AST/ArgumentListNodeTest.php

@@ -2,8 +2,8 @@
 
 namespace Kirby\Query\AST;
 
-use Kirby\Query\Visitors\Transpiler;
 use Kirby\Query\Visitors\Interpreter;
+use Kirby\Query\Visitors\Transpiler;
 use Kirby\TestCase;
 
 /**

tests/Query/AST/ArrayListNodeTest.php

@@ -2,8 +2,8 @@
 
 namespace Kirby\Query\AST;
 
-use Kirby\Query\Visitors\Transpiler;
 use Kirby\Query\Visitors\Interpreter;
+use Kirby\Query\Visitors\Transpiler;
 use Kirby\TestCase;
 
 /**

tests/Query/AST/ClosureNodeTest.php

@@ -2,8 +2,8 @@
 
 namespace Kirby\Query\AST;
 
-use Kirby\Query\Visitors\Transpiler;
 use Kirby\Query\Visitors\Interpreter;
+use Kirby\Query\Visitors\Transpiler;
 use Kirby\TestCase;
 
 /**
@@ -33,7 +33,7 @@ public function testResolve(): void
 		$visitor = new Transpiler();
 		$this->assertSame(
 			'fn($_3904355907, $_1908338681) => ($_3904355907 ?? $_1908338681)',
-			 $node->resolve($visitor)
+			$node->resolve($visitor)
 		);
 	}
 }

tests/Query/AST/CoalesceNodeTest.php

@@ -2,8 +2,8 @@
 
 namespace Kirby\Query\AST;
 
-use Kirby\Query\Visitors\Transpiler;
 use Kirby\Query\Visitors\Interpreter;
+use Kirby\Query\Visitors\Transpiler;
 use Kirby\TestCase;
 
 /**

tests/Query/AST/GlobalFunctionNodeTest.php

@@ -2,8 +2,8 @@
 
 namespace Kirby\Query\AST;
 
-use Kirby\Query\Visitors\Transpiler;
 use Kirby\Query\Visitors\Interpreter;
+use Kirby\Query\Visitors\Transpiler;
 use Kirby\TestCase;
 
 /**

tests/Query/AST/LiteralNodeTest.php

@@ -2,8 +2,8 @@
 
 namespace Kirby\Query\AST;
 
-use Kirby\Query\Visitors\Transpiler;
 use Kirby\Query\Visitors\Interpreter;
+use Kirby\Query\Visitors\Transpiler;
 use Kirby\TestCase;
 
 /**

tests/Query/AST/MemberAccessNodeTest.php

@@ -2,11 +2,12 @@
 
 namespace Kirby\Query\AST;
 
-use Kirby\Query\Visitors\Transpiler;
 use Kirby\Query\Visitors\Interpreter;
+use Kirby\Query\Visitors\Transpiler;
 use Kirby\TestCase;
 
-class UserMock {
+class UserMock
+{
 	public function name(): string
 	{
 		return 'foo';
@@ -42,7 +43,7 @@ public function testResolve(): void
 			'name'
 		);
 
-		$context = ['user' => new UserMock];
+		$context = ['user' => new UserMock()];
 
 		// Interpreter
 		$visitor = new Interpreter(context: $context);

tests/Query/AST/TernaryNodeTest.php

@@ -2,8 +2,8 @@
 
 namespace Kirby\Query\AST;
 
-use Kirby\Query\Visitors\Transpiler;
 use Kirby\Query\Visitors\Interpreter;
+use Kirby\Query\Visitors\Transpiler;
 use Kirby\TestCase;
 
 /**

tests/Query/AST/VariableNodeTest.php

@@ -2,8 +2,8 @@
 
 namespace Kirby\Query\AST;
 
-use Kirby\Query\Visitors\Transpiler;
 use Kirby\Query\Visitors\Interpreter;
+use Kirby\Query\Visitors\Transpiler;
 use Kirby\TestCase;
 
 /**

tests/Query/Parsers/ParserTest.php

@@ -2,7 +2,6 @@
 
 namespace Kirby\Query\Parsers;
 
-use Kirby\TestCase;
 use Kirby\Query\AST\ArgumentListNode;
 use Kirby\Query\AST\ArrayListNode;
 use Kirby\Query\AST\ClosureNode;
@@ -12,6 +11,7 @@
 use Kirby\Query\AST\MemberAccessNode;
 use Kirby\Query\AST\TernaryNode;
 use Kirby\Query\AST\VariableNode;
+use Kirby\TestCase;
 
 /**
  * @coversDefaultClass \Kirby\Query\Parsers\Parser

tests/Query/QueryTest.php

@@ -130,7 +130,7 @@ public function testResolveWithInterceptor()
 		$query = new class ('foo.getObj.name') extends Query {
 			public function intercept($result): mixed
 			{
-				if(is_object($result) === true) {
+				if (is_object($result) === true) {
 					$result = clone $result;
 					$result->name .= ' simpson';
 				}

tests/Query/Runners/InterpretedTest.php

@@ -3,7 +3,6 @@
 namespace Kirby\Query\Runners;
 
 use ArrayAccess;
-use Kirby\Query\Runners\Interpreted;
 
 /**
  * @coversDefaultClass \Kirby\Query\Runners\Interpreted

tests/Query/Runners/RuntimeTest.php

@@ -4,7 +4,8 @@
 
 use Exception;
 
-class FooObj {
+class FooObj
+{
 	public string $bax = 'qox';
 
 	public function print(string $string = 'bar'): string
@@ -46,7 +47,7 @@ public function testAccessWithArray(): void
 	 */
 	public function testAccessWithObject(): void
 	{
-		$obj    = new FooObj;
+		$obj    = new FooObj();
 		$result = Runtime::access($obj, 'print');
 		$this->assertSame('bar', $result);
 

tests/Query/Runners/TranspiledTest.php

@@ -3,7 +3,6 @@
 namespace Kirby\Query\Runners;
 
 use Kirby\Query\Parsers\Parser;
-use Kirby\Query\Runners\Transpiled;
 use Kirby\Query\Visitors\Transpiler;
 use Kirby\Toolkit\Str;