Fix merging.

cakephp · Mar 9, 2017 · ce40943 · ce40943
1 parent bb9eb98
commit ce40943
Show file tree

Hide file tree

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

diff --git a/tests/TestCase/ORM/EntityTest.php b/tests/TestCase/ORM/EntityTest.php
@@ -1110,20 +1110,21 @@ public function testToArrayVirtualProperties()
      */
     public function testSetVirtualWithMerge()
     {
-        $data = ['secret' => 'sauce', 'name' => 'mark', 'id' => 1];
+        $data = ['virtual' => 'sauce', 'name' => 'mark', 'id' => 1];
         $entity = new Entity($data);
-        $entity->setVirtual(['secret']);
+        $entity->setVirtual(['virtual']);
 
         $result = $entity->getVirtual();
-        $this->assertSame(['secret'], $result);
+        $this->assertSame(['virtual'], $result);
 
         $entity->setVirtual(['name'], true);
 
         $result = $entity->getVirtual();
-        $this->assertSame(['secret', 'name'], $result);
+        $this->assertSame(['virtual', 'name'], $result);
 
         $entity->setVirtual(['name'], true);
-        $this->assertSame(['secret', 'name'], $result);
+        $result = $entity->getVirtual();
+        $this->assertSame(['virtual', 'name'], $result);
     }
 
     /**