[PageFlow] changed the PageFlowGenerator::__construct() method to rec…

…eive any PageFlowInterface object as well as the page flow ID (Issue piece#4)
iteman · Aug 22, 2013 · d14ea34 · d14ea34
1 parent 08bfbc0
commit d14ea34
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 23 deletions.
diff --git a/src/Piece/Flow/PageFlow/PageFlowFactory.php b/src/Piece/Flow/PageFlow/PageFlowFactory.php
@@ -4,7 +4,7 @@
 /**
  * PHP version 5.3
  *
- * Copyright (c) 2012 KUBO Atsuhiro <[email protected]>,
+ * Copyright (c) 2012-2013 KUBO Atsuhiro <[email protected]>,
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    Piece_Flow
- * @copyright  2012 KUBO Atsuhiro <[email protected]>
+ * @copyright  2012-2013 KUBO Atsuhiro <[email protected]>
  * @license    http://www.opensource.org/licenses/bsd-license.php  New BSD License
  * @version    Release: @package_version@
  * @since      File available since Release 2.0.0
@@ -39,7 +39,7 @@
 
 /**
  * @package    Piece_Flow
- * @copyright  2012 KUBO Atsuhiro <[email protected]>
+ * @copyright  2012-2013 KUBO Atsuhiro <[email protected]>
  * @license    http://www.opensource.org/licenses/bsd-license.php  New BSD License
  * @version    Release: @package_version@
  * @since      Class available since Release 2.0.0
@@ -60,12 +60,12 @@ public function __construct(PageFlowRegistry $pageFlowRegistry)
     }
 
     /**
-     * @param  string                        $id
-     * @return \Piece\Flow\PageFlow\PageFlow
+     * @param  string                                 $id
+     * @return \Piece\Flow\PageFlow\PageFlowInterface
      */
     public function create($id)
     {
-        $pageFlowGenerator = new PageFlowGenerator($id, $this->pageFlowRegistry);
+        $pageFlowGenerator = new PageFlowGenerator(new PageFlow($id), $this->pageFlowRegistry);
 
         return $pageFlowGenerator->generate();
     }

diff --git a/src/Piece/Flow/PageFlow/PageFlowGenerator.php b/src/Piece/Flow/PageFlow/PageFlowGenerator.php
@@ -58,6 +58,12 @@
  */
 class PageFlowGenerator
 {
+    /**
+     * @var \Piece\Flow\PageFlow\PageFlowInterface
+     * @since Property available since Release 2.0.0
+     */
+    protected $pageFlow;
+
     /**
      * @var \Piece\Flow\PageFlow\PageFlowRegistry
      * @since Property available since Release 2.0.0
@@ -71,13 +77,14 @@ class PageFlowGenerator
     protected $stateMachineBuilder;
 
     /**
-     * @param string                                $id
-     * @param \Piece\Flow\PageFlow\PageFlowRegistry $pageFlowRegistry
+     * @param \Piece\Flow\PageFlow\PageFlowInterface $pageFlow
+     * @param \Piece\Flow\PageFlow\PageFlowRegistry  $pageFlowRegistry
      */
-    public function __construct($id, PageFlowRegistry $pageFlowRegistry)
+    public function __construct(PageFlowInterface $pageFlow, PageFlowRegistry $pageFlowRegistry)
     {
+        $this->pageFlow = $pageFlow;
         $this->pageFlowRegistry = $pageFlowRegistry;
-        $this->stateMachineBuilder = new StateMachineBuilder(new PageFlow($id));
+        $this->stateMachineBuilder = new StateMachineBuilder($this->pageFlow);
     }
 
     /**
@@ -134,7 +141,7 @@ public function generate()
         $this->configureViewStates($definition['viewState']);
         $this->configureActionStates($definition['actionState']);
 
-        return $this->getPageFlow();
+        return $this->pageFlow;
     }
 
     /**
@@ -223,7 +230,7 @@ protected function wrapAction(array $action = null)
             $actionID = $action['class'] . ':' . $action['method'];
         }
 
-        return array(new EventHandler($actionID, $this->getPageFlow()), 'invokeAction');
+        return array(new EventHandler($actionID, $this->pageFlow), 'invokeAction');
     }
 
     /**
@@ -257,7 +264,7 @@ protected function wrapEventTriggerAction(array $action = null)
             $actionID = $action['class'] . ':' . $action['method'];
         }
 
-        return array(new EventHandler($actionID, $this->getPageFlow()), 'invokeActionAndTriggerEvent');
+        return array(new EventHandler($actionID, $this->pageFlow), 'invokeActionAndTriggerEvent');
     }
 
     /**
@@ -270,7 +277,7 @@ protected function readDefinition()
 
         return $processor->processConfiguration(
             new Definition17Configuration(),
-            array('definition17' => Yaml::parse($this->pageFlowRegistry->getFileName($this->getPageFlow()->getID())))
+            array('definition17' => Yaml::parse($this->pageFlowRegistry->getFileName($this->pageFlow->getID())))
         );
     }
 
@@ -285,15 +292,6 @@ protected function addState(StateInterface $state)
         $state->setDoEvent(new DoEvent());
         $this->stateMachineBuilder->getStateMachine()->addState($state);
     }
-
-    /**
-     * @return \Piece\Flow\PageFlow\PageFlowInterface
-     * @since Method available since Release 2.0.0
-     */
-    protected function getPageFlow()
-    {
-        return $this->stateMachineBuilder->getStateMachine();
-    }
 }
 
 /*