Advancers are set from outside of reference evaluators

Author: remorhaz

src/Pointer/Evaluate/Advancer.php

@@ -44,6 +44,11 @@ abstract public function advance();
      */
     abstract public function write($data);
 
+    /**
+     * @throws EvaluateException
+     */
+    abstract public function fail();
+
 
     public static function factory()
     {

src/Pointer/Evaluate/AdvancerNewIndex.php …c/Pointer/Evaluate/AdvancerNextIndex.phpsrc/Pointer/Evaluate/AdvancerNewIndex.php renamed to src/Pointer/Evaluate/AdvancerNextIndex.php src/Pointer/Evaluate/AdvancerNewIndex.php renamed to src/Pointer/Evaluate/AdvancerNextIndex.php

@@ -2,7 +2,7 @@
 
 namespace Remorhaz\JSONPointer\Pointer\Evaluate;
 
-class AdvancerNewIndex extends Advancer
+class AdvancerNextIndex extends Advancer
 {
 
 
@@ -25,6 +25,12 @@ public function write($data)
     }
 
 
+    public function fail()
+    {
+        throw new EvaluateException("Index {$this->getValueDescription()} is not found");
+    }
+
+
     public function getValue()
     {
         throw new LogicException("Next index cannot have advanceable value");

src/Pointer/Evaluate/AdvancerNonNumericIndex.php

@@ -23,4 +23,10 @@ public function write($data)
         $this->dataCursor[$this->getValue()] = $data;
         return $this;
     }
+
+
+    public function fail()
+    {
+        throw new EvaluateException("Index {$this->getValueDescription()} is not found");
+    }
 }

src/Pointer/Evaluate/AdvancerProperty.php

@@ -23,4 +23,10 @@ public function write($data)
         $this->dataCursor->{$this->getValue()} = $data;
         return $this;
     }
+
+
+    public function fail()
+    {
+        throw new EvaluateException("Property {$this->getValueDescription()} is not found");
+    }
 }

src/Pointer/Evaluate/ReferenceAdvanceable.php

@@ -11,11 +11,6 @@ abstract class ReferenceAdvanceable extends ReferenceEvaluate
     protected $advancer;
 
 
-    /**
-     * @return Advancer
-     */
-    abstract protected function createAdvancer();
-
     abstract protected function performNonExisting();
 
     /**
@@ -24,15 +19,23 @@ abstract protected function performNonExisting();
     protected function getAdvancer()
     {
         if (null === $this->advancer) {
-            $this->advancer = $this
+            throw new LogicException("Advancer is not set in reference evaluator");
+            /*$this->advancer = $this
                 ->createAdvancer()
                 ->setReference($this->getReference())
-                ->setDataCursor($this->getDataCursor());
+                ->setDataCursor($this->getDataCursor());*/
         }
         return $this->advancer;
     }
 
 
+    public function setAdvancer(Advancer $advancer)
+    {
+        $this->advancer = $advancer;
+        return $this;
+    }
+
+
     /**
      * Performs reference evaluation.
      *
@@ -42,6 +45,8 @@ public function perform()
     {
         $canAdvance = $this
             ->getAdvancer()
+            ->setReference($this->getReference())
+            ->setDataCursor($this->getDataCursor())
             ->canAdvance();
         if ($canAdvance) {
             $dataCursor = &$this

src/Pointer/Evaluate/ReferenceReadAllowedNonNumericIndex.php

@@ -6,17 +6,10 @@ class ReferenceReadAllowedNonNumericIndex extends ReferenceAdvanceable
 {
 
 
-    protected function createAdvancer()
-    {
-        return AdvancerNonNumericIndex::factory();
-    }
-
-
     protected function performNonExisting()
     {
-        $indexDescription = $this
+        $this
             ->getAdvancer()
-            ->getValueDescription();
-        throw new EvaluateException("No index {$indexDescription} in array");
+            ->fail();
     }
 }

src/Pointer/Evaluate/ReferenceReadFactory.php

@@ -8,7 +8,8 @@ class ReferenceReadFactory extends ReferenceEvaluateFactory
 
     protected function createProperty()
     {
-        return ReferenceReadProperty::factory();
+        return ReferenceReadProperty::factory()
+            ->setAdvancer(AdvancerProperty::factory());
     }
 
 
@@ -20,13 +21,15 @@ protected function createNextIndex()
 
     protected function createNumericIndex()
     {
-        return ReferenceReadNumericIndex::factory();
+        return ReferenceReadNumericIndex::factory()
+            ->setAdvancer(AdvancerNumericIndex::factory());
     }
 
 
     protected function createAllowedNonNumericIndex()
     {
-        return ReferenceReadAllowedNonNumericIndex::factory();
+        return ReferenceReadAllowedNonNumericIndex::factory()
+            ->setAdvancer(AdvancerNonNumericIndex::factory());
     }
 
 

src/Pointer/Evaluate/ReferenceReadNumericIndex.php

@@ -6,17 +6,10 @@ class ReferenceReadNumericIndex extends ReferenceAdvanceable
 {
 
 
-    protected function createAdvancer()
-    {
-        return AdvancerNumericIndex::factory();
-    }
-
-
     protected function performNonExisting()
     {
-        $indexDescription = $this
+        $this
             ->getAdvancer()
-            ->getValueDescription();
-        throw new EvaluateException("No index {$indexDescription} in array");
+            ->fail();
     }
 }

src/Pointer/Evaluate/ReferenceReadProperty.php

@@ -6,17 +6,10 @@ class ReferenceReadProperty extends ReferenceAdvanceable
 {
 
 
-    protected function createAdvancer()
-    {
-        return AdvancerProperty::factory();
-    }
-
-
     protected function performNonExisting()
     {
-        $propertyDescription = $this
+        $this
             ->getAdvancer()
-            ->getValueDescription();
-        throw new EvaluateException("No property {$propertyDescription} in object");
+            ->fail();
     }
 }

src/Pointer/Evaluate/ReferenceTestAllowedNonNumericIndex.php

@@ -6,12 +6,6 @@ class ReferenceTestAllowedNonNumericIndex extends ReferenceAdvanceable
 {
 
 
-    protected function createAdvancer()
-    {
-        return AdvancerNonNumericIndex::factory();
-    }
-
-
     protected function performNonExisting()
     {
         $result = false;