Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove changes #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove changes #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions library/Zend/Controller/Action.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,10 @@ abstract class Zend_Controller_Action implements Zend_Controller_Action_Interfac

/**
* Compatibility for php 8.2 to stop error Deprecated: Creation of dynamic property
* @var object
* @var object
*/
public $contexts = null;
public $contexts = null;

/**
* Helper Broker to assist in routing help requests to the proper object
*
Expand Down Expand Up @@ -130,21 +130,15 @@ abstract class Zend_Controller_Action implements Zend_Controller_Action_Interfac
* @param array $invokeArgs Any additional invocation arguments
* @return void
*/
public function __construct()
public function __construct(Zend_Controller_Request_Abstract $request, Zend_Controller_Response_Abstract $response, array $invokeArgs = [])
{

}


public function dispatcherInit(Zend_Controller_Request_Abstract $request, Zend_Controller_Response_Abstract $response, array $invokeArgs = []){
$this->setRequest($request)
->setResponse($response)
->_setInvokeArgs($invokeArgs);
$this->_helper = new Zend_Controller_Action_HelperBroker($this);
$this->init();
}


/**
* Initialize object
*
Expand Down Expand Up @@ -558,7 +552,7 @@ public function dispatch($action)
* object to use
* @return Zend_Controller_Response_Abstract
*/
public function run(Zend_Controller_Request_Abstract $request = null, Zend_Controller_Response_Abstract $response = null)
public function run(?Zend_Controller_Request_Abstract $request = null, ?Zend_Controller_Response_Abstract $response = null)
{
if (null !== $request) {
$this->setRequest($request);
Expand Down Expand Up @@ -726,7 +720,7 @@ public function getAllParams()
* @deprecated Deprecated as of Zend Framework 1.7. Use
* forward() instead.
*/
final protected function _forward($action, $controller = null, $module = null, array $params = null)
final protected function _forward($action, $controller = null, $module = null, ?array $params = null)
{
$this->forward($action, $controller, $module, $params);
}
Expand Down Expand Up @@ -757,7 +751,7 @@ final protected function _forward($action, $controller = null, $module = null, a
* @param array $params
* @return void
*/
final public function forward($action, $controller = null, $module = null, array $params = null)
final public function forward($action, $controller = null, $module = null, ?array $params = null)
{
$request = $this->getRequest();

Expand Down
3 changes: 1 addition & 2 deletions library/Zend/Controller/Action/Helper/Abstract.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ abstract class Zend_Controller_Action_Helper_Abstract
* @param Zend_Controller_Action $actionController
* @return $this
*/
//public function setActionController(Zend_Controller_Action $actionController = null)
public function setActionController($actionController = null)
public function setActionController(?Zend_Controller_Action $actionController = null)
{
$this->_actionController = $actionController;
return $this;
Expand Down
3 changes: 1 addition & 2 deletions library/Zend/Controller/Action/HelperBroker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,7 @@ public static function getStack()
* @param Zend_Controller_Action $actionController
* @return void
*/
//public function __construct(Zend_Controller_Action $actionController)
public function __construct( $actionController)
public function __construct(Zend_Controller_Action $actionController)
{
$this->_actionController = $actionController;
foreach (self::getStack() as $helper) {
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Controller/Action/Interface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ interface Zend_Controller_Action_Interface
* @param array $invokeArgs Any additional invocation arguments
* @return void
*/
public function dispatcherInit(Zend_Controller_Request_Abstract $request,
public function __construct(Zend_Controller_Request_Abstract $request,
Zend_Controller_Response_Abstract $response,
array $invokeArgs = []);

Expand Down
Loading