Leave legacy query as default runner for now

Author: distantnative

src/Query/Argument.php

@@ -15,7 +15,7 @@
  * @copyright Bastian Allgeier
  * @license   https://opensource.org/licenses/MIT
  *
- * @deprecated 6.0.0 Will be removed in Kirby 7
+ * @todo Deprecate in v6
  */
 class Argument
 {

src/Query/Arguments.php

@@ -15,7 +15,7 @@
  * @copyright Bastian Allgeier
  * @license   https://opensource.org/licenses/MIT
  *
- * @deprecated 6.0.0 Will be removed in Kirby 7
+ * @todo Deprecate in v6
  *
  * @extends \Kirby\Toolkit\Collection<\Kirby\Query\Argument>
  */

src/Query/Expression.php

@@ -15,7 +15,7 @@
  * @copyright Bastian Allgeier
  * @license   https://opensource.org/licenses/MIT
  *
- * @deprecated 6.0.0 Will be removed in Kirby 7
+ * @todo Deprecate in v6
  */
 class Expression
 {

src/Query/Query.php

@@ -76,9 +76,10 @@ public function resolve(array|object $data = []): mixed
 			return $data;
 		}
 
+		// TODO: switch to 'interpreted' as default in v6
 		// TODO: remove in v7
 		// @codeCoverageIgnoreStart
-		$mode = App::instance()->option('query.runner', 'interpreted');
+		$mode = App::instance()->option('query.runner', 'legacy');
 
 		if ($mode === 'legacy') {
 			return $this->resolve_legacy($data);

src/Query/Segment.php

@@ -17,7 +17,7 @@
  * @copyright Bastian Allgeier
  * @license   https://opensource.org/licenses/MIT
  *
- * @deprecated 6.0.0 Will be removed in Kirby 7
+ * @todo Deprecate in v6
  */
 class Segment
 {

src/Query/Segments.php

@@ -15,7 +15,7 @@
  * @copyright Bastian Allgeier
  * @license   https://opensource.org/licenses/MIT
  *
- * @deprecated 6.0.0 Will be removed in Kirby 7
+ * @todo Deprecate in v6
  *
  * @extends \Kirby\Toolkit\Collection<\Kirby\Query\Segment>
  */

tests/Query/ArgumentTest.php

@@ -7,7 +7,7 @@
 
 /**
  * @coversDefaultClass \Kirby\Query\Argument
- * @deprecated 6.0.0 Will be removed in Kirby 7
+ * @todo Deprecate in v6
  */
 class ArgumentTest extends TestCase
 {

tests/Query/ArgumentsTest.php

@@ -6,7 +6,7 @@
 
 /**
  * @coversDefaultClass \Kirby\Query\Arguments
- * @deprecated 6.0.0 Will be removed in Kirby 7
+ * @todo Deprecate in v6
  */
 class ArgumentsTest extends TestCase
 {

tests/Query/ExpressionTest.php

@@ -7,7 +7,7 @@
 
 /**
  * @coversDefaultClass \Kirby\Query\Expression
- * @deprecated 6.0.0 Will be removed in Kirby 7
+ * @todo Deprecate in v6
  */
 class ExpressionTest extends TestCase
 {

tests/Query/QueryTest.php renamed to tests/Query/QueryInterpretedTest.php

@@ -12,8 +12,19 @@
 /**
  * @coversDefaultClass \Kirby\Query\Query
  */
-class QueryTest extends TestCase
+class QueryInterpretedTest extends TestCase
 {
+	protected function setUp(): void
+	{
+		new App([
+			'options' => [
+				'query' => [
+					'runner' => 'interpreted'
+				]
+			]
+		]);
+	}
+
 	protected function tearDown(): void
 	{
 		App::destroy();

tests/Query/QueryLegacyTest.php

@@ -0,0 +1,94 @@
+<?php
+
+namespace Kirby\Query;
+
+use Closure;
+
+/**
+ * @coversDefaultClass Kirby\Query\Query
+ */
+class QueryLegacyTest extends \PHPUnit\Framework\TestCase
+{
+	/**
+	 * @covers ::__construct
+	 * @covers ::factory
+	 */
+	public function testFactory()
+	{
+		$query = Query::factory(' user.me ');
+		$this->assertSame('user.me', $query->query);
+	}
+
+	/**
+	 * @covers ::intercept
+	 */
+	public function testIntercept()
+	{
+		$query = new Query('kirby');
+		$this->assertSame('foo', $query->intercept('foo'));
+	}
+
+	/**
+	 * @covers ::resolve
+	 */
+	public function testResolve()
+	{
+		$query = new Query("user.self.likes(['(', ')']).self.drink");
+		$data  = ['user' => new TestUser()];
+		$this->assertSame(['gin', 'tonic', 'cucumber'], $query->resolve($data));
+	}
+
+	/**
+	 * @covers ::resolve
+	 */
+	public function testResolveWithEmptyQuery()
+	{
+		$query = new Query('');
+		$data = ['foo' => 'bar'];
+		$this->assertSame($data, $query->resolve($data));
+	}
+
+	/**
+	 * @covers ::resolve
+	 */
+	public function testResolveWithComparisonExpresion()
+	{
+		$query = new Query('user.nothing ?? (user.nothing ?? user.isYello(false)) ? user.says("error") : (user.nothing ?? user.says("success"))');
+		$data  = ['user' => new TestUser()];
+		$this->assertSame('success', $query->resolve($data));
+	}
+
+	/**
+	 * @covers ::resolve
+	 */
+	public function testResolveWithExactArrayMatch()
+	{
+		$query = new Query('user');
+		$this->assertSame('homer', $query->resolve(['user' => 'homer']));
+
+		$query = new Query('user.username');
+		$this->assertSame('homer', $query->resolve(['user.username' => 'homer']));
+
+		$query = new Query('user.callback');
+		$this->assertSame('homer', $query->resolve(['user.callback' => fn () => 'homer']));
+	}
+
+	/**
+	 * @covers ::resolve
+	 */
+	public function testResolveWithClosureArgument()
+	{
+		$query = new Query('foo.bar(() => foo.homer)');
+		$data  = [
+			'foo' => [
+				'bar'   => fn ($callback) => $callback,
+				'homer' => 'simpson'
+			]
+		];
+
+		$bar = $query->resolve($data);
+		$this->assertInstanceOf(Closure::class, $bar);
+		$bar = $bar();
+		$this->assertSame('simpson', $bar);
+	}
+}

tests/Query/SegmentTest.php

@@ -36,7 +36,7 @@ public function __get($name)
 
 /**
  * @coversDefaultClass \Kirby\Query\Segment
- * @deprecated 6.0.0 Will be removed in Kirby 7
+ * @todo Deprecate in v6
  */
 class SegmentTest extends TestCase
 {

tests/Query/SegmentsTest.php

@@ -9,7 +9,7 @@
 
 /**
  * @coversDefaultClass \Kirby\Query\Segments
- * @deprecated 6.0.0 Will be removed in Kirby 7
+ * @todo Deprecate in v6
  */
 class SegmentsTest extends TestCase
 {