ArrayLoader should respect state machines state accessor

yohang · Apr 1, 2016 · 1097d63 · 1097d63
1 parent dc53d48
commit 1097d63
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/src/Finite/Loader/ArrayLoader.php b/src/Finite/Loader/ArrayLoader.php
@@ -69,7 +69,10 @@ public function load(StateMachineInterface $stateMachine)
             $this->callbackBuilderFactory = new CallbackBuilderFactory();
         }
 
-        $stateMachine->setStateAccessor(new PropertyPathStateAccessor($this->config['property_path']));
+        if (!$stateMachine->hasStateAccessor()) {
+            $stateMachine->setStateAccessor(new PropertyPathStateAccessor($this->config['property_path']));
+        }
+
         $stateMachine->setGraph($this->config['graph']);
 
         $this->loadStates($stateMachine);

diff --git a/src/Finite/StateMachine/StateMachine.php b/src/Finite/StateMachine/StateMachine.php
@@ -336,6 +336,14 @@ public function setStateAccessor(StateAccessorInterface $stateAccessor)
         $this->stateAccessor = $stateAccessor;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function hasStateAccessor()
+    {
+        return null !== $this->stateAccessor;
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/src/Finite/StateMachine/StateMachineInterface.php b/src/Finite/StateMachine/StateMachineInterface.php
@@ -111,6 +111,11 @@ public function getDispatcher();
      */
     public function setStateAccessor(StateAccessorInterface $stateAccessor);
 
+    /**
+     * @return bool
+     */
+    public function hasStateAccessor();
+
     /**
      * @param string $graph
      */