Merge pull request #9 from IlicMiljan/allow-null-value-to-be-skipped

Allow `NULL` Value Skipping
IlicMiljan · Mar 10, 2024 · b210580 · b210580
2 parents 805cd19 + 9df84b7
commit b210580
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 0 deletions.
diff --git a/src/ObjectEncryptionService.php b/src/ObjectEncryptionService.php
@@ -78,6 +78,10 @@ private function updatePropertyValue(ReflectionProperty $property, object $objec
 
         $currentValue = $property->getValue($object);
 
+        if ($currentValue === null) {
+            return;
+        }
+
         if (!is_string($currentValue)) {
             throw new InvalidArgumentException('Value must be string.');
         }

diff --git a/tests/ObjectEncryptionServiceTest.php b/tests/ObjectEncryptionServiceTest.php
@@ -103,6 +103,70 @@ public function testDecryptSuccess(): void
         $this->assertEquals('plainText', $decryptedObject->sensitive);
     }
 
+    /**
+     * @throws ReflectionException
+     * @throws CipherException
+     * @throws ReaderException
+     */
+    public function testEncryptSkipsNullProperties(): void
+    {
+        $object = new class {
+            #[Encrypted]
+            public ?string $sensitive = null;
+        };
+
+        $reflectionProperty = new ReflectionProperty($object, 'sensitive');
+        $reflectionProperty->setAccessible(true);
+
+        $this->objectPropertiesReaderMock
+            ->expects($this->once())
+            ->method('getPropertiesWithAttribute')
+            ->with($object, Encrypted::class)
+            ->willReturn([$reflectionProperty]);
+
+        $this->cipherMock
+            ->expects($this->never()) // Ensure encrypt is never called since the property is null
+            ->method('encrypt');
+
+        $encryptedObject = $this->service->encrypt($object);
+
+        // Assert the property remains null, indicating it was skipped
+        /** @phpstan-ignore-next-line */
+        $this->assertNull($encryptedObject->sensitive);
+    }
+
+    /**
+     * @throws ReflectionException
+     * @throws CipherException
+     * @throws ReaderException
+     */
+    public function testDecryptSkipsNullProperties(): void
+    {
+        $object = new class {
+            #[Encrypted]
+            public ?string $sensitive = null;
+        };
+
+        $reflectionProperty = new ReflectionProperty($object, 'sensitive');
+        $reflectionProperty->setAccessible(true);
+
+        $this->objectPropertiesReaderMock
+            ->expects($this->once())
+            ->method('getPropertiesWithAttribute')
+            ->with($object, Encrypted::class)
+            ->willReturn([$reflectionProperty]);
+
+        $this->cipherMock
+            ->expects($this->never()) // Ensure decrypt is never called since the property is null
+            ->method('decrypt');
+
+        $decryptedObject = $this->service->decrypt($object);
+
+        // Assert the property remains null, indicating it was skipped
+        /** @phpstan-ignore-next-line */
+        $this->assertNull($decryptedObject->sensitive);
+    }
+
     /**
      * @throws ReaderException
      * @throws CipherException