Removed deprecated methods from query object

Author: remorhaz

CHANGELOG.md

@@ -6,8 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Added
-- Added `QueryInterface::isDefinite()` method that returns true if given query can address
-only one value.
+- Query object now provides properties interface with `isPath` and `isDefinite` flags.
 - `QueryCallbackBuilderInterface` implemented.
 ### Deprecated
 - `SelectResultInterface::encode()` method deprecates `::toJson()`.

src/Query/Exception/PropertiesNotFoundException.php

@@ -11,6 +11,6 @@ final class PropertiesNotFoundException extends LogicException implements Except
 
     public function __construct(Throwable $previous = null)
     {
-        parent::__construct("IsDefinite flag is accessed before being set", 0, $previous);
+        parent::__construct("Properties are accessed before being set", 0, $previous);
     }
 }

src/Query/LazyQuery.php

@@ -31,17 +31,6 @@ public function __invoke(RuntimeInterface $runtime, NodeValueInterface $rootNode
         return $this->getLoadedQuery()($runtime, $rootNode);
     }
 
-    /**
-     * @return bool
-     * @deprecated
-     */
-    public function isDefinite(): bool
-    {
-        return $this
-            ->getProperties()
-            ->isDefinite();
-    }
-
     public function getProperties(): QueryPropertiesInterface
     {
         return $this

src/Query/Query.php

@@ -26,15 +26,6 @@ public function __invoke(RuntimeInterface $runtime, NodeValueInterface $rootNode
         return call_user_func($this->callback, $runtime, $rootNode);
     }
 
-    /**
-     * @return bool
-     * @deprecated
-     */
-    public function isDefinite(): bool
-    {
-        return $this->properties->isDefinite();
-    }
-
     public function getProperties(): QueryPropertiesInterface
     {
         return $this->properties;

src/Query/QueryInterface.php

@@ -12,11 +12,5 @@ interface QueryInterface
 
     public function __invoke(RuntimeInterface $runtime, NodeValueInterface $rootNode): ValueListInterface;
 
-    /**
-     * @return bool
-     * @deprecated
-     */
-    public function isDefinite(): bool;
-
     public function getProperties(): QueryPropertiesInterface;
 }

tests/Parser/TranslationSchemeTest.php

@@ -29,7 +29,7 @@ public function testAllMethods_AssembledWithParser_QueryWorksAsExpected(
     ): void {
         $query = QueryFactory::create()->createQuery($path);
         // TODO: extract isDefinite test
-        self::assertSame($isDefinite, $query->isDefinite());
+        self::assertSame($isDefinite, $query->getProperties()->isDefinite());
 
         $result = Processor::create()->select(
             $query,

…/IsDefiniteFlagNotFoundExceptionTest.php …tion/PropertiesNotFoundExceptionTest.phptests/Query/Exception/IsDefiniteFlagNotFoundExceptionTest.php renamed to tests/Query/Exception/PropertiesNotFoundExceptionTest.php tests/Query/Exception/IsDefiniteFlagNotFoundExceptionTest.php renamed to tests/Query/Exception/PropertiesNotFoundExceptionTest.php

@@ -10,13 +10,13 @@
 /**
  * @covers \Remorhaz\JSON\Path\Query\Exception\PropertiesNotFoundException
  */
-class IsDefiniteFlagNotFoundExceptionTest extends TestCase
+class PropertiesNotFoundExceptionTest extends TestCase
 {
 
     public function testGetMessage_Constructed_ReturnsMatchingValue(): void
     {
         $exception = new PropertiesNotFoundException;
-        self::assertSame('IsDefinite flag is accessed before being set', $exception->getMessage());
+        self::assertSame('Properties are accessed before being set', $exception->getMessage());
     }
 
     public function testGetCode_Always_ReturnsZero(): void

tests/Query/QueryPropertiesTest.php

@@ -0,0 +1,56 @@
+<?php
+declare(strict_types=1);
+
+namespace Remorhaz\JSON\Path\Test\Query;
+
+use PHPUnit\Framework\TestCase;
+use Remorhaz\JSON\Path\Query\QueryProperties;
+
+/**
+ * @covers \Remorhaz\JSON\Path\Query\QueryProperties
+ */
+class QueryPropertiesTest extends TestCase
+{
+
+    /**
+     * @param bool $isDefinite
+     * @param bool $expectedValue
+     * @dataProvider providerIsDefinite
+     */
+    public function testIsDefinite_ConstructedWithIsDefiniteFlag_ReturnsSameValue(
+        bool $isDefinite,
+        bool $expectedValue
+    ): void {
+        $properties = new QueryProperties($isDefinite, false);
+        self::assertSame($expectedValue, $properties->isDefinite());
+    }
+
+    public function providerIsDefinite(): array
+    {
+        return [
+            'TRUE' => [true, true],
+            'FALSE' => [false, false],
+        ];
+    }
+
+    /**
+     * @param bool $isPath
+     * @param bool $expectedValue
+     * @dataProvider providerIsPath
+     */
+    public function testIsPath_ConstructedWithIsPathFlag_ReturnsSameValue(
+        bool $isPath,
+        bool $expectedValue
+    ): void {
+        $properties = new QueryProperties(false, $isPath);
+        self::assertSame($expectedValue, $properties->isPath());
+    }
+
+    public function providerIsPath(): array
+    {
+        return [
+            'TRUE' => [true, true],
+            'FALSE' => [false, false],
+        ];
+    }
+}