tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lib: Don't alias Zend classes in the ActionController

This commit is contained in:
Eric Lippmann 2015-08-20 16:10:39 +02:00
parent 6ca02a519b
commit c5f444efe8
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
library/Icinga/Web/Controller/ActionController.php
View File

@ -3,6 +3,10 @@
namespace Icinga\Web\Controller; namespace Icinga\Web\Controller;
use Zend_Controller_Action;
use Zend_Controller_Action_HelperBroker;
use Zend_Controller_Request_Abstract;
use Zend_Controller_Response_Abstract;
use Icinga\Application\Benchmark; use Icinga\Application\Benchmark;
use Icinga\Application\Config; use Icinga\Application\Config;
use Icinga\Authentication\Auth; use Icinga\Authentication\Auth;
@ -19,10 +23,6 @@ use Icinga\Web\Url;
use Icinga\Web\UrlParams; use Icinga\Web\UrlParams;
use Icinga\Web\Widget\Tabs; use Icinga\Web\Widget\Tabs;
use Icinga\Web\Window; use Icinga\Web\Window;
use Zend_Controller_Action;
use Zend_Controller_Action_HelperBroker as ActionHelperBroker;
use Zend_Controller_Request_Abstract as Request;
use Zend_Controller_Response_Abstract as Response;
/** /**
* Base class for all core action controllers * Base class for all core action controllers
@ -90,13 +90,13 @@ class ActionController extends Zend_Controller_Action
* The constructor starts benchmarking, loads the configuration and sets * The constructor starts benchmarking, loads the configuration and sets
* other useful controller properties * other useful controller properties
* *
* @param Request $request * @param Zend_Controller_Request_Abstract $request
* @param Response $response * @param Zend_Controller_Response_Abstract $response
* @param array $invokeArgs Any additional invocation arguments * @param array $invokeArgs Any additional invocation arguments
*/ */
public function __construct( public function __construct(
Request $request, Zend_Controller_Request_Abstract $request,
Response $response, Zend_Controller_Response_Abstract $response,
array $invokeArgs = array() array $invokeArgs = array()
) { ) {
$this->params = UrlParams::fromQueryString(); $this->params = UrlParams::fromQueryString();
@ -104,7 +104,7 @@ class ActionController extends Zend_Controller_Action
$this->setRequest($request) $this->setRequest($request)
->setResponse($response) ->setResponse($response)
->_setInvokeArgs($invokeArgs); ->_setInvokeArgs($invokeArgs);
$this->_helper = new ActionHelperBroker($this); $this->_helper = new Zend_Controller_Action_HelperBroker($this);
$this->handlerBrowserWindows(); $this->handlerBrowserWindows();
$moduleName = $this->getModuleName(); $moduleName = $this->getModuleName();