[TASK] Put composer patches to vcs in this fork repository

Author: jgrehling

library/Zend/Controller/Action/HelperBroker.php

@@ -46,6 +46,11 @@ class Zend_Controller_Action_HelperBroker
      */
     protected $_actionController;
 
+    /**
+     * @var Closure|null
+     */
+    protected static $_instanceCreatorCallback;
+
     /**
      * @var Zend_Loader_PluginLoader_Interface
      */
@@ -58,6 +63,11 @@ class Zend_Controller_Action_HelperBroker
      */
     protected static $_stack = null;
 
+    public static function setInstanceCreatorCallback(?Closure $instanceCreatorCallback): void
+    {
+        self::$_instanceCreatorCallback = $instanceCreatorCallback;
+    }
+
     /**
      * Set PluginLoader for use with broker
      *
@@ -369,7 +379,7 @@ protected static function _loadHelper($name)
             throw new Zend_Controller_Action_Exception('Action Helper by name ' . $name . ' not found', 0, $e);
         }
 
-        $helper = new $class();
+        $helper = self::_createHelperInstance($class);
 
         if (!$helper instanceof Zend_Controller_Action_Helper_Abstract) {
             require_once 'Zend/Controller/Action/Exception.php';
@@ -378,4 +388,13 @@ protected static function _loadHelper($name)
 
         self::getStack()->push($helper);
     }
+
+    protected static function _createHelperInstance($className)
+    {
+        if (self::$_instanceCreatorCallback) {
+            return call_user_func(self::$_instanceCreatorCallback, $className);
+        }
+
+        return new $className();
+    }
 }

library/Zend/Controller/Dispatcher/Standard.php

@@ -35,6 +35,11 @@
  */
 class Zend_Controller_Dispatcher_Standard extends Zend_Controller_Dispatcher_Abstract
 {
+    /**
+     * @var Closure|null
+     */
+    private static $_instanceCreatorCallback;
+
     /**
      * Current dispatchable directory
      * @var string
@@ -65,6 +70,11 @@ public function __construct(array $params = [])
         $this->_curModule = $this->getDefaultModule();
     }
 
+    public static function setInstanceCreatorCallback(?Closure $instanceCreatorCallback): void
+    {
+        self::$_instanceCreatorCallback = $instanceCreatorCallback;
+    }
+
     /**
      * Add a single path to the controller directory stack
      *
@@ -278,7 +288,7 @@ public function dispatch(Zend_Controller_Request_Abstract $request, Zend_Control
          * Instantiate controller with request, response, and invocation
          * arguments; throw exception if it's not an action controller
          */
-        $controller = new $moduleClassName($request, $this->getResponse(), $this->getParams());
+        $controller = $this->_createControllerInstance($moduleClassName, $request);
         if (!($controller instanceof Zend_Controller_Action_Interface) &&
             !($controller instanceof Zend_Controller_Action)) {
             require_once 'Zend/Controller/Dispatcher/Exception.php';
@@ -509,4 +519,24 @@ public function getActionMethod(Zend_Controller_Request_Abstract $request)
 
         return $this->formatActionName($action);
     }
+
+    /**
+     * @param string $moduleClassName
+     * @param Zend_Controller_Request_Abstract $request
+     * @return mixed
+     */
+    private function _createControllerInstance($moduleClassName, Zend_Controller_Request_Abstract $request)
+    {
+        if (self::$_instanceCreatorCallback) {
+            return call_user_func(
+                self::$_instanceCreatorCallback,
+                $moduleClassName,
+                $request,
+                $this->getResponse(),
+                $this->getParams()
+            );
+        }
+
+        return new $moduleClassName($request, $this->getResponse(), $this->getParams());
+    }
 }

library/Zend/View/Abstract.php

@@ -38,6 +38,11 @@
  */
 abstract class Zend_View_Abstract implements Zend_View_Interface
 {
+    /**
+     * @var Closure|null
+     */
+    private static $_instanceCreatorCallback;
+
     /**
      * Path stack for script, helper, and filter directories.
      *
@@ -239,6 +244,11 @@ public function __construct($config = [])
         $this->init();
     }
 
+    public static function setInstanceCreatorCallback(?Closure $param): void
+    {
+        self::$_instanceCreatorCallback = $param;
+    }
+
     /**
      * Return the template engine object
      *
@@ -1178,7 +1188,7 @@ private function _getPlugin($type, $name)
 
         if (!isset($store[$name])) {
             $class = $this->getPluginLoader($type)->load($name);
-            $store[$name] = new $class();
+            $store[$name] = $this->_getPluginInstance($class);
             if (method_exists($store[$name], 'setView')) {
                 $store[$name]->setView($this);
             }
@@ -1188,6 +1198,15 @@ private function _getPlugin($type, $name)
         return $store[$name];
     }
 
+    private function _getPluginInstance(string $class)
+    {
+        if (self::$_instanceCreatorCallback) {
+            return call_user_func(self::$_instanceCreatorCallback, $class);
+        }
+
+        return new $class();
+    }
+
     /**
      * Use to include the view script in a scope that only allows public
      * members.