Merge 9832f83 into d99bffc

src/Traits/HasEncryptedAttributes.php

@@ -266,6 +266,41 @@ public function getDirty()
         return $dirty;
     }
 
+    /**
+     * Determine if the new and old values for a given key are equivalent.
+     *
+     * @param  string $key
+     * @param  mixed  $current
+     * @return bool
+     */
+    protected function originalIsEquivalent($key, $current)
+    {
+        if (! array_key_exists($key, $this->original)) {
+            return false;
+        }
+
+        $original = $this->getOriginal($key);
+
+        if (isset($this->encrypted) && is_array($this->encrypted) && in_array($key, $this->encrypted)) {
+            $current = $this->decryptedAttribute($current);
+            $original = $this->decryptedAttribute($this->getOriginal($key));
+        }
+
+        if ($current === $original) {
+            return true;
+        } elseif (is_null($current)) {
+            return false;
+        } elseif ($this->isDateAttribute($key)) {
+            return $this->fromDateTime($current) ===
+                   $this->fromDateTime($original);
+        } elseif ($this->hasCast($key)) {
+            return $this->castAttribute($key, $current) ===
+                   $this->castAttribute($key, $original);
+        }
+        return is_numeric($current) && is_numeric($original)
+                && strcmp((string) $current, (string) $original) === 0;
+    }
+
     /**
      * Set a given attribute on the model.
      *

tests/Traits/DirtyTest.php

@@ -40,4 +40,19 @@ public function testUpdate()
         $this->assertNotEquals($model->getOriginal('shouldnt_be_encrypted'), $new_model->getOriginal('shouldnt_be_encrypted'));
         $this->assertNotEquals($model->shouldnt_be_encrypted, $new_model->shouldnt_be_encrypted);
     }
+
+    public function testDontEncryptUnchangedAttributes()
+    {
+        $string = 'Hello world!';
+
+        $model = DatabaseModel::create(['should_be_encrypted' => $string]);
+
+        $this->assertTrue($model->exists);
+
+        $model->should_be_encrypted = $string;
+
+        $changedAttributes = $model->getDirty();
+
+        $this->assertTrue(empty($changedAttributes));
+    }
 }