Returning all original values of an entity

cakephp · May 19, 2016 · 94be119 · 94be119
1 parent 1996fe9
commit 94be119
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/Datasource/EntityTrait.php b/src/Datasource/EntityTrait.php
@@ -322,7 +322,14 @@ public function getOriginal($property)
      */
     public function getOriginalValues()
     {
-        return $this->_original;
+        $originals = $this->_original;
+        $originalKeys = array_keys($originals);
+        foreach ($this->_properties as $key => $value) {
+            if (!in_array($key, $originalKeys)) {
+                $originals[$key] = $value;
+            }
+        }
+        return $originals;
     }
 
     /**

diff --git a/tests/TestCase/ORM/EntityTest.php b/tests/TestCase/ORM/EntityTest.php
@@ -145,9 +145,12 @@ public function testExtractOriginalValues()
             'null' => null,
         ], ['markNew' => true]);
         $entity->set('body', 'updated body');
-        $result = $entity->getOriginalValues(['id', 'title', 'body', 'null']);
+        $result = $entity->getOriginalValues();
         $expected = [
-            'body' => 'no'
+            'id' => 1,
+            'title' => 'original',
+            'body' => 'no',
+            'null' => null,
         ];
         $this->assertEquals($expected, $result);
     }