import v2.0.0.0_RC3 | 2012-07-01
https://github.com/lucanos/CommunityID -> http://www.itadmins.net/archives/357
This commit is contained in:
@ -17,7 +17,7 @@
|
||||
* @subpackage Zend_Controller_Action_Helper
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @version $Id: ActionStack.php 16202 2009-06-21 18:53:49Z thomas $
|
||||
* @version $Id: ActionStack.php 18951 2009-11-12 16:26:19Z alexander $
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -46,7 +46,7 @@ class Zend_Controller_Action_Helper_ActionStack extends Zend_Controller_Action_H
|
||||
* Constructor
|
||||
*
|
||||
* Register action stack plugin
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function __construct()
|
||||
@ -65,9 +65,9 @@ class Zend_Controller_Action_Helper_ActionStack extends Zend_Controller_Action_H
|
||||
}
|
||||
|
||||
/**
|
||||
* Push onto the stack
|
||||
*
|
||||
* @param Zend_Controller_Request_Abstract $next
|
||||
* Push onto the stack
|
||||
*
|
||||
* @param Zend_Controller_Request_Abstract $next
|
||||
* @return Zend_Controller_Action_Helper_ActionStack Provides a fluent interface
|
||||
*/
|
||||
public function pushStack(Zend_Controller_Request_Abstract $next)
|
||||
@ -78,12 +78,12 @@ class Zend_Controller_Action_Helper_ActionStack extends Zend_Controller_Action_H
|
||||
|
||||
/**
|
||||
* Push a new action onto the stack
|
||||
*
|
||||
* @param string $action
|
||||
* @param string $controller
|
||||
* @param string $module
|
||||
*
|
||||
* @param string $action
|
||||
* @param string $controller
|
||||
* @param string $module
|
||||
* @param array $params
|
||||
* @throws Zend_Controller_Action_Exception
|
||||
* @throws Zend_Controller_Action_Exception
|
||||
* @return Zend_Controller_Action_Helper_ActionStack
|
||||
*/
|
||||
public function actionToStack($action, $controller = null, $module = null, array $params = array())
|
||||
@ -107,7 +107,7 @@ class Zend_Controller_Action_Helper_ActionStack extends Zend_Controller_Action_H
|
||||
require_once 'Zend/Controller/Action/Exception.php';
|
||||
throw new Zend_Controller_Action_Exception('Request object not set yet');
|
||||
}
|
||||
|
||||
|
||||
$controller = (null === $controller) ? $request->getControllerName() : $controller;
|
||||
$module = (null === $module) ? $request->getModuleName() : $module;
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
||||
* @subpackage Zend_Controller_Action_Helper
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @version $Id: AjaxContext.php 16202 2009-06-21 18:53:49Z thomas $
|
||||
* @version $Id: AjaxContext.php 18951 2009-11-12 16:26:19Z alexander $
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -47,7 +47,7 @@ class Zend_Controller_Action_Helper_AjaxContext extends Zend_Controller_Action_H
|
||||
* Constructor
|
||||
*
|
||||
* Add HTML context
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function __construct()
|
||||
@ -60,8 +60,8 @@ class Zend_Controller_Action_Helper_AjaxContext extends Zend_Controller_Action_H
|
||||
* Initialize AJAX context switching
|
||||
*
|
||||
* Checks for XHR requests; if detected, attempts to perform context switch.
|
||||
*
|
||||
* @param string $format
|
||||
*
|
||||
* @param string $format
|
||||
* @return void
|
||||
*/
|
||||
public function initContext($format = null)
|
||||
|
@ -17,7 +17,7 @@
|
||||
* @subpackage Zend_Controller_Action_Helper
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @version $Id: Abstract.php 16202 2009-06-21 18:53:49Z thomas $
|
||||
* @version $Id: Abstract.php 18951 2009-11-12 16:26:19Z alexander $
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -46,7 +46,7 @@ abstract class Zend_Controller_Action_Helper_AutoComplete_Abstract extends Zend_
|
||||
|
||||
/**
|
||||
* Validate autocompletion data
|
||||
*
|
||||
*
|
||||
* @param mixed $data
|
||||
* @return boolean
|
||||
*/
|
||||
@ -54,16 +54,16 @@ abstract class Zend_Controller_Action_Helper_AutoComplete_Abstract extends Zend_
|
||||
|
||||
/**
|
||||
* Prepare autocompletion data
|
||||
*
|
||||
* @param mixed $data
|
||||
* @param boolean $keepLayouts
|
||||
*
|
||||
* @param mixed $data
|
||||
* @param boolean $keepLayouts
|
||||
* @return mixed
|
||||
*/
|
||||
abstract public function prepareAutoCompletion($data, $keepLayouts = false);
|
||||
|
||||
/**
|
||||
* Disable layouts and view renderer
|
||||
*
|
||||
*
|
||||
* @return Zend_Controller_Action_Helper_AutoComplete_Abstract Provides a fluent interface
|
||||
*/
|
||||
public function disableLayouts()
|
||||
@ -83,9 +83,9 @@ abstract class Zend_Controller_Action_Helper_AutoComplete_Abstract extends Zend_
|
||||
|
||||
/**
|
||||
* Encode data to JSON
|
||||
*
|
||||
* @param mixed $data
|
||||
* @param bool $keepLayouts
|
||||
*
|
||||
* @param mixed $data
|
||||
* @param bool $keepLayouts
|
||||
* @throws Zend_Controller_Action_Exception
|
||||
* @return string
|
||||
*/
|
||||
@ -105,11 +105,11 @@ abstract class Zend_Controller_Action_Helper_AutoComplete_Abstract extends Zend_
|
||||
/**
|
||||
* Send autocompletion data
|
||||
*
|
||||
* Calls prepareAutoCompletion, populates response body with this
|
||||
* Calls prepareAutoCompletion, populates response body with this
|
||||
* information, and sends response.
|
||||
*
|
||||
* @param mixed $data
|
||||
* @param bool $keepLayouts
|
||||
*
|
||||
* @param mixed $data
|
||||
* @param bool $keepLayouts
|
||||
* @return string|void
|
||||
*/
|
||||
public function sendAutoCompletion($data, $keepLayouts = false)
|
||||
@ -130,12 +130,12 @@ abstract class Zend_Controller_Action_Helper_AutoComplete_Abstract extends Zend_
|
||||
/**
|
||||
* Strategy pattern: allow calling helper as broker method
|
||||
*
|
||||
* Prepares autocompletion data and, if $sendNow is true, immediately sends
|
||||
* Prepares autocompletion data and, if $sendNow is true, immediately sends
|
||||
* response.
|
||||
*
|
||||
* @param mixed $data
|
||||
* @param bool $sendNow
|
||||
* @param bool $keepLayouts
|
||||
*
|
||||
* @param mixed $data
|
||||
* @param bool $sendNow
|
||||
* @param bool $keepLayouts
|
||||
* @return string|void
|
||||
*/
|
||||
public function direct($data, $sendNow = true, $keepLayouts = false)
|
||||
|
@ -17,7 +17,7 @@
|
||||
* @subpackage Zend_Controller_Action_Helper
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @version $Id: AutoCompleteDojo.php 16202 2009-06-21 18:53:49Z thomas $
|
||||
* @version $Id: AutoCompleteDojo.php 18951 2009-11-12 16:26:19Z alexander $
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -41,8 +41,8 @@ class Zend_Controller_Action_Helper_AutoCompleteDojo extends Zend_Controller_Act
|
||||
* Validate data for autocompletion
|
||||
*
|
||||
* Stub; unused
|
||||
*
|
||||
* @param mixed $data
|
||||
*
|
||||
* @param mixed $data
|
||||
* @return boolean
|
||||
*/
|
||||
public function validateData($data)
|
||||
@ -52,9 +52,9 @@ class Zend_Controller_Action_Helper_AutoCompleteDojo extends Zend_Controller_Act
|
||||
|
||||
/**
|
||||
* Prepare data for autocompletion
|
||||
*
|
||||
* @param mixed $data
|
||||
* @param boolean $keepLayouts
|
||||
*
|
||||
* @param mixed $data
|
||||
* @param boolean $keepLayouts
|
||||
* @return string
|
||||
*/
|
||||
public function prepareAutoCompletion($data, $keepLayouts = false)
|
||||
|
@ -17,7 +17,7 @@
|
||||
* @subpackage Zend_Controller_Action_Helper
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @version $Id: AutoCompleteScriptaculous.php 16202 2009-06-21 18:53:49Z thomas $
|
||||
* @version $Id: AutoCompleteScriptaculous.php 18951 2009-11-12 16:26:19Z alexander $
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -39,8 +39,8 @@ class Zend_Controller_Action_Helper_AutoCompleteScriptaculous extends Zend_Contr
|
||||
{
|
||||
/**
|
||||
* Validate data for autocompletion
|
||||
*
|
||||
* @param mixed $data
|
||||
*
|
||||
* @param mixed $data
|
||||
* @return bool
|
||||
*/
|
||||
public function validateData($data)
|
||||
@ -54,9 +54,9 @@ class Zend_Controller_Action_Helper_AutoCompleteScriptaculous extends Zend_Contr
|
||||
|
||||
/**
|
||||
* Prepare data for autocompletion
|
||||
*
|
||||
* @param mixed $data
|
||||
* @param boolean $keepLayouts
|
||||
*
|
||||
* @param mixed $data
|
||||
* @param boolean $keepLayouts
|
||||
* @throws Zend_Controller_Action_Exception
|
||||
* @return string
|
||||
*/
|
||||
|
@ -17,7 +17,7 @@
|
||||
* @subpackage Zend_Controller_Action_Helper
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @version $Id: ContextSwitch.php 16202 2009-06-21 18:53:49Z thomas $
|
||||
* @version $Id: ContextSwitch.php 18951 2009-11-12 16:26:19Z alexander $
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -157,9 +157,9 @@ class Zend_Controller_Action_Helper_ContextSwitch extends Zend_Controller_Action
|
||||
/**
|
||||
* Initialize at start of action controller
|
||||
*
|
||||
* Reset the view script suffix to the original state, or store the
|
||||
* Reset the view script suffix to the original state, or store the
|
||||
* original state.
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function init()
|
||||
|
@ -38,7 +38,7 @@ require_once 'Zend/Controller/Action/Helper/Abstract.php';
|
||||
* @subpackage Zend_Controller_Action_Helper
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @version $Id: FlashMessenger.php 16971 2009-07-22 18:05:45Z mikaelkael $
|
||||
* @version $Id: FlashMessenger.php 18951 2009-11-12 16:26:19Z alexander $
|
||||
*/
|
||||
class Zend_Controller_Action_Helper_FlashMessenger extends Zend_Controller_Action_Helper_Abstract implements IteratorAggregate, Countable
|
||||
{
|
||||
@ -221,10 +221,10 @@ class Zend_Controller_Action_Helper_FlashMessenger extends Zend_Controller_Actio
|
||||
unset(self::$_session->{$this->_namespace});
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* getIterator() - complete the IteratorAggregate interface, for iterating
|
||||
*
|
||||
@ -255,8 +255,8 @@ class Zend_Controller_Action_Helper_FlashMessenger extends Zend_Controller_Actio
|
||||
|
||||
/**
|
||||
* Strategy pattern: proxy to addMessage()
|
||||
*
|
||||
* @param string $message
|
||||
*
|
||||
* @param string $message
|
||||
* @return void
|
||||
*/
|
||||
public function direct($message)
|
||||
|
@ -17,7 +17,7 @@
|
||||
* @subpackage Zend_Controller_Action_Helper
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @version $Id: Url.php 16202 2009-06-21 18:53:49Z thomas $
|
||||
* @version $Id: Url.php 18951 2009-11-12 16:26:19Z alexander $
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -62,9 +62,9 @@ class Zend_Controller_Action_Helper_Url extends Zend_Controller_Action_Helper_Ab
|
||||
if ($module != $this->getFrontController()->getDispatcher()->getDefaultModule()) {
|
||||
$url = $module . '/' . $url;
|
||||
}
|
||||
|
||||
|
||||
if ('' !== ($baseUrl = $this->getFrontController()->getBaseUrl())) {
|
||||
$url = $baseUrl . '/' . $url;
|
||||
$url = $baseUrl . '/' . $url;
|
||||
}
|
||||
|
||||
if (null !== $params) {
|
||||
@ -98,7 +98,7 @@ class Zend_Controller_Action_Helper_Url extends Zend_Controller_Action_Helper_Ab
|
||||
$router = $this->getFrontController()->getRouter();
|
||||
return $router->assemble($urlOptions, $name, $reset, $encode);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Perform helper when called as $this->_helper->url() from an action controller
|
||||
*
|
||||
|
@ -17,7 +17,7 @@
|
||||
* @subpackage Zend_Controller_Action
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @version $Id: HelperBroker.php 16971 2009-07-22 18:05:45Z mikaelkael $
|
||||
* @version $Id: HelperBroker.php 18951 2009-11-12 16:26:19Z alexander $
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -60,8 +60,8 @@ class Zend_Controller_Action_HelperBroker
|
||||
|
||||
/**
|
||||
* Set PluginLoader for use with broker
|
||||
*
|
||||
* @param Zend_Loader_PluginLoader_Interface $loader
|
||||
*
|
||||
* @param Zend_Loader_PluginLoader_Interface $loader
|
||||
* @return void
|
||||
*/
|
||||
public static function setPluginLoader($loader)
|
||||
@ -75,7 +75,7 @@ class Zend_Controller_Action_HelperBroker
|
||||
|
||||
/**
|
||||
* Retrieve PluginLoader
|
||||
*
|
||||
*
|
||||
* @return Zend_Loader_PluginLoader
|
||||
*/
|
||||
public static function getPluginLoader()
|
||||
@ -150,7 +150,7 @@ class Zend_Controller_Action_HelperBroker
|
||||
{
|
||||
$name = self::_normalizeHelperName($name);
|
||||
$stack = self::getStack();
|
||||
|
||||
|
||||
if (!isset($stack->{$name})) {
|
||||
self::_loadHelper($name);
|
||||
}
|
||||
@ -177,7 +177,7 @@ class Zend_Controller_Action_HelperBroker
|
||||
{
|
||||
$name = self::_normalizeHelperName($name);
|
||||
$stack = self::getStack();
|
||||
|
||||
|
||||
if (!isset($stack->{$name})) {
|
||||
require_once 'Zend/Controller/Action/Exception.php';
|
||||
throw new Zend_Controller_Action_Exception('Action helper "' . $name . '" has not been registered with the helper broker');
|
||||
@ -235,10 +235,10 @@ class Zend_Controller_Action_HelperBroker
|
||||
if (self::$_stack == null) {
|
||||
self::$_stack = new Zend_Controller_Action_HelperBroker_PriorityStack();
|
||||
}
|
||||
|
||||
|
||||
return self::$_stack;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
|
@ -17,7 +17,7 @@
|
||||
* @subpackage Zend_Controller_Action
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @version $Id: PriorityStack.php 16971 2009-07-22 18:05:45Z mikaelkael $
|
||||
* @version $Id: PriorityStack.php 17947 2009-09-02 03:58:21Z yoshida@zend.co.jp $
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -30,11 +30,10 @@
|
||||
class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggregate, ArrayAccess, Countable
|
||||
{
|
||||
|
||||
/** @protected */
|
||||
protected $_helpersByPriority = array();
|
||||
protected $_helpersByNameRef = array();
|
||||
protected $_nextDefaultPriority = 1;
|
||||
|
||||
|
||||
/**
|
||||
* Magic property overloading for returning helper by name
|
||||
*
|
||||
@ -46,10 +45,10 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
|
||||
if (!array_key_exists($helperName, $this->_helpersByNameRef)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
return $this->_helpersByNameRef[$helperName];
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Magic property overloading for returning if helper is set by name
|
||||
*
|
||||
@ -60,7 +59,7 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
|
||||
{
|
||||
return array_key_exists($helperName, $this->_helpersByNameRef);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Magic property overloading for unsetting if helper is exists by name
|
||||
*
|
||||
@ -71,7 +70,7 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
|
||||
{
|
||||
return $this->offsetUnset($helperName);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* push helper onto the stack
|
||||
*
|
||||
@ -83,7 +82,7 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
|
||||
$this->offsetSet($this->getNextFreeHigherPriority(), $helper);
|
||||
return $this;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Return something iterable
|
||||
*
|
||||
@ -93,11 +92,11 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
|
||||
{
|
||||
return new ArrayObject($this->_helpersByPriority);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* offsetExists()
|
||||
*
|
||||
* @param int|string $priorityOrHelperName
|
||||
* @param int|string $priorityOrHelperName
|
||||
* @return Zend_Controller_Action_HelperBroker_PriorityStack
|
||||
*/
|
||||
public function offsetExists($priorityOrHelperName)
|
||||
@ -108,7 +107,7 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
|
||||
return array_key_exists($priorityOrHelperName, $this->_helpersByPriority);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* offsetGet()
|
||||
*
|
||||
@ -119,16 +118,16 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
|
||||
{
|
||||
if (!$this->offsetExists($priorityOrHelperName)) {
|
||||
require_once 'Zend/Controller/Action/Exception.php';
|
||||
throw new Zend_Controller_Action_Exception('A helper with priority ' . $priority . ' does not exist.');
|
||||
throw new Zend_Controller_Action_Exception('A helper with priority ' . $priorityOrHelperName . ' does not exist.');
|
||||
}
|
||||
|
||||
|
||||
if (is_string($priorityOrHelperName)) {
|
||||
return $this->_helpersByNameRef[$priorityOrHelperName];
|
||||
} else {
|
||||
return $this->_helpersByPriority[$priorityOrHelperName];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* offsetSet()
|
||||
*
|
||||
@ -144,29 +143,29 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
|
||||
require_once 'Zend/Controller/Action/Exception.php';
|
||||
throw new Zend_Controller_Action_Exception('$helper must extend Zend_Controller_Action_Helper_Abstract.');
|
||||
}
|
||||
|
||||
|
||||
if (array_key_exists($helper->getName(), $this->_helpersByNameRef)) {
|
||||
// remove any object with the same name to retain BC compailitbility
|
||||
// @todo At ZF 2.0 time throw an exception here.
|
||||
$this->offsetUnset($helper->getName());
|
||||
}
|
||||
|
||||
|
||||
if (array_key_exists($priority, $this->_helpersByPriority)) {
|
||||
$priority = $this->getNextFreeHigherPriority($priority); // ensures LIFO
|
||||
trigger_error("A helper with the same priority already exists, reassigning to $priority", E_USER_WARNING);
|
||||
}
|
||||
|
||||
|
||||
$this->_helpersByPriority[$priority] = $helper;
|
||||
$this->_helpersByNameRef[$helper->getName()] = $helper;
|
||||
|
||||
if ($priority == ($nextFreeDefault = $this->getNextFreeHigherPriority($this->_nextDefaultPriority))) {
|
||||
$this->_nextDefaultPriority = $nextFreeDefault;
|
||||
}
|
||||
|
||||
|
||||
krsort($this->_helpersByPriority); // always make sure priority and LIFO are both enforced
|
||||
return $this;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* offsetUnset()
|
||||
*
|
||||
@ -179,7 +178,7 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
|
||||
require_once 'Zend/Controller/Action/Exception.php';
|
||||
throw new Zend_Controller_Action_Exception('A helper with priority or name ' . $priorityOrHelperName . ' does not exist.');
|
||||
}
|
||||
|
||||
|
||||
if (is_string($priorityOrHelperName)) {
|
||||
$helperName = $priorityOrHelperName;
|
||||
$helper = $this->_helpersByNameRef[$helperName];
|
||||
@ -188,12 +187,12 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
|
||||
$priority = $priorityOrHelperName;
|
||||
$helperName = $this->_helpersByPriority[$priorityOrHelperName]->getName();
|
||||
}
|
||||
|
||||
|
||||
unset($this->_helpersByNameRef[$helperName]);
|
||||
unset($this->_helpersByPriority[$priority]);
|
||||
return $this;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* return the count of helpers
|
||||
*
|
||||
@ -203,7 +202,7 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
|
||||
{
|
||||
return count($this->_helpersByPriority);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Find the next free higher priority. If an index is given, it will
|
||||
* find the next free highest priority after it.
|
||||
@ -216,16 +215,16 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
|
||||
if ($indexPriority == null) {
|
||||
$indexPriority = $this->_nextDefaultPriority;
|
||||
}
|
||||
|
||||
|
||||
$priorities = array_keys($this->_helpersByPriority);
|
||||
|
||||
while (in_array($indexPriority, $priorities)) {
|
||||
$indexPriority++;
|
||||
}
|
||||
|
||||
|
||||
return $indexPriority;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Find the next free lower priority. If an index is given, it will
|
||||
* find the next free lower priority before it.
|
||||
@ -238,16 +237,16 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
|
||||
if ($indexPriority == null) {
|
||||
$indexPriority = $this->_nextDefaultPriority;
|
||||
}
|
||||
|
||||
|
||||
$priorities = array_keys($this->_helpersByPriority);
|
||||
|
||||
while (in_array($indexPriority, $priorities)) {
|
||||
$indexPriority--;
|
||||
}
|
||||
|
||||
return $indexPriority;
|
||||
|
||||
return $indexPriority;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* return the highest priority
|
||||
*
|
||||
@ -257,7 +256,7 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
|
||||
{
|
||||
return max(array_keys($this->_helpersByPriority));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* return the lowest priority
|
||||
*
|
||||
@ -267,7 +266,7 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
|
||||
{
|
||||
return min(array_keys($this->_helpersByPriority));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* return the helpers referenced by name
|
||||
*
|
||||
@ -277,5 +276,5 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre
|
||||
{
|
||||
return $this->_helpersByNameRef;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user