tweet_live: comparison web/lib/Zend/Navigation/Page/Mvc.php

equal deleted inserted replaced

-:5a6b6e770365
+:68c69c656a2c
 * to license@zend.com so we can send you a copy immediately.
 *
 * @category   Zend
 * @package    Zend_Navigation
 * @subpackage Page
-* @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: Mvc.php 25213 2013-01-11 08:19:09Z frosch $
+* @version    $Id$
 */
 /**
 * @see Zend_Navigation_Page
 */
 * name and route params to assemble the href
 *
 * @category   Zend
 * @package    Zend_Navigation
 * @subpackage Page
-* @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_Navigation_Page_Mvc extends Zend_Navigation_Page
 {
 /**
 /**
 * Whether href should be encoded when assembling URL
 *
 * @see getHref()
 * @var bool
 */
 protected $_encodeUrl = true;
 /**
 * Whether this page should be considered active
 }
 }
 $myParams = $this->_params;
-if ($this->_route) {
+if ($this->_route
+&& method_exists($front->getRouter(), 'getRoute')
+) {
 $route = $front->getRouter()->getRoute($this->_route);
-if(method_exists($route, 'getDefaults')) {
+if (method_exists($route, 'getDefaults')) {
 $myParams = array_merge($route->getDefaults(), $myParams);
 }
 }
 if (null !== $this->_module) {
 $myParams['module'] = $this->_module;
-} elseif(!array_key_exists('module', $myParams)) {
+} elseif (!array_key_exists('module', $myParams)) {
 $myParams['module'] = $front->getDefaultModule();
 }
 if (null !== $this->_controller) {
 $myParams['controller'] = $this->_controller;
-} elseif(!array_key_exists('controller', $myParams)) {
+} elseif (!array_key_exists('controller', $myParams)) {
 $myParams['controller'] = $front->getDefaultControllerName();
 }
 if (null !== $this->_action) {
 $myParams['action'] = $this->_action;
-} elseif(!array_key_exists('action', $myParams)) {
+} elseif (!array_key_exists('action', $myParams)) {
 $myParams['action'] = $front->getDefaultAction();
 }
-foreach($myParams as $key => $value) {
+foreach ($myParams as $key => $value) {
-if(null === $value) {
+if (null === $value) {
 unset($myParams[$key]);
 }
 }
 if (count(array_intersect_assoc($reqParams, $myParams)) ==
-count($myParams)) {
+count($myParams)
+) {
 $this->_active = true;
 return true;
 }
 $this->_active = false;
 }
 return parent::isActive($recursive);
 }
 if ($param = $this->getAction()) {
 $params['action'] = $param;
 }
-$url = self::$_urlHelper->url($params,
+$url = self::$_urlHelper->url(
-$this->getRoute(),
+$params,
-$this->getResetParams(),
+$this->getRoute(),
-$this->getEncodeUrl());
+$this->getResetParams(),
+$this->getEncodeUrl()
+);
 // Use scheme?
 $scheme = $this->getScheme();
 if (null !== $scheme) {
 if (null === self::$_schemeHelper) {
 $url = self::$_schemeHelper->setScheme($scheme)->serverUrl($url);
 }
 // Add the fragment identifier if it is set
 $fragment = $this->getFragment();
 if (null !== $fragment) {
 $url .= '#' . $fragment;
 }
 return $this->_hrefCache = $url;
 }
 /**
 * Sets action name to use when assembling URL
 public function setAction($action)
 {
 if (null !== $action && !is_string($action)) {
 require_once 'Zend/Navigation/Exception.php';
 throw new Zend_Navigation_Exception(
-'Invalid argument: $action must be a string or null');
+'Invalid argument: $action must be a string or null'
-}
+);
+}
-$this->_action = $action;
+$this->_action    = $action;
 $this->_hrefCache = null;
 return $this;
 }
 /**
 * Returns action name to use when assembling URL
 public function setController($controller)
 {
 if (null !== $controller && !is_string($controller)) {
 require_once 'Zend/Navigation/Exception.php';
 throw new Zend_Navigation_Exception(
-'Invalid argument: $controller must be a string or null');
+'Invalid argument: $controller must be a string or null'
+);
 }
 $this->_controller = $controller;
-$this->_hrefCache = null;
+$this->_hrefCache  = null;
 return $this;
 }
 /**
 * Returns controller name to use when assembling URL
 public function setModule($module)
 {
 if (null !== $module && !is_string($module)) {
 require_once 'Zend/Navigation/Exception.php';
 throw new Zend_Navigation_Exception(
-'Invalid argument: $module must be a string or null');
+'Invalid argument: $module must be a string or null'
-}
+);
+}
-$this->_module = $module;
+$this->_module    = $module;
 $this->_hrefCache = null;
 return $this;
 }
 /**
 * Returns module name to use when assembling URL
 /**
 * Set multiple parameters (to use when assembling URL) at once
 *
 * URL options passed to the url action helper for assembling URLs.
 * Overwrites any previously set parameters!
 *
 * @see getHref()
 *
 * @param  array|null $params           [optional] paramters as array
 *                                      ('name' => 'value'). Default is null
 *                                      which clears all params.
 * @return Zend_Navigation_Page_Mvc     fluent interface, returns self
 */
 public function setParams(array $params = null)
 {
 $this->clearParams();
 if (is_array($params)) {
 $this->addParams($params);
 }
 return $this;
 }
 /**
 * Set parameter (to use when assembling URL)
 *
 * URL option passed to the url action helper for assembling URLs.
 *
 * @see getHref()
 *
 * @param  string $name                 parameter name
 * @param  mixed $value                 parameter value
 * @return Zend_Navigation_Page_Mvc     fluent interface, returns self
 */
 public function setParam($name, $value)
 {
-$name = (string) $name;
+$name                 = (string)$name;
 $this->_params[$name] = $value;
 $this->_hrefCache = null;
 return $this;
 }
 /**
 * Add multiple parameters (to use when assembling URL) at once
 *
 * URL options passed to the url action helper for assembling URLs.
 *
 * @see getHref()
 *
 * @param  array $params                paramters as array ('name' => 'value')
 * @return Zend_Navigation_Page_Mvc     fluent interface, returns self
 */
 return $this;
 }
 /**
 * Remove parameter (to use when assembling URL)
 *
 * @see getHref()
 *
 * @param  string $name
 * @return bool
 */
 public function removeParam($name)
 {
 if (array_key_exists($name, $this->_params)) {
 unset($this->_params[$name]);
 $this->_hrefCache = null;
 return true;
 return false;
 }
 /**
 * Clear all parameters (to use when assembling URL)
 *
 * @see getHref()
 *
 * @return Zend_Navigation_Page_Mvc     fluent interface, returns self
 */
 public function clearParams()
 $this->_params = array();
 $this->_hrefCache = null;
 return $this;
 }
 /**
 * Retrieve all parameters (to use when assembling URL)
 *
 * @see getHref()
 *
-* @return array                        parameters as array ('name' => 'value')
+* @return array parameters as array ('name' => 'value')
 */
 public function getParams()
 {
 return $this->_params;
 }
 /**
 * Retrieve a single parameter (to use when assembling URL)
 *
 * @see getHref()
 *
-* @param  string $name                 parameter name
+* @param  string $name parameter name
 * @return mixed
 */
 public function getParam($name)
 {
 $name = (string) $name;
 public function setRoute($route)
 {
 if (null !== $route && (!is_string($route) || strlen($route) < 1)) {
 require_once 'Zend/Navigation/Exception.php';
 throw new Zend_Navigation_Exception(
-'Invalid argument: $route must be a non-empty string or null');
+'Invalid argument: $route must be a non-empty string or null'
-}
+);
+}
-$this->_route = $route;
+$this->_route     = $route;
 $this->_hrefCache = null;
 return $this;
 }
 /**
 * Returns route name to use when assembling URL
 * @return Zend_Navigation_Page_Mvc  fluent interface, returns self
 */
 public function setResetParams($resetParams)
 {
 $this->_resetParams = (bool) $resetParams;
-$this->_hrefCache = null;
+$this->_hrefCache   = null;
 return $this;
 }
 /**
 * Returns whether params should be reset when assembling URL
 return $this->_resetParams;
 }
 /**
 * Sets whether href should be encoded when assembling URL
 *
 * @see getHref()
 *
-* @param bool $resetParams         whether href should be encoded when
+* @param $encodeUrl
-*                                  assembling URL
 * @return Zend_Navigation_Page_Mvc fluent interface, returns self
 */
 public function setEncodeUrl($encodeUrl)
 {
 $this->_encodeUrl = (bool) $encodeUrl;
 $this->_hrefCache = null;
 return $this;
 }
 /**
 * Returns whether herf should be encoded when assembling URL
 *
 * @see getHref()
 *
 * @return bool whether herf should be encoded when assembling URL
 */
 public function getEncodeUrl()
 {
 return $this->_encodeUrl;
 }
 * Sets scheme to use when assembling URL
 *
 * @see getHref()
 *
 * @param  string|null $scheme        scheme
+* @throws Zend_Navigation_Exception
 * @return Zend_Navigation_Page_Mvc   fluent interface, returns self
 */
 public function setScheme($scheme)
 {
 if (null !== $scheme && !is_string($scheme)) {
 public function toArray()
 {
 return array_merge(
 parent::toArray(),
 array(
 'action'       => $this->getAction(),
 'controller'   => $this->getController(),
 'module'       => $this->getModule(),
 'params'       => $this->getParams(),
 'route'        => $this->getRoute(),
 'reset_params' => $this->getResetParams(),
 'encodeUrl'    => $this->getEncodeUrl(),
 'scheme'       => $this->getScheme(),
 )
 );
 }
 }

changeset 1230	68c69c656a2c
parent 807	877f952ae2bd