Change visibility around Action, new ActionDI class

Author: MinusFour

src/Router/Action.php

@@ -21,8 +21,8 @@
 
 class Action implements ActionInterface {
 
-	private $class;
-	private $method;
+	protected $class;
+	protected $method;
 	private $fixedArgs;
 
 	public function __construct($class, $method, $fixedArgs = array()){
@@ -31,18 +31,14 @@ public function __construct($class, $method, $fixedArgs = array()){
 		$this->fixedArgs = $fixedArgs;
 	}
 
-	public function getClass(){
-		return $this->class;
-	}
-
-	public function getMethod(){
-		return $this->method;
+	protected function getCallable(){
+		$class = $this->class;
+		return array(new $class(), $this->method);
 	}
 
 	public function execute(array $parameters){
 		$parameters = $this->fixedArgs + $parameters;
-		$class = $this->class;
-		$callable = array(new $class(), $this->method);
+		$callable = $this->getCallable();
 		if(is_callable($callable)){
 			return call_user_func_array($callable, $parameters);
 		} else {

src/Router/ActionDI.php

@@ -0,0 +1,36 @@
+<?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;
+
+use MinusFour\DIContainer\ContainerInterface;
+
+class ActionDI extends Action {
+	private $container;
+
+	public function __construct(ContainerInterface $container, $class, $method, array $fixedArgs = array()){
+		$this->container = $container;
+		parent::__construct($class, $method, $fixedArgs);
+	}
+
+	protected function getCallable(){
+		return array($this->container->resolve($this->class), $this->method);
+	}
+}
+?>