From 274878daf24d4e91dfcbaef44a2b51ebdb1c48a8 Mon Sep 17 00:00:00 2001 From: Fabiano Roberto Date: Mon, 13 Jan 2020 12:07:33 +0100 Subject: [PATCH 1/2] fix(encription): #4 - Fix Encryption of nullable value --- src/Encryption/EntityEncryption.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Encryption/EntityEncryption.php b/src/Encryption/EntityEncryption.php index db76ddb..40e3176 100644 --- a/src/Encryption/EntityEncryption.php +++ b/src/Encryption/EntityEncryption.php @@ -70,7 +70,7 @@ public function encryptField(object $entity, ReflectionProperty $refProperty) : $pac = PropertyAccess::createPropertyAccessor(); $value = $pac->getValue($entity, $propertyName); - $hasMarker = $this->hasMarker($value); + $hasMarker = ($value !== null) && $this->hasMarker($value); if ($hasMarker) { return; @@ -90,7 +90,7 @@ public function decryptField(object $entity, ReflectionProperty $refProperty) : $pac = PropertyAccess::createPropertyAccessor(); $value = $pac->getValue($entity, $propertyName); - $hasMarker = $this->hasMarker($value); + $hasMarker = ($value !== null) && $this->hasMarker($value); if (! $hasMarker) { return; From 726355a0d9f53374059af10186baf0fdf05ce02e Mon Sep 17 00:00:00 2001 From: Fabiano Roberto Date: Mon, 13 Jan 2020 12:33:04 +0100 Subject: [PATCH 2/2] fix(encription): #4 - Fix Encryption of nullable value --- src/Encryption/EntityEncryption.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Encryption/EntityEncryption.php b/src/Encryption/EntityEncryption.php index 40e3176..a1b5cf7 100644 --- a/src/Encryption/EntityEncryption.php +++ b/src/Encryption/EntityEncryption.php @@ -70,7 +70,7 @@ public function encryptField(object $entity, ReflectionProperty $refProperty) : $pac = PropertyAccess::createPropertyAccessor(); $value = $pac->getValue($entity, $propertyName); - $hasMarker = ($value !== null) && $this->hasMarker($value); + $hasMarker = $this->hasMarker($value); if ($hasMarker) { return; @@ -90,7 +90,7 @@ public function decryptField(object $entity, ReflectionProperty $refProperty) : $pac = PropertyAccess::createPropertyAccessor(); $value = $pac->getValue($entity, $propertyName); - $hasMarker = ($value !== null) && $this->hasMarker($value); + $hasMarker = $this->hasMarker($value); if (! $hasMarker) { return; @@ -163,9 +163,13 @@ protected function process(object $entity) : array return $marked; } - protected function hasMarker(string $value) : bool + protected function hasMarker(?string $value) : bool { - $substr = strpos($value, self::ENCRYPTION_MARKER); + $substr = false; + + if ($value !== null) { + $substr = strpos($value, self::ENCRYPTION_MARKER); + } return $substr !== false; }