remove settings parameter from initialize as this is not being passed…

…. only the constructor gets settings passed
cakephp · Aug 27, 2012 · f1ce3f9 · f1ce3f9
1 parent 934838f
commit f1ce3f9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/lib/Cake/Controller/Component/RequestHandlerComponent.php b/lib/Cake/Controller/Component/RequestHandlerComponent.php
@@ -123,21 +123,19 @@ public function __construct(ComponentCollection $collection, $settings = array()
  * 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'];
 		}
 		if (empty($this->ext) || $this->ext == 'html') {
 			$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']);
 		}
 	}
 

diff --git a/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php b/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
@@ -281,8 +281,8 @@ public function testInitializeContentTypeAndExtensionMismatch() {
  * @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',