tweet_live: comparison web/lib/Zend/Controller/Router/Rewrite.php

equal deleted inserted replaced

-:5a6b6e770365
+:68c69c656a2c
 * to license@zend.com so we can send you a copy immediately.
 *
 * @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)
-* @version    $Id: Rewrite.php 24593 2012-01-05 20:35:02Z matthew $
+* @version    $Id$
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 /** Zend_Controller_Router_Abstract */
 require_once 'Zend/Controller/Router/Abstract.php';
 /**
 * Ruby routing based Router.
 *
 * @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
 * @see        http://manuals.rubyonrails.com/read/chapter/65
 */
 class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
 {
 protected $_routes = array();
 /**
 * Currently matched route
 *
-* @var Zend_Controller_Router_Route_Interface
+* @var string
 */
 protected $_currentRoute = null;
 /**
 * Global parameters given to all routes
 */
 public function addDefaultRoutes()
 {
 if (!$this->hasRoute('default')) {
 $dispatcher = $this->getFrontController()->getDispatcher();
-$request = $this->getFrontController()->getRequest();
+$request    = $this->getFrontController()->getRequest();
 require_once 'Zend/Controller/Router/Route/Module.php';
 $compat = new Zend_Controller_Router_Route_Module(array(), $dispatcher, $request);
 $this->_routes = array('default' => $compat) + $this->_routes;
 /**
 * Add route to the route chain
 *
 * If route contains method setRequest(), it is initialized with a request object
 *
-* @param  string                                 $name       Name of the route
+* @param  string                                 $name  Name of the route
-* @param  Zend_Controller_Router_Route_Interface $route      Instance of the route
+* @param  Zend_Controller_Router_Route_Interface $route Instance of the route
 * @return Zend_Controller_Router_Rewrite
 */
 public function addRoute($name, Zend_Controller_Router_Route_Interface $route)
 {
 if (method_exists($route, 'setRequest')) {
 * Add routes to the route chain
 *
 * @param  array $routes Array of routes with names as keys and routes as values
 * @return Zend_Controller_Router_Rewrite
 */
-public function addRoutes($routes) {
+public function addRoutes($routes)
+{
 foreach ($routes as $name => $route) {
 $this->addRoute($name, $route);
 }
 return $this;
 if (!class_exists($class)) {
 require_once 'Zend/Loader.php';
 Zend_Loader::loadClass($class);
 }
-$route = call_user_func(array($class, 'getInstance'), $info);
+$route = call_user_func(
+array(
+$class,
+'getInstance'
+), $info
+);
 if (isset($info->abstract) && $info->abstract && method_exists($route, 'isAbstract')) {
 $route->isAbstract(true);
 }
 * @param  string                                 $name
 * @param  Zend_Controller_Router_Route_Interface $route
 * @param  Zend_Config                            $childRoutesInfo
 * @return void
 */
-protected function _addChainRoutesFromConfig($name,
+protected function _addChainRoutesFromConfig(
-Zend_Controller_Router_Route_Interface $route,
+$name,
-Zend_Config $childRoutesInfo)
+Zend_Controller_Router_Route_Interface $route,
+Zend_Config $childRoutesInfo
+)
 {
 foreach ($childRoutesInfo as $childRouteName => $childRouteInfo) {
 if (is_string($childRouteInfo)) {
 $childRouteName = $childRouteInfo;
 $childRoute     = $this->getRoute($childRouteName);
 }
 /**
 * Remove all standard default routes
 *
-* @param  Zend_Controller_Router_Route_Interface Route
 * @return Zend_Controller_Router_Rewrite
 */
 public function removeDefaultRoutes()
 {
 $this->_useDefaultRoutes = false;
 {
 if (!isset($this->_currentRoute)) {
 require_once 'Zend/Controller/Router/Exception.php';
 throw new Zend_Controller_Router_Exception("Current route is not defined");
 }
 return $this->getRoute($this->_currentRoute);
 }
 /**
 * Retrieve a name of currently matched route
 *
 * @throws Zend_Controller_Router_Exception
-* @return Zend_Controller_Router_Route_Interface Route object
+* @return string Route name
 */
 public function getCurrentRouteName()
 {
 if (!isset($this->_currentRoute)) {
 require_once 'Zend/Controller/Router/Exception.php';
 throw new Zend_Controller_Router_Exception("Current route is not defined");
 }
 return $this->_currentRoute;
 }
 /**
 * Retrieve an array of routes added to the route chain
 /**
 * Find a matching route to the current PATH_INFO and inject
 * returning values to the Request object.
 *
+* @param Zend_Controller_Request_Abstract $request
 * @throws Zend_Controller_Router_Exception
 * @return Zend_Controller_Request_Abstract Request object
 */
 public function route(Zend_Controller_Request_Abstract $request)
 {
 if (!$request instanceof Zend_Controller_Request_Http) {
 require_once 'Zend/Controller/Router/Exception.php';
-throw new Zend_Controller_Router_Exception('Zend_Controller_Router_Rewrite requires a Zend_Controller_Request_Http-based request object');
+throw new Zend_Controller_Router_Exception(
+'Zend_Controller_Router_Rewrite requires a Zend_Controller_Request_Http-based request object'
+);
 }
 if ($this->_useDefaultRoutes) {
 $this->addDefaultRoutes();
 }
 $routeMatched        = true;
 break;
 }
 }
 if (!$routeMatched) {
 require_once 'Zend/Controller/Router/Exception.php';
 throw new Zend_Controller_Router_Exception('No route matched the request', 404);
 }
-if($this->_useCurrentParamsAsGlobal) {
+if ($this->_useCurrentParamsAsGlobal) {
 $params = $request->getParams();
-foreach($params as $param => $value) {
+foreach ($params as $param => $value) {
 $this->setGlobalParam($param, $value);
 }
 }
 return $request;
+}
-}
+/**
+* Sets parameters for request object
+*
+* Module name, controller name and action name
+*
+* @param Zend_Controller_Request_Abstract $request
+* @param array                            $params
+*/
 protected function _setRequestParams($request, $params)
 {
 foreach ($params as $param => $value) {
 $request->setParam($param, $value);
 $request->setControllerName($value);
 }
 if ($param === $request->getActionKey()) {
 $request->setActionName($value);
 }
 }
 }
 /**
 * Generates a URL path that can be used in URL creation, redirection, etc.
 *
 * @param  array $userParams Options passed by a user used to override parameters
-* @param  mixed $name The name of a Route to use
+* @param  mixed $name       The name of a Route to use
-* @param  bool $reset Whether to reset to the route defaults ignoring URL params
+* @param  bool  $reset      Whether to reset to the route defaults ignoring URL params
-* @param  bool $encode Tells to encode URL parts on output
+* @param  bool  $encode     Tells to encode URL parts on output
 * @throws Zend_Controller_Router_Exception
 * @return string Resulting absolute URL path
 */
 public function assemble($userParams, $name = null, $reset = false, $encode = true)
 {
 if (!is_array($userParams)) {
 require_once 'Zend/Controller/Router/Exception.php';
 throw new Zend_Controller_Router_Exception('userParams must be an array');
 }
 if ($name == null) {
 try {
 $name = $this->getCurrentRouteName();
 } catch (Zend_Controller_Router_Exception $e) {
 $name = 'default';
 /**
 * Set a global parameter
 *
 * @param  string $name
-* @param  mixed $value
+* @param  mixed  $value
 * @return Zend_Controller_Router_Rewrite
 */
 public function setGlobalParam($name, $value)
 {
 $this->_globalParams[$name] = $value;
 * Set the separator to use with chain names
 *
 * @param string $separator The separator to use
 * @return Zend_Controller_Router_Rewrite
 */
-public function setChainNameSeparator($separator) {
+public function setChainNameSeparator($separator)
+{
 $this->_chainNameSeparator = $separator;
 return $this;
 }
 /**
 * Get the separator to use for chain names
 *
 * @return string
 */
-public function getChainNameSeparator() {
+public function getChainNameSeparator()
+{
 return $this->_chainNameSeparator;
 }
 /**
 * Determines/returns whether to use the request parameters as global parameters.
 *
 * @param boolean|null $use
-*           Null/unset when you want to retrieve the current state.
+*              Null/unset when you want to retrieve the current state.
-*           True when request parameters should be global, false otherwise
+*              True when request parameters should be global, false otherwise
 * @return boolean|Zend_Controller_Router_Rewrite
 *              Returns a boolean if first param isn't set, returns an
 *              instance of Zend_Controller_Router_Rewrite otherwise.
 *
 */
-public function useRequestParametersAsGlobal($use = null) {
+public function useRequestParametersAsGlobal($use = null)
-if($use === null) {
+{
+if ($use === null) {
 return $this->_useCurrentParamsAsGlobal;
 }
-$this->_useCurrentParamsAsGlobal = (bool) $use;
+$this->_useCurrentParamsAsGlobal = (bool)$use;
 return $this;
 }
 }

changeset 1230	68c69c656a2c
parent 807	877f952ae2bd