Advancer value renamed to key, reference classes reduced

Author: remorhaz

src/Pointer/Evaluate/Advancer.php

@@ -119,7 +119,7 @@ public function canWrite()
     }
 
 
-    public function getValue()
+    public function getKey()
     {
         return $this
             ->getCursor()
@@ -128,8 +128,8 @@ public function getValue()
     }
 
 
-    public function getValueDescription()
+    public function getKeyDescription()
     {
-        return "'{$this->getValue()}'";
+        return "'{$this->getKey()}'";
     }
 }

src/Pointer/Evaluate/AdvancerIndex.php

@@ -8,15 +8,15 @@ abstract class AdvancerIndex extends Advancer
 
     public function canAdvance()
     {
-        return array_key_exists($this->getValue(), $this->getCursor()->getData());
+        return array_key_exists($this->getKey(), $this->getCursor()->getData());
     }
 
 
     public function advance()
     {
         $data = &$this
             ->getCursor()
-            ->getData()[$this->getValue()];
+            ->getData()[$this->getKey()];
         $this
             ->getCursor()
             ->setData($data);
@@ -26,13 +26,13 @@ public function advance()
 
     public function write($data)
     {
-        $this->getCursor()->getData()[$this->getValue()] = $data;
+        $this->getCursor()->getData()[$this->getKey()] = $data;
         return $this;
     }
 
 
     public function fail()
     {
-        throw new EvaluateException("Array index {$this->getValueDescription()} is not found");
+        throw new EvaluateException("Array index {$this->getKeyDescription()} is not found");
     }
 }

src/Pointer/Evaluate/AdvancerNextIndex.php

@@ -27,13 +27,13 @@ public function write($data)
     }
 
 
-    public function getValue()
+    public function getKey()
     {
         throw new LogicException("Next index don't have advanceable key");
     }
 
 
-    public function getValueDescription()
+    public function getKeyDescription()
     {
         return "'-'";
     }

src/Pointer/Evaluate/AdvancerNonNumericIndex.php

@@ -41,7 +41,7 @@ public function fail()
             return parent::fail();
         }
         throw new EvaluateException(
-            "Non-numeric array index {$this->getValueDescription()} is not allowed"
+            "Non-numeric array index {$this->getKeyDescription()} is not allowed"
         );
     }
 }

src/Pointer/Evaluate/AdvancerNumericIndex.php

@@ -22,15 +22,15 @@ public function forbidGaps()
     }
 
 
-    public function getValue()
+    public function getKey()
     {
-        return (int) parent::getValue();
+        return (int) parent::getKey();
     }
 
 
-    public function getValueDescription()
+    public function getKeyDescription()
     {
-        return "{$this->getValue()}";
+        return "{$this->getKey()}";
     }
 
 
@@ -43,7 +43,7 @@ public function canWrite()
             return true;
         }
         return
-            0 == $this->getValue() && empty($this->getCursor()->getData()) ||
-            array_key_exists($this->getValue() - 1, $this->getCursor()->getData());
+            0 == $this->getKey() && empty($this->getCursor()->getData()) ||
+            array_key_exists($this->getKey() - 1, $this->getCursor()->getData());
     }
 }

src/Pointer/Evaluate/AdvancerProperty.php

@@ -8,7 +8,7 @@ class AdvancerProperty extends Advancer
 
     public function canAdvance()
     {
-        return property_exists($this->getCursor()->getData(), $this->getValue());
+        return property_exists($this->getCursor()->getData(), $this->getKey());
     }
 
 
@@ -17,7 +17,7 @@ public function advance()
         $data = &$this
             ->getCursor()
             ->getData()
-            ->{$this->getValue()};
+            ->{$this->getKey()};
         $this
             ->getCursor()
             ->setData($data);
@@ -30,13 +30,13 @@ public function write($data)
         $this
             ->getCursor()
             ->getData()
-            ->{$this->getValue()} = $data;
+            ->{$this->getKey()} = $data;
         return $this;
     }
 
 
     public function fail()
     {
-        throw new EvaluateException("Property {$this->getValueDescription()} is not found");
+        throw new EvaluateException("Property {$this->getKeyDescription()} is not found");
     }
 }

src/Pointer/Evaluate/LocatorEvaluate.php

@@ -56,7 +56,7 @@ abstract class LocatorEvaluate
     protected $result;
 
     /**
-     * @var ReferenceAdvanceable|null
+     * @var ReferenceEvaluate|null
      */
     protected $referenceEvaluate;
 
@@ -274,13 +274,13 @@ protected function createAdvancerForCursor()
 
 
     /**
-     * @return ReferenceAdvanceable
+     * @return ReferenceEvaluate
      */
     abstract protected function createReferenceEvaluate();
 
 
     /**
-     * @return ReferenceAdvanceable
+     * @return ReferenceEvaluate
      * @throws LogicException
      */
     protected function getReferenceEvaluate()

src/Pointer/Evaluate/ReferenceAdvanceable.php

@@ -2,24 +2,19 @@
 
 namespace Remorhaz\JSONPointer\Pointer\Evaluate;
 
-use Remorhaz\JSONPointer\Locator\Reference;
-
 abstract class ReferenceEvaluate
 {
 
+    /**
+     * @var Advancer|null
+     */
+    protected $advancer;
+
     protected $result;
 
     protected $isResultSet;
 
 
-    /**
-     * Performs reference evaluation.
-     *
-     * @return $this
-     */
-    abstract public function perform();
-
-
     /**
      * Constructor.
      */
@@ -39,25 +34,51 @@ public static function factory()
     }
 
 
-    public function isResultSet()
+    abstract protected function performNonExisting();
+
+
+    /**
+     * @return Advancer
+     */
+    protected function getAdvancer()
     {
-        return $this->isResultSet;
+        if (null === $this->advancer) {
+            throw new LogicException("Advancer is not set in reference evaluator");
+        }
+        return $this->advancer;
+    }
+
+
+    public function setAdvancer(Advancer $advancer)
+    {
+        $this->advancer = $advancer;
+        return $this;
     }
 
 
     /**
-     * Sets evaluation result.
+     * Performs reference evaluation.
      *
-     * @param mixed $result
      * @return $this
      */
-    protected function setResult(&$result)
+    public function perform()
     {
-        $this->result = &$result;
-        $this->isResultSet = true;
-        return $this;
+        $canAdvance = $this
+            ->getAdvancer()
+            ->canAdvance();
+        if ($canAdvance) {
+            $this
+                ->getAdvancer()
+                ->advance();
+            return $this;
+        }
+        return $this->performNonExisting();
     }
 
+    public function isResultSet()
+    {
+        return $this->isResultSet;
+    }
 
     /**
      * Returns evaluation result.
@@ -72,4 +93,17 @@ public function &getResult()
         }
         return $this->result;
     }
+
+    /**
+     * Sets evaluation result.
+     *
+     * @param mixed $result
+     * @return ReferenceEvaluate
+     */
+    protected function setResult(&$result)
+    {
+        $this->result = &$result;
+        $this->isResultSet = true;
+        return $this;
+    }
 }

src/Pointer/Evaluate/ReferenceEvaluate.php

@@ -2,7 +2,7 @@
 
 namespace Remorhaz\JSONPointer\Pointer\Evaluate;
 
-class ReferenceRead extends ReferenceAdvanceable
+class ReferenceRead extends ReferenceEvaluate
 {
 
     protected function performNonExisting()