potential laravel 5.5/5.6/5.7 fix for newly created models re: #30

Author: austinheap

src/Traits/HasEncryptedAttributes.php

@@ -125,7 +125,19 @@ protected function shouldEncrypt($key): bool
     {
         $encrypt = DatabaseEncryption::isEnabled() && isset($this->encrypted) && is_array($this->encrypted) ? $this->encrypted : [];
 
-        return in_array($key, $encrypt);
+        return in_array($key, $encrypt, true);
+    }
+
+    /**
+     * Determine whether a model is ready for encryption.
+     *
+     * @return bool
+     */
+    protected function isEncryptable(): bool
+    {
+        $exists = property_exists($this, 'exists');
+
+        return $exists === false || ($exists === true && $this->exists === true);
     }
 
     /**
@@ -318,6 +330,6 @@ protected function getArrayableAttributes()
      */
     public function getAttributes()
     {
-        return $this->exists ? $this->doDecryptAttributes(parent::getAttributes()) : parent::getAttributes();
+        return $this->isEncryptable() ? $this->doDecryptAttributes(parent::getAttributes()) : parent::getAttributes();
     }
 }

tests/Traits/DatabaseTest.php

@@ -110,4 +110,26 @@ public function testGetArrayableAttributes()
         $this->assertEquals($strings['shouldnt_be_encrypted'], $attributes['shouldnt_be_encrypted']);
         $this->assertEquals($strings['should_be_encrypted'], $attributes['should_be_encrypted']);
     }
+
+    public function testIsEncryptableExists()
+    {
+        $strings = $this->randomValues();
+        $model   = DatabaseModel::create($strings);
+
+        $this->assertTrue($model->exists);
+        $this->assertTrue(self::callProtectedMethod($model, 'isEncryptable'));
+    }
+
+    public function testIsEncryptableNew()
+    {
+        $strings = $this->randomValues();
+        $model = new DatabaseModel();
+
+        foreach ($strings as $key => $value) {
+            $model->$key = $value;
+        }
+
+        $this->assertFalse($model->exists);
+        $this->assertFalse(self::callProtectedMethod($model, 'isEncryptable'));
+    }
 }

tests/Traits/DummyTest.php

@@ -40,8 +40,19 @@ public function testEncryptNormalString()
     public function testEncryptStringWithPlus()
     {
         $this->doTest([
-                          'dont_encrypt' => '12345+' . rand(111111, 999999) . '@gmail.com',
-                          'encrypt_me'   => 'abcde+' . str_random() . '@gmail.com',
-                      ]);
+            'dont_encrypt' => '12345+' . rand(111111, 999999) . '@gmail.com',
+            'encrypt_me'   => 'abcde+' . str_random() . '@gmail.com',
+        ]);
+    }
+
+    public function testIsEncryptable()
+    {
+        $attributes = [
+            'dont_encrypt' => '12345+' . rand(111111, 999999) . '@gmail.com',
+            'encrypt_me'   => 'abcde+' . str_random() . '@gmail.com',
+        ];
+        $model      = new DummyModel($attributes);
+
+        $this->assertTrue(self::callProtectedMethod($model, 'isEncryptable'));
     }
 }