Complex read reference evaluators removed

Author: remorhaz

src/Pointer/Evaluate/Advancer.php

@@ -45,6 +45,7 @@ abstract public function advance();
     abstract public function write($data);
 
     /**
+     * @return $this
      * @throws EvaluateException
      */
     abstract public function fail();

src/Pointer/Evaluate/AdvancerIndex.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Remorhaz\JSONPointer\Pointer\Evaluate;
+
+abstract class AdvancerIndex extends Advancer
+{
+
+
+    public function canAdvance()
+    {
+        return array_key_exists($this->getValue(), $this->getDataCursor());
+    }
+
+
+    public function advance()
+    {
+        return $this->setNewDataCursor($this->dataCursor[$this->getValue()]);
+    }
+
+
+    public function write($data)
+    {
+        $this->dataCursor[$this->getValue()] = $data;
+        return $this;
+    }
+
+
+    public function fail()
+    {
+        throw new EvaluateException("Array index {$this->getValueDescription()} is not found");
+    }
+}

src/Pointer/Evaluate/AdvancerNextIndex.php

@@ -2,7 +2,7 @@
 
 namespace Remorhaz\JSONPointer\Pointer\Evaluate;
 
-class AdvancerNextIndex extends Advancer
+class AdvancerNextIndex extends AdvancerIndex
 {
 
 
@@ -25,15 +25,9 @@ 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");
+        throw new LogicException("Next index don't have advanceable key");
     }
 
 

src/Pointer/Evaluate/AdvancerNonNumericIndex.php

@@ -2,31 +2,40 @@
 
 namespace Remorhaz\JSONPointer\Pointer\Evaluate;
 
-class AdvancerNonNumericIndex extends Advancer
+class AdvancerNonNumericIndex extends AdvancerIndex
 {
 
 
-    public function canAdvance()
+    protected $isAllowed = false;
+
+
+    public function allow()
     {
-        return array_key_exists($this->getValue(), $this->getDataCursor());
+        $this->isAllowed = true;
+        return $this;
     }
 
 
-    public function advance()
+    public function forbid()
     {
-        return $this->setNewDataCursor($this->dataCursor[$this->getValue()]);
+        $this->isAllowed = false;
+        return $this;
     }
 
 
-    public function write($data)
+    public function canAdvance()
     {
-        $this->dataCursor[$this->getValue()] = $data;
-        return $this;
+        return $this->isAllowed && parent::canAdvance();
     }
 
 
     public function fail()
     {
-        throw new EvaluateException("Index {$this->getValueDescription()} is not found");
+        if ($this->isAllowed) {
+            return parent::fail();
+        }
+        throw new EvaluateException(
+            "Non-numeric array index {$this->getValueDescription()} is not allowed"
+        );
     }
 }

src/Pointer/Evaluate/AdvancerNumericIndex.php

@@ -2,7 +2,7 @@
 
 namespace Remorhaz\JSONPointer\Pointer\Evaluate;
 
-class AdvancerNumericIndex extends AdvancerNonNumericIndex
+class AdvancerNumericIndex extends AdvancerIndex
 {
 
 

…inter/Evaluate/ReferenceReadProperty.php src/Pointer/Evaluate/ReferenceRead.phpsrc/Pointer/Evaluate/ReferenceReadProperty.php renamed to src/Pointer/Evaluate/ReferenceRead.php src/Pointer/Evaluate/ReferenceReadProperty.php renamed to src/Pointer/Evaluate/ReferenceRead.php

@@ -2,10 +2,9 @@
 
 namespace Remorhaz\JSONPointer\Pointer\Evaluate;
 
-class ReferenceReadProperty extends ReferenceAdvanceable
+class ReferenceRead extends ReferenceAdvanceable
 {
 
-
     protected function performNonExisting()
     {
         $this

src/Pointer/Evaluate/ReferenceReadAllowedNonNumericIndex.php

@@ -8,34 +8,38 @@ class ReferenceReadFactory extends ReferenceEvaluateFactory
 
     protected function createProperty()
     {
-        return ReferenceReadProperty::factory()
+        return ReferenceRead::factory()
             ->setAdvancer(AdvancerProperty::factory());
     }
 
 
     protected function createNextIndex()
     {
-        return ReferenceReadNextIndex::factory();
+        return ReferenceRead::factory()
+            ->setAdvancer(AdvancerNextIndex::factory());
     }
 
 
     protected function createNumericIndex()
     {
-        return ReferenceReadNumericIndex::factory()
+        return ReferenceRead::factory()
             ->setAdvancer(AdvancerNumericIndex::factory());
     }
 
 
     protected function createAllowedNonNumericIndex()
     {
-        return ReferenceReadAllowedNonNumericIndex::factory()
-            ->setAdvancer(AdvancerNonNumericIndex::factory());
+        $advancer = AdvancerNonNumericIndex::factory()
+            ->allow();
+        return ReferenceRead::factory()
+            ->setAdvancer($advancer);
     }
 
 
     protected function createNotAllowedNonNumericIndex()
     {
-        return ReferenceReadNotAllowedNonNumericIndex::factory();
+        return ReferenceRead::factory()
+            ->setAdvancer(AdvancerNonNumericIndex::factory());
     }