Visitor: no abstract methods -> strict type hints

src/Query/Visitors/Interpreter.php

@@ -74,7 +74,7 @@ public function coalescence(mixed $left, mixed $right): mixed
 	/**
 	 * Executes global function
 	 */
-	public function function(string $name, $arguments): mixed
+	public function function(string $name, array $arguments = []): mixed
 	{
 		$function = $this->functions[$name] ?? null;
 
@@ -99,7 +99,7 @@ public function literal(mixed $value): mixed
 	public function memberAccess(
 		mixed $object,
 		string|int $member,
-		array|string|null $arguments = null,
+		array|null $arguments = null,
 		bool $nullSafe = false
 	): mixed {
 		if ($this->interceptor !== null) {

src/Query/Visitors/Transpiler.php

@@ -75,16 +75,18 @@ public function closure(ClosureNode $node): string
 	/**
 	 * Converts coalescence operator to string representation
 	 */
-	public function coalescence(mixed $left, mixed $right): string
+	public function coalescence(string $left, string $right): string
 	{
 		return "($left ?? $right)";
 	}
 
 	/**
 	 * Creates string representation for (global) function
 	 */
-	public function function(string $name, $arguments): string
-	{
+	public function function(
+		string $name,
+		string|null $arguments = null
+	): string {
 		if (isset($this->functions[$name]) === false) {
 			throw new Exception("Invalid global function: $name");
 		}
@@ -110,9 +112,9 @@ public function literal(mixed $value): string
 	 * Creates string representation for member access
 	 */
 	public function memberAccess(
-		mixed $object,
+		string $object,
 		string|int $member,
-		array|string|null $arguments = null,
+		string|null $arguments = null,
 		bool $nullSafe = false
 	): string {
 		$this->uses[Runtime::class] = true;
@@ -142,9 +144,9 @@ public static function phpName(string $name): string
 	 * Converts ternary operator to string representation
 	 */
 	public function ternary(
-		mixed $condition,
-		mixed $true,
-		mixed $false
+		string $condition,
+		string|null $true,
+		string $false
 	): string {
 		if ($true === null) {
 			return "($condition ?: $false)";

src/Query/Visitors/Visitor.php

@@ -3,7 +3,6 @@
 namespace Kirby\Query\Visitors;
 
 use Closure;
-use Kirby\Query\AST\ClosureNode;
 
 /**
  * @package   Kirby Query
@@ -13,6 +12,21 @@
  * @copyright Bastian Allgeier
  * @license   https://opensource.org/licenses/MIT
  * @since     6.0.0
+ *
+ * Every visitor class must implement the following methods.
+ * As PHP won't allow increasing the typing specificity, we
+ * aren't actually adding them here in the abstract class, so that
+ * the actual visitor classes can work with much more specific type hints.
+ *
+ * @method mixed argumentList(array $arguments)
+ * @method mixed arrayList(array $elements)
+ * @method mixed closure($ClosureNode $node))
+ * @method mixed coalescence($left, $right)
+ * @method mixed function($name, $arguments)
+ * @method mixed literal($value)
+ * @method mixed memberAccess($object, string|int $member, $arguments, bool $nullSafe = false)
+ * @method mixed ternary($condition, $true, $false)
+ * @method mixed variable(string $name)
  */
 abstract class Visitor
 {
@@ -26,14 +40,4 @@ public function __construct(
 		protected Closure|null $interceptor = null
 	) {
 	}
-
-	abstract public function argumentList(array $arguments);
-	abstract public function arrayList(array $elements);
-	abstract public function closure(ClosureNode $node);
-	abstract public function coalescence(mixed $left, mixed $right);
-	abstract public function function(string $name, $arguments);
-	abstract public function literal(mixed $value);
-	abstract public function memberAccess(mixed $object, string|int $member, array|string|null $arguments = null, bool $nullSafe = false);
-	abstract public function ternary(mixed $condition, mixed $true, mixed $false);
-	abstract public function variable(string $name);
 }

tests/Query/Visitors/InterpreterTest.php

@@ -71,7 +71,7 @@ public function testFunction(): void
 		$visitor = new Interpreter(
 			functions: ['foo' => fn () => 'bar']
 		);
-		$this->assertSame('bar', $visitor->function('foo', []));
+		$this->assertSame('bar', $visitor->function('foo'));
 	}
 
 	/**

tests/Query/Visitors/TranspilerTest.php

@@ -58,8 +58,8 @@ public function testClosure(): void
 	public function testCoalescence(): void
 	{
 		$visitor = new Transpiler();
-		$this->assertSame('(3 ?? 4)', $visitor->coalescence(3, 4));
-		$this->assertSame('( ?? 4)', $visitor->coalescence(null, 4));
+		$this->assertSame('(3 ?? 4)', $visitor->coalescence('3', '4'));
+		$this->assertSame('(NULL ?? 4)', $visitor->coalescence('NULL', '4'));
 	}
 
 	/**
@@ -70,7 +70,7 @@ public function testFunction(): void
 		$visitor = new Transpiler(
 			functions: ['foo' => fn () => 'bar']
 		);
-		$this->assertSame('$functions[\'foo\']()', $visitor->function('foo', null));
+		$this->assertSame('$functions[\'foo\']()', $visitor->function('foo'));
 	}
 
 	/**
@@ -83,7 +83,7 @@ public function testFunctionInvalid(): void
 		$this->expectException(Exception::class);
 		$this->expectExceptionMessage('Invalid global function: fox');
 
-		$visitor->function('fox', null);
+		$visitor->function('fox');
 	}
 
 	/**
@@ -102,6 +102,8 @@ public function testLiteral(): void
 	{
 		$visitor = new Transpiler();
 		$this->assertSame('3', $visitor->literal(3));
+		$this->assertSame('\'string\'', $visitor->literal('string'));
+		$this->assertSame('false', $visitor->literal(false));
 		$this->assertSame('NULL', $visitor->literal(null));
 	}
 
@@ -128,17 +130,15 @@ public function testPhpName(): void
 
 	/**
 	 * @covers ::ternary
-	 *
-	 * TODO: is that right that false/null are missing here
 	 */
 	public function testTernary(): void
 	{
 		$visitor = new Transpiler();
-		$this->assertSame('(1 ? 2 : 3)', $visitor->ternary(true, 2, 3));
-		$this->assertSame('( ? 2 : 3)', $visitor->ternary(false, 2, 3));
+		$this->assertSame('(true ? 2 : 3)', $visitor->ternary('true', '2', '3'));
+		$this->assertSame('(false ? 2 : 3)', $visitor->ternary('false', '2', '3'));
 
-		$this->assertSame('(truthy ?: 3)', $visitor->ternary('truthy', null, 3));
-		$this->assertSame('( ?: 3)', $visitor->ternary(null, null, 3));
+		$this->assertSame('("truthy" ?: 3)', $visitor->ternary('"truthy"', null, '3'));
+		$this->assertSame('(NULL ?: 3)', $visitor->ternary('NULL', null, 3));
 	}
 
 	/**