diff -r 5a6b6e770365 -r 68c69c656a2c web/lib/Zend/Controller/Router/Abstract.php --- a/web/lib/Zend/Controller/Router/Abstract.php Thu May 07 15:10:09 2015 +0200 +++ b/web/lib/Zend/Controller/Router/Abstract.php Thu May 07 15:16:02 2015 +0200 @@ -15,12 +15,11 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ - /** Zend_Controller_Router_Interface */ require_once 'Zend/Controller/Router/Interface.php'; @@ -31,7 +30,7 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Controller_Router_Abstract implements Zend_Controller_Router_Interface @@ -40,9 +39,10 @@ * URI delimiter */ const URI_DELIMITER = '/'; - + /** * Front controller instance + * * @var Zend_Controller_Front */ protected $_frontController; @@ -50,6 +50,7 @@ /** * Array of invocation parameters to use when instantiating action * controllers + * * @var array */ protected $_invokeParams = array(); @@ -58,7 +59,6 @@ * Constructor * * @param array $params - * @return void */ public function __construct(array $params = array()) { @@ -69,13 +69,14 @@ * Add or modify a parameter to use when instantiating an action controller * * @param string $name - * @param mixed $value - * @return Zend_Controller_Router + * @param mixed $value + * @return Zend_Controller_Router_Abstract */ public function setParam($name, $value) { - $name = (string) $name; + $name = (string)$name; $this->_invokeParams[$name] = $value; + return $this; } @@ -83,11 +84,12 @@ * Set parameters to pass to action controller constructors * * @param array $params - * @return Zend_Controller_Router + * @return Zend_Controller_Router_Abstract */ public function setParams(array $params) { $this->_invokeParams = array_merge($this->_invokeParams, $params); + return $this; } @@ -99,7 +101,7 @@ */ public function getParam($name) { - if(isset($this->_invokeParams[$name])) { + if (isset($this->_invokeParams[$name])) { return $this->_invokeParams[$name]; } @@ -124,7 +126,7 @@ * each. * * @param null|string|array single key or array of keys for params to clear - * @return Zend_Controller_Router + * @return Zend_Controller_Router_Abstract */ public function clearParams($name = null) { @@ -157,6 +159,7 @@ require_once 'Zend/Controller/Front.php'; $this->_frontController = Zend_Controller_Front::getInstance(); + return $this->_frontController; } @@ -169,7 +172,7 @@ public function setFrontController(Zend_Controller_Front $controller) { $this->_frontController = $controller; + return $this; } - }