Merge branch 'master' into fix/remove-depreciation-messages

# Conflicts: # library/Zend/Controller/Action.php # library/Zend/Session/SaveHandler/DbTable.php
Shardj · Feb 4, 2024 · 207e0cf · 207e0cf
2 parents 8b2092a + dbdd481
commit 207e0cf
Show file tree

Hide file tree

Showing 36 changed files with 185 additions and 169 deletions.
diff --git a/library/Zend/Cache/Backend/Static.php b/library/Zend/Cache/Backend/Static.php
@@ -78,7 +78,7 @@ class Zend_Cache_Backend_Static
      *
      * @param  string $name
      * @param  mixed $value
-     * @return Zend_Cache_Backend_Static
+     * @return $this
      */
     public function setOption($name, $value)
     {

diff --git a/library/Zend/Cache/Core.php b/library/Zend/Cache/Core.php
@@ -153,7 +153,7 @@ public function __construct($options = [])
      * Set options using an instance of type Zend_Config
      *
      * @param Zend_Config $config
-     * @return Zend_Cache_Core
+     * @return $this
      */
     public function setConfig(Zend_Config $config)
     {

diff --git a/library/Zend/Cache/Manager.php b/library/Zend/Cache/Manager.php
@@ -116,7 +116,7 @@ class Zend_Cache_Manager
      *
      * @param  string $name
      * @param  Zend_Cache_Core $cache
-     * @return Zend_Cache_Manager
+     * @return $this
      */
     public function setCache($name, Zend_Cache_Core $cache)
     {
@@ -198,7 +198,7 @@ public function getCaches()
      *
      * @param  string $name
      * @param  array  $options
-     * @return Zend_Cache_Manager
+     * @return $this
      * @throws Zend_Cache_Exception
      */
     public function setCacheTemplate($name, $options)
@@ -248,7 +248,7 @@ public function getCacheTemplate($name)
      *
      * @param  string $name
      * @param  array $options
-     * @return Zend_Cache_Manager
+     * @return $this
      * @throws Zend_Cache_Exception for invalid options format or if option templates do not have $name
      */
     public function setTemplateOptions($name, $options)

diff --git a/library/Zend/Controller/Action.php b/library/Zend/Controller/Action.php
@@ -92,7 +92,7 @@ abstract class Zend_Controller_Action implements Zend_Controller_Action_Interfac
     public $view;
 
     /**
-     * compatibility for php 8.2 to stop error Deprecated: Creation of dynamic property
+     * Compatibility for php 8.2 to stop error Deprecated: Creation of dynamic property
      * @var object|null
      */
     public  $contexts = null;
@@ -624,7 +624,7 @@ public function getParam(string $paramName, $default = null)
      *
      * @param string $paramName
      * @param mixed $value
-     * @return Zend_Controller_Action
+     * @return $this
      * @deprecated Deprecated as of Zend Framework 1.7. Use
      *             setParam() instead.
      */
@@ -638,7 +638,7 @@ protected function _setParam(string $paramName, $value): Zend_Controller_Action
      *
      * @param string $paramName
      * @param mixed $value
-     * @return Zend_Controller_Action
+     * @return $this
      */
     public function setParam(string $paramName, $value): Zend_Controller_Action
     {

diff --git a/library/Zend/Controller/Action/Helper/ActionStack.php b/library/Zend/Controller/Action/Helper/ActionStack.php
@@ -84,7 +84,7 @@ public function pushStack(Zend_Controller_Request_Abstract $next)
      * @param  string $module
      * @param  array  $params
      * @throws Zend_Controller_Action_Exception
-     * @return Zend_Controller_Action_Helper_ActionStack
+     * @return $this
      */
     public function actionToStack($action, $controller = null, $module = null, array $params = [])
     {
@@ -129,7 +129,7 @@ public function actionToStack($action, $controller = null, $module = null, array
      * @param  string $controller
      * @param  string $module
      * @param  array $params
-     * @return Zend_Controller_Action_Helper_ActionStack
+     * @return $this
      */
     public function direct($action, $controller = null, $module = null, array $params = [])
     {

diff --git a/library/Zend/Controller/Action/Helper/Cache.php b/library/Zend/Controller/Action/Helper/Cache.php
@@ -217,7 +217,7 @@ protected function _encodeCacheId($requestUri)
      * Set an instance of the Cache Manager for this helper
      *
      * @param Zend_Cache_Manager $manager
-     * @return Zend_Controller_Action_Helper_Cache
+     * @return $this
      */
     public function setManager(Zend_Cache_Manager $manager)
     {

diff --git a/library/Zend/Controller/Action/Helper/FlashMessenger.php b/library/Zend/Controller/Action/Helper/FlashMessenger.php
@@ -305,7 +305,7 @@ public function count($namespace = null): int
      * Strategy pattern: proxy to addMessage()
      *
      * @param  string|string[] $message
-     * @return Zend_Controller_Action_Helper_FlashMessenger
+     * @return $this
      */
     public function direct($message, $namespace=NULL)
     {

diff --git a/library/Zend/Controller/Action/HelperBroker/PriorityStack.php b/library/Zend/Controller/Action/HelperBroker/PriorityStack.php
@@ -75,7 +75,7 @@ public function __unset($helperName)
      * push helper onto the stack
      *
      * @param Zend_Controller_Action_Helper_Abstract $helper
-     * @return Zend_Controller_Action_HelperBroker_PriorityStack
+     * @return $this
      */
     public function push(Zend_Controller_Action_Helper_Abstract $helper)
     {

diff --git a/library/Zend/Controller/Dispatcher/Abstract.php b/library/Zend/Controller/Dispatcher/Abstract.php
@@ -173,7 +173,7 @@ public function getWordDelimiter()
      * single string or an array of strings.
      *
      * @param string|array $spec
-     * @return Zend_Controller_Dispatcher_Abstract
+     * @return $this
      */
     public function setWordDelimiter($spec)
     {
@@ -201,7 +201,7 @@ public function getPathDelimiter()
      * an array of strings.
      *
      * @param string $spec
-     * @return Zend_Controller_Dispatcher_Abstract
+     * @return $this
      */
     public function setPathDelimiter($spec)
     {
@@ -264,7 +264,7 @@ public function getFrontController()
      * Set front controller instance
      *
      * @param Zend_Controller_Front $controller
-     * @return Zend_Controller_Dispatcher_Abstract
+     * @return $this
      */
     public function setFrontController(Zend_Controller_Front $controller)
     {
@@ -277,7 +277,7 @@ public function setFrontController(Zend_Controller_Front $controller)
      *
      * @param string $name
      * @param mixed $value
-     * @return Zend_Controller_Dispatcher_Abstract
+     * @return $this
      */
     public function setParam($name, $value)
     {
@@ -290,7 +290,7 @@ public function setParam($name, $value)
      * Set parameters to pass to action controller constructors
      *
      * @param array $params
-     * @return Zend_Controller_Dispatcher_Abstract
+     * @return $this
      */
     public function setParams(array $params)
     {
@@ -331,7 +331,7 @@ public function getParams()
      * each.
      *
      * @param null|string|array $name single key or array of keys for params to clear
-     * @return Zend_Controller_Dispatcher_Abstract
+     * @return $this
      */
     public function clearParams($name = null)
     {
@@ -354,7 +354,7 @@ public function clearParams($name = null)
      * Set response object to pass to action controllers
      *
      * @param Zend_Controller_Response_Abstract|null $response
-     * @return Zend_Controller_Dispatcher_Abstract
+     * @return $this
      */
     public function setResponse(Zend_Controller_Response_Abstract $response = null)
     {
@@ -376,7 +376,7 @@ public function getResponse()
      * Set the default controller (minus any formatting)
      *
      * @param string $controller
-     * @return Zend_Controller_Dispatcher_Abstract
+     * @return $this
      */
     public function setDefaultControllerName($controller)
     {
@@ -398,7 +398,7 @@ public function getDefaultControllerName()
      * Set the default action (minus any formatting)
      *
      * @param string $action
-     * @return Zend_Controller_Dispatcher_Abstract
+     * @return $this
      */
     public function setDefaultAction($action)
     {
@@ -420,7 +420,7 @@ public function getDefaultAction()
      * Set the default module
      *
      * @param string $module
-     * @return Zend_Controller_Dispatcher_Abstract
+     * @return $this
      */
     public function setDefaultModule($module)
     {

diff --git a/library/Zend/Controller/Dispatcher/Standard.php b/library/Zend/Controller/Dispatcher/Standard.php
@@ -70,7 +70,7 @@ public function __construct(array $params = [])
      *
      * @param string $path
      * @param string $module
-     * @return Zend_Controller_Dispatcher_Standard
+     * @return $this
      */
     public function addControllerDirectory($path, $module = null)
     {
@@ -89,7 +89,7 @@ public function addControllerDirectory($path, $module = null)
      * Set controller directory
      *
      * @param array|string $directory
-     * @return Zend_Controller_Dispatcher_Standard
+     * @return $this
      */
     public function setControllerDirectory($directory, $module = null)
     {

diff --git a/library/Zend/Controller/Front.php b/library/Zend/Controller/Front.php
@@ -220,7 +220,7 @@ public static function run($controllerDirectory)
      *
      * @param string $directory
      * @param string $module Optional argument; module with which to associate directory. If none provided, assumes 'default'
-     * @return Zend_Controller_Front
+     * @return $this
      * @throws Zend_Controller_Exception if directory not found or readable
      */
     public function addControllerDirectory($directory, $module = null)
@@ -238,7 +238,7 @@ public function addControllerDirectory($directory, $module = null)
      * @param string|array $directory Path to Zend_Controller_Action controller
      * classes or array of such paths
      * @param  string $module Optional module name to use with string $directory
-     * @return Zend_Controller_Front
+     * @return $this
      */
     public function setControllerDirectory($directory, $module = null)
     {
@@ -281,7 +281,7 @@ public function removeControllerDirectory($module)
      * will be used as the controller directory path.
      *
      * @param  string $path
-     * @return Zend_Controller_Front
+     * @return $this
      */
     public function addModuleDirectory($path)
     {
@@ -341,7 +341,7 @@ public function getModuleDirectory($module = null)
      * Set the directory name within a module containing controllers
      *
      * @param  string $name
-     * @return Zend_Controller_Front
+     * @return $this
      */
     public function setModuleControllerDirectoryName($name = 'controllers')
     {
@@ -364,7 +364,7 @@ public function getModuleControllerDirectoryName()
      * Set the default controller (unformatted string)
      *
      * @param string $controller
-     * @return Zend_Controller_Front
+     * @return $this
      */
     public function setDefaultControllerName($controller)
     {
@@ -387,7 +387,7 @@ public function getDefaultControllerName()
      * Set the default action (unformatted string)
      *
      * @param string $action
-     * @return Zend_Controller_Front
+     * @return $this
      */
     public function setDefaultAction($action)
     {
@@ -410,7 +410,7 @@ public function getDefaultAction()
      * Set the default module name
      *
      * @param string $module
-     * @return Zend_Controller_Front
+     * @return $this
      */
     public function setDefaultModule($module)
     {
@@ -438,7 +438,7 @@ public function getDefaultModule()
      *
      * @param string|Zend_Controller_Request_Abstract $request
      * @throws Zend_Controller_Exception if invalid request class
-     * @return Zend_Controller_Front
+     * @return $this
      */
     public function setRequest($request)
     {
@@ -480,7 +480,7 @@ public function getRequest()
      *
      * @param string|Zend_Controller_Router_Interface $router
      * @throws Zend_Controller_Exception if invalid router class
-     * @return Zend_Controller_Front
+     * @return $this
      */
     public function setRouter($router)
     {
@@ -537,7 +537,7 @@ public function getRouter()
      * If a null value is passed, this can be used as well for autodiscovery (default).
      *
      * @param string $base
-     * @return Zend_Controller_Front
+     * @return $this
      * @throws Zend_Controller_Exception for non-string $base
      */
     public function setBaseUrl($base = null)
@@ -577,7 +577,7 @@ public function getBaseUrl()
      * call the action method of the controller.
      *
      * @param Zend_Controller_Dispatcher_Interface $dispatcher
-     * @return Zend_Controller_Front
+     * @return $this
      */
     public function setDispatcher(Zend_Controller_Dispatcher_Interface $dispatcher)
     {
@@ -612,7 +612,7 @@ public function getDispatcher()
      *
      * @param string|Zend_Controller_Response_Abstract $response
      * @throws Zend_Controller_Exception if invalid response class
-     * @return Zend_Controller_Front
+     * @return $this
      */
     public function setResponse($response)
     {
@@ -648,7 +648,7 @@ public function getResponse()
      *
      * @param string $name
      * @param mixed $value
-     * @return Zend_Controller_Front
+     * @return $this
      */
     public function setParam($name, $value)
     {
@@ -661,7 +661,7 @@ public function setParam($name, $value)
      * Set parameters to pass to action controller constructors
      *
      * @param array $params
-     * @return Zend_Controller_Front
+     * @return $this
      */
     public function setParams(array $params)
     {
@@ -702,7 +702,7 @@ public function getParams()
      * each.
      *
      * @param null|string|array $name single key or array of keys for params to clear
-     * @return Zend_Controller_Front
+     * @return $this
      */
     public function clearParams($name = null)
     {
@@ -726,7 +726,7 @@ public function clearParams($name = null)
      *
      * @param  Zend_Controller_Plugin_Abstract $plugin
      * @param  int $stackIndex Optional; stack index for plugin
-     * @return Zend_Controller_Front
+     * @return $this
      */
     public function registerPlugin(Zend_Controller_Plugin_Abstract $plugin, $stackIndex = null)
     {
@@ -738,7 +738,7 @@ public function registerPlugin(Zend_Controller_Plugin_Abstract $plugin, $stackIn
      * Unregister a plugin.
      *
      * @param  string|Zend_Controller_Plugin_Abstract $plugin Plugin class or object to unregister
-     * @return Zend_Controller_Front
+     * @return $this
      */
     public function unregisterPlugin($plugin)
     {

diff --git a/library/Zend/Controller/Plugin/Abstract.php b/library/Zend/Controller/Plugin/Abstract.php
@@ -43,7 +43,7 @@ abstract class Zend_Controller_Plugin_Abstract
      * Set request object
      *
      * @param Zend_Controller_Request_Abstract $request
-     * @return Zend_Controller_Plugin_Abstract
+     * @return $this
      */
     public function setRequest(Zend_Controller_Request_Abstract $request)
     {
@@ -65,7 +65,7 @@ public function getRequest()
      * Set response object
      *
      * @param Zend_Controller_Response_Abstract $response
-     * @return Zend_Controller_Plugin_Abstract
+     * @return $this
      */
     public function setResponse(Zend_Controller_Response_Abstract $response)
     {