Fix merging properties that contain non-array values.

cakephp · Oct 14, 2012 · 9b68da3 · 9b68da3
1 parent 35641cd
commit 9b68da3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/lib/Cake/Test/TestCase/Utility/MergeVariablesTraitTest.php b/lib/Cake/Test/TestCase/Utility/MergeVariablesTraitTest.php
@@ -17,8 +17,11 @@
 use Cake\Utility\MergeVariablesTrait;
 
 class Base {
+
 	use MergeVariablesTrait;
 
+	public $hasBoolean = false;
+
 	public $listProperty = ['One'];
 
 	public $assocProperty = ['Red'];
@@ -31,6 +34,8 @@ public function mergeVars($properties) {
 
 class Child extends Base {
 
+	public $hasBoolean = ['test'];
+
 	public $listProperty = ['Two', 'Three'];
 
 	public $assocProperty = [
@@ -86,4 +91,16 @@ public function testMergeVarsAsAssoc() {
 		];
 		$this->assertEquals($expected, $object->assocProperty);
 	}
+
+/**
+ * Test that merging variables with booleans in the class heirarchy
+ * doesn't cause issues.
+ *
+ * @return void
+ */
+	public function testMergeVarsWithBoolean() {
+		$object = new Child();
+		$object->mergeVars(['hasBoolean' => false]);
+		$this->assertEquals(['test'], $object->hasBoolean);
+	}
 }
diff --git a/lib/Cake/Utility/MergeVariablesTrait.php b/lib/Cake/Utility/MergeVariablesTrait.php
@@ -74,7 +74,9 @@ protected function _mergeProperty($property, $parentClasses, $asAssoc) {
 			if ($asAssoc) {
 				$parentProperty = Hash::normalize($parentProperty);
 			}
-			$thisValue = Hash::merge($parentProperty, $thisValue);
+			if (is_array($parentProperty)) {
+				$thisValue = Hash::merge($parentProperty, $thisValue);
+			}
 		}
 		$this->{$property} = $thisValue;
 	}