Merge pull request #37 from Weebly/fix-original

Properly unserialize `getOriginal` values

Author: kchung

src/Database/Model.php

@@ -54,6 +54,30 @@ public function attributesToArray()
         return $attributes;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getOriginal($key = null, $default = null)
+    {
+        $original = parent::getOriginal($key, $default);
+
+        if ($key) {
+            if ($this->hasMutator($key)) {
+                return $this->unserializeAttribute($key, $original);
+            }
+
+            return $original;
+        }
+
+        foreach ($original as $attribute => $value) {
+            if ($this->hasMutator($attribute)) {
+                $original[$attribute] = $this->unserializeAttribute($attribute, $value);
+            }
+        }
+
+        return $original;
+    }
+
     /**
      * Define a many-to-many relationship.
      *

tests/Unit/Database/Traits/HasMutatorsTest.php

@@ -31,7 +31,6 @@ public function testSerializeAttribute()
 
     public function testUnserializeAttribute()
     {
-        $uuid = 'cf98906e-9074-11e7-9c8e-437b4bab8527';
         $mutator = M::mock(MutatorContract::class)
             ->shouldReceive('get')
             ->with('test_mutator')
@@ -52,6 +51,47 @@ public function testUnserializeAttribute()
         $this->assertEquals('serialized_attribute', $model->id);
     }
 
+    public function testGetOriginal()
+    {
+        $mutator = M::mock(MutatorContract::class)
+            ->shouldReceive('get')
+            ->with('test_mutator')
+            ->andReturnSelf()
+            ->once()
+            ->shouldReceive('unserializeAttribute')
+            ->with('unserialized_attribute')
+            ->andReturn('serialized_attribute')
+            ->once()
+            ->getMock();
+
+        app()['mutator'] = $mutator;
+
+        $model = new SampleModel();
+        $original = $model->getOriginal();
+
+        $this->assertIsArray($original);
+        $this->assertEquals('serialized_attribute', $original['id']);
+    }
+
+    public function testGetOriginalProperty()
+    {
+        $mutator = M::mock(MutatorContract::class)
+            ->shouldReceive('get')
+            ->with('test_mutator')
+            ->andReturnSelf()
+            ->once()
+            ->shouldReceive('unserializeAttribute')
+            ->with('unserialized_attribute')
+            ->andReturn('serialized_attribute')
+            ->once()
+            ->getMock();
+
+        app()['mutator'] = $mutator;
+
+        $model = new SampleModel();
+        $this->assertEquals('serialized_attribute', $model->getOriginal('id'));
+    }
+
     public function testGetMutators()
     {
         $this->assertEquals(['id' => 'test_mutator'], (new SampleModel())->getMutators());