Add Factory for Action class, adapt it on JsonRouteLoader

Author: MinusFour

src/Router/ActionFactory.php

@@ -0,0 +1,29 @@
+<?php
+/*****************************************************************************/
+/* PhpTreeBasedRouter
+Copyright (C) 2015 Alejandro Quiroga
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*******************************************************************************/
+namespace MinusFour\Router;
+
+class ActionFactory implements ActionFactoryInterface {
+
+	public function createAction($class, $method, $fixedArgs = array()){
+		return new Action($class, $method, $fixedArgs);
+	}
+
+}
+?>

src/Router/ActionFactoryInterface.php

@@ -0,0 +1,27 @@
+<?php
+/*****************************************************************************/
+/* PhpTreeBasedRouter
+Copyright (C) 2015 Alejandro Quiroga
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*******************************************************************************/
+namespace MinusFour\Router;
+
+interface ActionFactoryInterface {
+
+	public function createAction($class, $method, $fixedArgs);
+
+}
+?>

src/Router/RouteLoader/JsonRouteLoader.php

@@ -20,20 +20,22 @@
 namespace MinusFour\Router\RouteLoader;
 
 use MinusFour\Router\RouteFactory;
-use MinusFour\Router\Action;
-use MinusFour\Utils\JsonFileParser;
+use MinusFour\Router\ActionFactory;
+use MinusFour\Router\ActionInterface;
 use MinusFour\Router\RouteContainerInterface;
-use MinusFour\Router\RouteLoader\RouteLoaderInterface;
+use MinusFour\Utils\JsonFileParser;
 
 class JsonRouteLoader implements RouteLoaderInterface {
 	private $filenames;
 	private $baseDir;
 	private $routeFactory;
+	private $actionFactory;
 
-	public function __construct(array $filenames, $baseDir, RouteFactory $routeFactory = null){
+	public function __construct(array $filenames, $baseDir, RouteFactory $routeFactory = null, ActionFactoryInterface $actionFactory = null){
 		$this->filenames = $filenames;
 		$this->baseDir = $baseDir;
 		$this->routeFactory = $routeFactory == null ? new RouteFactory() : $routeFactory;
+		$this->actionFactory = $actionFactory == null ? new ActionFactory() : $actionFactory;
 	}
 
 	public function loadRoutes(RouteContainerInterface $routeContainer){
@@ -54,7 +56,7 @@ public function loadRoutes(RouteContainerInterface $routeContainer){
 					$routePath = $this->routeFactory->getCurrentPath();
 					//Move to new base point
 					$this->routeFactory->addToPath($path);
-					$routeLoader = new JsonRouteLoader([$newFile], dirname($fullpath), $this->routeFactory);
+					$routeLoader = new JsonRouteLoader([$newFile], dirname($fullpath), $this->routeFactory, $this->actionFactory);
 					$routeLoader->loadRoutes($routeContainer);
 					//Reset route path
 					$this->routeFactory->setPath($routePath);
@@ -68,9 +70,9 @@ public function loadRoutes(RouteContainerInterface $routeContainer){
 						$actions = $route['actions'];
 						foreach($actions as $method => $action){
 							if(!isset($action['fixedArgs'])){
-								$actionObj = new Action($action['class'], $action['method']);
+								$actionObj = $this->actionFactory->createAction($action['class'], $action['method']);
 							} else {
-								$actionObj = new Action($action['class'], $action['method'], $action['fixedArgs']);
+								$actionObj = $this->actionFactory->createAction($action['class'], $action['method'], $action['fixedArgs']);
 							}
 							$routeObj->setMethodAction($method, $actionObj);
 						}