tweet_live: comparison web/lib/Zend/Controller/Router/Route/Regex.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: Regex.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_Route_Abstract */
 require_once 'Zend/Controller/Router/Route/Abstract.php';
 /**
 * Regex Route
 *
 * @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
 */
 class Zend_Controller_Router_Route_Regex extends Zend_Controller_Router_Route_Abstract
 {
+/**
+* Regex string
+*
+* @var string|null
+*/
 protected $_regex = null;
+/**
+* Default values for the route (ie. module, controller, action, params)
+*
+* @var array
+*/
 protected $_defaults = array();
+/**
+* Reverse
+*
+* @var string|null
+*/
 protected $_reverse = null;
+/**
+* Map
+*
+* @var array
+*/
 protected $_map = array();
+/**
+* Values
+*
+* @var array
+*/
 protected $_values = array();
 /**
 * Instantiates route based on passed Zend_Config structure
 *
 * @param Zend_Config $config Configuration object
+* @return Zend_Controller_Router_Route_Regex
 */
 public static function getInstance(Zend_Config $config)
 {
-$defs = ($config->defaults instanceof Zend_Config) ? $config->defaults->toArray() : array();
+$defs    = ($config->defaults instanceof Zend_Config) ? $config->defaults->toArray() : array();
-$map = ($config->map instanceof Zend_Config) ? $config->map->toArray() : array();
+$map     = ($config->map instanceof Zend_Config) ? $config->map->toArray() : array();
 $reverse = (isset($config->reverse)) ? $config->reverse : null;
 return new self($config->route, $defs, $map, $reverse);
 }
+/**
+* Constructor
+*
+* @param       $route
+* @param array $defaults
+* @param array $map
+* @param null  $reverse
+*/
 public function __construct($route, $defaults = array(), $map = array(), $reverse = null)
 {
 $this->_regex    = $route;
 $this->_defaults = (array) $defaults;
 $this->_map      = (array) $map;
 $this->_reverse  = $reverse;
 }
-public function getVersion() {
+/**
+* Get the version of the route
+*
+* @return int
+*/
+public function getVersion()
+{
 return 1;
 }
 /**
 * Matches a user submitted path with a previously defined route.
 * @return array|false  An array of assigned values or a false on a mismatch
 */
 public function match($path, $partial = false)
 {
 if (!$partial) {
-$path = trim(urldecode($path), self::URI_DELIMITER);
+$path  = trim(urldecode($path), self::URI_DELIMITER);
 $regex = '#^' . $this->_regex . '$#i';
 } else {
 $regex = '#^' . $this->_regex . '#i';
 }
 *
 * Method strips destination type of keys form source array. Ie. if source array is
 * indexed numerically then every associative key will be stripped. Vice versa if reversed
 * is set to true.
 *
-* @param  array   $values Indexed or associative array of values to map
+* @param  array   $values   Indexed or associative array of values to map
 * @param  boolean $reversed False means translation of index to association. True means reverse.
 * @param  boolean $preserve Should wrong type of keys be preserved or stripped.
 * @return array   An array of mapped values
 */
 protected function _getMappedValues($values, $reversed = false, $preserve = false)
 }
 /**
 * Assembles a URL path defined by this route
 *
-* @param  array $data An array of name (or index) and value pairs used as parameters
+* @param  array   $data An array of name (or index) and value pairs used as parameters
+* @param  boolean $reset
+* @param  boolean $encode
+* @param  boolean $partial
+* @throws Zend_Controller_Router_Exception
 * @return string Route path with user submitted parameters
 */
 public function assemble($data = array(), $reset = false, $encode = false, $partial = false)
 {
 if ($this->_reverse === null) {
 require_once 'Zend/Controller/Router/Exception.php';
 throw new Zend_Controller_Router_Exception('Cannot assemble. Reversed route is not specified.');
 }
-$defaultValuesMapped  = $this->_getMappedValues($this->_defaults, true, false);
+$defaultValuesMapped = $this->_getMappedValues($this->_defaults, true, false);
-$matchedValuesMapped  = $this->_getMappedValues($this->_values, true, false);
+$matchedValuesMapped = $this->_getMappedValues($this->_values, true, false);
-$dataValuesMapped     = $this->_getMappedValues($data, true, false);
+$dataValuesMapped    = $this->_getMappedValues($data, true, false);
 // handle resets, if so requested (By null value) to do so
 if (($resetKeys = array_search(null, $dataValuesMapped, true)) !== false) {
-foreach ((array) $resetKeys as $resetKey) {
+foreach ((array)$resetKeys as $resetKey) {
 if (isset($matchedValuesMapped[$resetKey])) {
 unset($matchedValuesMapped[$resetKey]);
 unset($dataValuesMapped[$resetKey]);
 }
 }
 require_once 'Zend/Controller/Router/Exception.php';
 throw new Zend_Controller_Router_Exception('Cannot assemble. Too few arguments?');
 }
 return $return;
 }
 /**
 * Return a single parameter of route's defaults
 *
 * @param string $name Array key of the parameter
 * @return string Previously set default
 */
-public function getDefault($name) {
+public function getDefault($name)
+{
 if (isset($this->_defaults[$name])) {
 return $this->_defaults[$name];
 }
 }
 /**
 * Return an array of defaults
 *
 * @return array Route defaults
 */
-public function getDefaults() {
+public function getDefaults()
+{
 return $this->_defaults;
 }
 /**
 * Get all variables which are used by the route
 {
 $returnArray = $array1;
 foreach ($array2 as $array2Index => $array2Value) {
 $returnArray[$array2Index] = $array2Value;
 }
 return $returnArray;
 }
 }

changeset 1230	68c69c656a2c
parent 807	877f952ae2bd