move defaultSettings to Behavior

Default settings should _probably_ be defined in all classes which accept partial config, such as components, helpers and behaviors.
cakephp · Nov 10, 2013 · 3663cc9 · 3663cc9
1 parent 2b4eb46
commit 3663cc9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/Cake/Model/Behavior/TimestampBehavior.php b/Cake/Model/Behavior/TimestampBehavior.php
@@ -55,18 +55,6 @@ class TimestampBehavior extends Behavior {
  */
 	protected $_ts;
 
-/**
- * Constructor
- *
- * Merge settings with the default and store in the settings property
- *
- * @param Table $table The table this behavior is attached to.
- * @param array $settings The settings for this behavior.
- */
-	public function __construct(Table $table, array $settings = []) {
-		$this->_settings = $settings + $this->_defaultSettings;
-	}
-
 /**
  * handleEvent
  *

diff --git a/Cake/ORM/Behavior.php b/Cake/ORM/Behavior.php
@@ -101,6 +101,15 @@ class Behavior implements EventListener {
  */
 	protected static $_reflectionMethods = [];
 
+/**
+ * Default settings
+ *
+ * These are merged with user-provided settings when the behavior is used.
+ *
+ * @var array
+ */
+	protected $_defaultSettings = [];
+
 /**
  * Contains configuration settings.
  *
@@ -111,14 +120,17 @@ class Behavior implements EventListener {
 /**
  * Constructor
  *
+ * Merge settings with the default and store in the settings property
+ *
  * Does not retain a reference to the Table object. If you need this
  * you should override the constructor.
  *
+ *
  * @param Table $table The table this behavior is attached to.
  * @param array $settings The settings for this behavior.
  */
 	public function __construct(Table $table, array $settings = []) {
-		$this->_settings = $settings;
+		$this->_settings = $settings + $this->_defaultSettings;
 	}
 
 /**