Fix EntityTrait and merging of properties that are not assoc arrays.

cakephp · Mar 6, 2017 · 6a554e0 · 6a554e0
1 parent defe9fe
commit 6a554e0
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 2 deletions.
diff --git a/src/Datasource/EntityTrait.php b/src/Datasource/EntityTrait.php
@@ -433,7 +433,7 @@ public function setHidden(array $properties, $merge = false)
             return $this;
         }
 
-        $this->_hidden += $properties;
+        $this->_hidden = array_merge($this->_hidden, $properties);
 
         return $this;
     }
@@ -482,7 +482,7 @@ public function setVirtual(array $properties, $merge = false)
             return $this;
         }
 
-        $this->_virtual += $properties;
+        $this->_virtual = array_merge($this->_virtual, $properties);
 
         return $this;
     }

diff --git a/tests/TestCase/ORM/EntityTest.php b/tests/TestCase/ORM/EntityTest.php
@@ -1030,6 +1030,49 @@ public function testToArrayHiddenProperties()
         $this->assertEquals(['name' => 'mark', 'id' => 1], $entity->toArray());
     }
 
+    /**
+     * Tests setting hidden properties.
+     *
+     * @return void
+     */
+    public function testSetHidden()
+    {
+        $data = ['secret' => 'sauce', 'name' => 'mark', 'id' => 1];
+        $entity = new Entity($data);
+        $entity->setVirtual(['secret']);
+
+        $result = $entity->getVirtual();
+        $this->assertSame(['secret'], $result);
+
+        $entity->setVirtual(['name']);
+
+        $result = $entity->getVirtual();
+        $this->assertSame(['name'], $result);
+    }
+
+    /**
+     * Tests setting hidden properties with merging.
+     *
+     * @return void
+     */
+    public function testSetHiddenWithMerge()
+    {
+        $data = ['secret' => 'sauce', 'name' => 'mark', 'id' => 1];
+        $entity = new Entity($data);
+        $entity->setVirtual(['secret']);
+
+        $result = $entity->getVirtual();
+        $this->assertSame(['secret'], $result);
+
+        $entity->setVirtual(['name'], true);
+
+        $result = $entity->getVirtual();
+        $this->assertSame(['secret', 'name'], $result);
+
+        $entity->setVirtual(['name'], true);
+        $this->assertSame(['secret', 'name'], $result);
+    }
+
     /**
      * Test toArray includes 'virtual' properties.
      *