Merge pull request #12 from cleverage/bugfix/handle-null-string

Fix a bug when saving null instead of a string
cleverage · Dec 8, 2020 · 6e2f065 · 6e2f065
2 parents af43afd + 21f1bf0
commit 6e2f065
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -45,7 +45,8 @@
             "Sidus\\EncryptionBundle\\": "src/"
         },
         "exclude-from-classmap": [
-            "/Tests/"
+            "/Tests/",
+            "/tests/"
         ]
     },
     "autoload-dev": {

diff --git a/src/Doctrine/Type/Behavior/EncryptType.php b/src/Doctrine/Type/Behavior/EncryptType.php
@@ -11,6 +11,9 @@ trait EncryptType
 
     public function convertToPHPValue($value, AbstractPlatform $platform): string
     {
+        if ($value === null) {
+            $value = '';
+        }
         // Decode value previously encoded in base64 for database storage
         $value = base64_decode($value);
 
@@ -19,6 +22,9 @@ public function convertToPHPValue($value, AbstractPlatform $platform): string
 
     public function convertToDatabaseValue($value, AbstractPlatform $platform): string
     {
+        if ($value === null) {
+            $value = '';
+        }
         $value = $this->valueEncrypter->encrypt($value);
 
         // Encoding to base64 to avoid issue when storing binary strings