ArrayLoader should respect state machines state accessor

added test for array loader with custom state accessor
yohang · Apr 18, 2016 · c7a5672 · Gregoire-M · Feb 23, 2018 · c7a5672
1 parent dc53d48
commit c7a5672
Show file tree

Hide file tree

Showing 4 changed files with 27 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
      */

diff --git a/tests/Finite/Test/Loader/ArrayLoaderTest.php b/tests/Finite/Test/Loader/ArrayLoaderTest.php
@@ -179,8 +179,18 @@ public function testLoadWithProperties()
         );
 
         $this->object->load($sm);
+    }
+
+    public function testLoadWithCustomStateAccessor()
+    {
+        $sa = $this->getMock('Finite\State\Accessor\PropertyPathStateAccessor', array(), array(), 'CustomAccessor');
 
+        $sm = new StateMachine;
+        $sm->setStateAccessor($sa);
+
+        $this->object->load($sm);
 
+        $this->assertAttributeInstanceOf('CustomAccessor', 'stateAccessor', $sm);
     }
 
     public function testSupports()