Fix without annotation service

odandb · Nov 3, 2023 · 73bba09 · 73bba09
1 parent 3e3c2fc
commit 73bba09
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/config/services.php b/config/services.php
@@ -99,7 +99,7 @@
 
         ->set('encryption.subscriber', DoctrineCiphersweetSubscriber::class)
             ->args([
-                service('annotation_reader'), // @deprecated
+                service('annotation_reader')->nullOnInvalid(), // @deprecated
                 service('encryption.encrypted_fields'),
                 service(EncryptorInterface::class),
                 service('encryption.indexable_field'),
@@ -109,7 +109,7 @@
 
         ->set('encryption.encrypted_fields', EncryptedFieldsService::class)
             ->args([
-                service('annotation_reader'), // @deprecated
+                service('annotation_reader')->nullOnInvalid(), // @deprecated
             ])
     ;
 };
diff --git a/src/Services/EncryptedFieldsService.php b/src/Services/EncryptedFieldsService.php
@@ -13,9 +13,9 @@
 class EncryptedFieldsService
 {
     /** @deprecated */
-    private Reader $annReader;
+    private ?Reader $annReader;
 
-    public function __construct(Reader $annReader)
+    public function __construct(?Reader $annReader)
     {
         $this->annReader = $annReader;
     }
@@ -38,7 +38,7 @@ public function getEncryptedFields(ClassMetadata $meta): array
             }
 
             /** @var \ReflectionProperty $refProperty */
-            if ($this->annReader->getPropertyAnnotation($refProperty, EncryptedField::class)) {
+            if (null !== $this->annReader && $this->annReader->getPropertyAnnotation($refProperty, EncryptedField::class)) {
                 $refProperty->setAccessible(true);
                 $encryptedFields[] = $refProperty;
 

diff --git a/src/Subscribers/DoctrineCiphersweetSubscriber.php b/src/Subscribers/DoctrineCiphersweetSubscriber.php
@@ -31,7 +31,7 @@ class DoctrineCiphersweetSubscriber implements EventSubscriberInterface, ResetIn
     public const INDEXABLE_ANN_NAME = IndexableField::class;
 
     /** @deprecated */
-    private Reader $annReader;
+    private ?Reader $annReader;
     private EncryptorInterface $encryptor;
     private IndexableFieldsService $indexableFieldsService;
     private PropertyHydratorService $propertyHydratorService;
@@ -77,7 +77,7 @@ class DoctrineCiphersweetSubscriber implements EventSubscriberInterface, ResetIn
     private array $entitiesToEncrypt = [];
 
     public function __construct(
-        Reader                  $annReader,
+        ?Reader                 $annReader,
         EncryptedFieldsService  $encryptedFieldsService,
         EncryptorInterface      $encryptorClass,
         IndexableFieldsService  $indexableFieldsService,
@@ -330,7 +330,7 @@ private function buildContext(string $entityClassName, \ReflectionProperty $refP
             }
         }
 
-        if (null === $annotationConfig && null === $indexableAnnotationConfig) {
+        if (null === $annotationConfig && null === $indexableAnnotationConfig && null !== $this->annReader) {
             $annotationConfig = $this->annReader->getPropertyAnnotation($refProperty, self::ENCRYPTED_ANN_NAME);
             $indexableAnnotationConfig = $this->annReader->getPropertyAnnotation($refProperty, self::INDEXABLE_ANN_NAME);
 

diff --git a/tests/App/config.yaml b/tests/App/config.yaml
@@ -2,6 +2,7 @@ imports:
     - { resource: services.yaml }
 
 framework:
+    annotations: false
     secret: '123456789'
     http_method_override: false
     router: