deprecate: legacy query runner

distantnative · distantnative · commit 6f477ceb9a44 · 2025-05-10T22:29:37.000+02:00
diff --git a/src/Query/Argument.php b/src/Query/Argument.php
@@ -14,6 +14,8 @@
  * @link      https://getkirby.com
  * @copyright Bastian Allgeier
  * @license   https://opensource.org/licenses/MIT
+ *
+ * @todo Deprecate in v6
  */
 class Argument
 {
diff --git a/src/Query/Arguments.php b/src/Query/Arguments.php
@@ -15,6 +15,8 @@
  * @copyright Bastian Allgeier
  * @license   https://opensource.org/licenses/MIT
  *
+ * @todo Deprecate in v6
+ *
  * @extends \Kirby\Toolkit\Collection<\Kirby\Query\Argument>
  */
 class Arguments extends Collection
diff --git a/src/Query/Expression.php b/src/Query/Expression.php
@@ -14,6 +14,8 @@
  * @link      https://getkirby.com
  * @copyright Bastian Allgeier
  * @license   https://opensource.org/licenses/MIT
+ *
+ * @todo Deprecate in v6
  */
 class Expression
 {
diff --git a/src/Query/Segment.php b/src/Query/Segment.php
@@ -16,6 +16,8 @@
  * @link      https://getkirby.com
  * @copyright Bastian Allgeier
  * @license   https://opensource.org/licenses/MIT
+ *
+ * @todo Deprecate in v6
  */
 class Segment
 {
diff --git a/src/Query/Segments.php b/src/Query/Segments.php
@@ -15,6 +15,8 @@
  * @copyright Bastian Allgeier
  * @license   https://opensource.org/licenses/MIT
  *
+ * @todo Deprecate in v6
+ *
  * @extends \Kirby\Toolkit\Collection<\Kirby\Query\Segment>
  */
 class Segments extends Collection
diff --git a/tests/Query/ArgumentTest.php b/tests/Query/ArgumentTest.php
@@ -7,6 +7,7 @@
 
 /**
  * @coversDefaultClass \Kirby\Query\Argument
+ * @todo Deprecate in v6
  */
 class ArgumentTest extends TestCase
 {
diff --git a/tests/Query/ArgumentsTest.php b/tests/Query/ArgumentsTest.php
@@ -6,6 +6,7 @@
 
 /**
  * @coversDefaultClass \Kirby\Query\Arguments
+ * @todo Deprecate in v6
  */
 class ArgumentsTest extends TestCase
 {
diff --git a/tests/Query/ExpressionTest.php b/tests/Query/ExpressionTest.php
@@ -7,6 +7,7 @@
 
 /**
  * @coversDefaultClass \Kirby\Query\Expression
+ * @todo Deprecate in v6
  */
 class ExpressionTest extends TestCase
 {
diff --git a/tests/Query/QueryLegacyTest.php b/tests/Query/QueryLegacyTest.php
@@ -3,12 +3,11 @@
 namespace Kirby\Query;
 
 use Closure;
-use Kirby\TestCase;
 
 /**
  * @coversDefaultClass \Kirby\Query\Query
  */
-class QueryTest extends TestCase
+class QueryLegacyTest extends \PHPUnit\Framework\TestCase
 {
 	/**
 	 * @covers ::__construct
diff --git a/tests/Query/SegmentTest.php b/tests/Query/SegmentTest.php
@@ -36,6 +36,7 @@ public function __get($name)
 
 /**
  * @coversDefaultClass \Kirby\Query\Segment
+ * @todo Deprecate in v6
  */
 class SegmentTest extends TestCase
 {
diff --git a/tests/Query/SegmentsTest.php b/tests/Query/SegmentsTest.php
@@ -9,6 +9,7 @@
 
 /**
  * @coversDefaultClass \Kirby\Query\Segments
+ * @todo Deprecate in v6
  */
 class SegmentsTest extends TestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@`
`14`	`14`	`* @link https://getkirby.com`
`15`	`15`	`* @copyright Bastian Allgeier`
`16`	`16`	`* @license https://opensource.org/licenses/MIT`
	`17`	`+ *`
	`18`	`+ * @todo Deprecate in v6`
`17`	`19`	`*/`
`18`	`20`	`class Argument`
`19`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`* @copyright Bastian Allgeier`
`16`	`16`	`* @license https://opensource.org/licenses/MIT`
`17`	`17`	`*`
	`18`	`+ * @todo Deprecate in v6`
	`19`	`+ *`
`18`	`20`	`* @extends \Kirby\Toolkit\Collection<\Kirby\Query\Argument>`
`19`	`21`	`*/`
`20`	`22`	`class Arguments extends Collection`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@`
`16`	`16`	`* @link https://getkirby.com`
`17`	`17`	`* @copyright Bastian Allgeier`
`18`	`18`	`* @license https://opensource.org/licenses/MIT`
	`19`	`+ *`
	`20`	`+ * @todo Deprecate in v6`
`19`	`21`	`*/`
`20`	`22`	`class Segment`
`21`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`	`/**`
`9`	`9`	`* @coversDefaultClass \Kirby\Query\Argument`
	`10`	`+ * @todo Deprecate in v6`
`10`	`11`	`*/`
`11`	`12`	`class ArgumentTest extends TestCase`
`12`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`
`7`	`7`	`/**`
`8`	`8`	`* @coversDefaultClass \Kirby\Query\Arguments`
	`9`	`+ * @todo Deprecate in v6`
`9`	`10`	`*/`
`10`	`11`	`class ArgumentsTest extends TestCase`
`11`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`	`/**`
`9`	`9`	`* @coversDefaultClass \Kirby\Query\Expression`
	`10`	`+ * @todo Deprecate in v6`
`10`	`11`	`*/`
`11`	`12`	`class ExpressionTest extends TestCase`
`12`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ public function __get($name)`
`36`	`36`
`37`	`37`	`/**`
`38`	`38`	`* @coversDefaultClass \Kirby\Query\Segment`
	`39`	`+ * @todo Deprecate in v6`
`39`	`40`	`*/`
`40`	`41`	`class SegmentTest extends TestCase`
`41`	`42`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`
`10`	`10`	`/**`
`11`	`11`	`* @coversDefaultClass \Kirby\Query\Segments`
	`12`	`+ * @todo Deprecate in v6`
`12`	`13`	`*/`
`13`	`14`	`class SegmentsTest extends TestCase`
`14`	`15`	`{`