adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove settings parameter from initialize as this is not being passed. only the constructor gets settings passed

Browse source
This commit is contained in:
Ceeram 2012-08-27 11:22:06 +02:00
parent 934838f77c
commit f1ce3f9ae5
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/Cake/Controller/Component/RequestHandlerComponent.php
View file

@ -123,11 +123,10 @@ class RequestHandlerComponent extends Component {
* and the requested mime-types, RequestHandler::$ext is set to that value.
*
* @param Controller $controller A reference to the controller
* @param array $settings Array of settings to _set().
* @return void
* @see Router::parseExtensions()
*/
public function initialize(Controller $controller, $settings = array()) {
public function initialize(Controller $controller) {
if (isset($this->request->params['ext'])) {
$this->ext = $this->request->params['ext'];
}
@ -135,9 +134,8 @@ class RequestHandlerComponent extends Component {
$this->_setExtension();
}
$this->params = $controller->params;
$this->_set($settings);
if (!empty($settings['viewClassMap'])) {
$this->viewClassMap($settings['viewClassMap']);
if (!empty($this->settings['viewClassMap'])) {
$this->viewClassMap($this->settings['viewClassMap']);
}
}

4
lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
View file

@ -281,8 +281,8 @@ class RequestHandlerComponentTest extends CakeTestCase {
* @return void
*/
public function testViewClassMap() {
$settings = array('viewClassMap' => array('json' => 'CustomJson'));
$this->RequestHandler->initialize($this->Controller, $settings);
$this->RequestHandler->settings = array('viewClassMap' => array('json' => 'CustomJson'));
$this->RequestHandler->initialize($this->Controller);
$result = $this->RequestHandler->viewClassMap();
$expected = array(
'json' => 'CustomJson',