Minor reference evaluator refactoring

Author: remorhaz

src/Pointer/Evaluate/LocatorEvaluate.php

@@ -256,25 +256,12 @@ protected function setupReferenceEvaluateFactory(Reference $reference)
     }
 
 
-    /**
-     * @param Reference $reference
-     * @return ReferenceEvaluate
-     */
-    protected function createReferenceEvaluate(Reference $reference)
+    protected function setEvaluateForReference(Reference $reference)
     {
-        return $this
+        $this->referenceEvaluate = $this
             ->setupReferenceEvaluateFactory($reference)
             ->getReferenceEvaluateFactory()
-            ->createReferenceEvaluate();
-    }
-
-
-    protected function setupReferenceEvaluate(Reference $reference)
-    {
-        $this->referenceEvaluate = $this
-            ->createReferenceEvaluate($reference)
-            ->setReference($reference)
-            ->setDataCursor($this->dataCursor);
+            ->createEvaluate();
         return $this;
     }
 
@@ -315,7 +302,7 @@ protected function processReference(Reference $reference)
     protected function processReferenceEvaluate(Reference $reference)
     {
         $this
-            ->setupReferenceEvaluate($reference)
+            ->setEvaluateForReference($reference)
             ->getReferenceEvaluate()
             ->perform();
         $this->dataCursor = &$this

src/Pointer/Evaluate/LocatorWrite.php

@@ -70,9 +70,9 @@ protected function createReferenceEvaluateFactory()
     }
 
 
-    protected function setupReferenceEvaluate(Reference $reference)
+    protected function setEvaluateForReference(Reference $reference)
     {
-        $referenceEvaluate = parent::setupReferenceEvaluate($reference)
+        $referenceEvaluate = parent::setEvaluateForReference($reference)
             ->getReferenceEvaluate();
         if ($referenceEvaluate instanceof ReferenceWrite) {
             $referenceEvaluate->setValue($this->getValue());

src/Pointer/Evaluate/ReferenceAdvanceable.php

@@ -8,7 +8,7 @@ abstract class ReferenceAdvanceable extends ReferenceEvaluate
     /**
      * @var Advancer|null
      */
-    protected $advanceCursor;
+    protected $advancer;
 
 
     /**
@@ -23,13 +23,13 @@ abstract protected function performNonExisting();
      */
     protected function getAdvancer()
     {
-        if (null === $this->advanceCursor) {
-            $this->advanceCursor = $this
+        if (null === $this->advancer) {
+            $this->advancer = $this
                 ->createAdvancer()
                 ->setReference($this->getReference())
                 ->setDataCursor($this->getDataCursor());
         }
-        return $this->advanceCursor;
+        return $this->advancer;
     }
 
 

src/Pointer/Evaluate/ReferenceEvaluateFactory.php

@@ -90,7 +90,22 @@ public function forbidNonNumericIndices()
     }
 
 
-    public function createReferenceEvaluate()
+    /**
+     * @return ReferenceEvaluate
+     */
+    public function createEvaluate()
+    {
+        return $this
+            ->doCreate()
+            ->setReference($this->getReference())
+            ->setDataCursor($this->getDataCursor());
+    }
+
+
+    /**
+     * @return ReferenceEvaluate
+     */
+    protected function doCreate()
     {
         if (is_object($this->dataCursor)) {
             return $this->createProperty();