Merge pull request #3144 from ADmad/3.0-config-merge

Don't bother passing default arguments.
cakephp · Mar 27, 2014 · fcf0da4 · fcf0da4
2 parents 04f1fe4 + 336499c
commit fcf0da4
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/src/Controller/Component.php b/src/Controller/Component.php
@@ -105,7 +105,7 @@ class Component extends Object implements EventListener {
 	public function __construct(ComponentRegistry $registry, $config = []) {
 		$this->_registry = $registry;
 
-		$this->config($config, null, true);
+		$this->config($config);
 
 		$this->_set($this->config());
 

diff --git a/src/Controller/Component/Auth/AbstractPasswordHasher.php b/src/Controller/Component/Auth/AbstractPasswordHasher.php
@@ -41,7 +41,7 @@ abstract class AbstractPasswordHasher {
  * @param array $config Array of config.
  */
 	public function __construct($config = array()) {
-		$this->config($config, null, true);
+		$this->config($config);
 	}
 
 /**

diff --git a/src/Controller/Component/Auth/BaseAuthenticate.php b/src/Controller/Component/Auth/BaseAuthenticate.php
@@ -79,7 +79,7 @@ abstract class BaseAuthenticate {
  */
 	public function __construct(ComponentRegistry $registry, $config) {
 		$this->_registry = $registry;
-		$this->config($config, null, true);
+		$this->config($config);
 	}
 
 /**

diff --git a/src/Controller/Component/Auth/BaseAuthorize.php b/src/Controller/Component/Auth/BaseAuthorize.php
@@ -81,7 +81,7 @@ public function __construct(ComponentRegistry $registry, $config = array()) {
 		$this->_registry = $registry;
 		$controller = $registry->getController();
 		$this->controller($controller);
-		$this->config($config, null, true);
+		$this->config($config);
 	}
 
 /**

diff --git a/src/ORM/Behavior.php b/src/ORM/Behavior.php
@@ -126,7 +126,7 @@ class Behavior implements EventListener {
  * @param array $config The config for this behavior.
  */
 	public function __construct(Table $table, array $config = []) {
-		$this->config($config, null, true);
+		$this->config($config);
 	}
 
 /**

diff --git a/src/Routing/DispatcherFilter.php b/src/Routing/DispatcherFilter.php
@@ -53,7 +53,7 @@ abstract class DispatcherFilter implements EventListener {
  * @param array $config Settings for the filter.
  */
 	public function __construct($config = []) {
-		$this->config($config, null, true);
+		$this->config($config);
 	}
 
 /**

diff --git a/src/View/Helper.php b/src/View/Helper.php
@@ -153,7 +153,7 @@ public function __construct(View $View, $config = array()) {
 		if ($config) {
 			$config = Hash::merge($this->_defaultConfig, $config);
 		}
-		$this->config($config, null, true);
+		$this->config($config);
 
 		if (!empty($this->helpers)) {
 			$this->_helperMap = $View->Helpers->normalizeArray($this->helpers);

diff --git a/src/View/StringTemplate.php b/src/View/StringTemplate.php
@@ -60,7 +60,7 @@ class StringTemplate {
  * @param array $templates A set of templates to add.
  */
 	public function __construct(array $config = []) {
-		$this->config($config, null, true);
+		$this->config($config);
 	}
 
 /**