Annotations lazy loading (#30)

DamienHarper · Feb 27, 2021 · 297c37a · 297c37a
1 parent 9c47c9e
commit 297c37a
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 7 deletions.
diff --git a/src/Provider/Doctrine/Configuration.php b/src/Provider/Doctrine/Configuration.php
@@ -3,10 +3,16 @@
 namespace DH\Auditor\Provider\Doctrine;
 
 use DH\Auditor\Provider\ConfigurationInterface;
+use DH\Auditor\Provider\Doctrine\Service\AuditingService;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class Configuration implements ConfigurationInterface
 {
+    /**
+     * @var DoctrineProvider
+     */
+    private $provider;
+
     /**
      * @var string
      */
@@ -23,9 +29,9 @@ class Configuration implements ConfigurationInterface
     private $ignoredColumns;
 
     /**
-     * @var array
+     * @var null|array
      */
-    private $entities = [];
+    private $entities;
 
     /**
      * @var array
@@ -173,7 +179,15 @@ public function getIgnoredColumns(): array
      */
     public function getEntities(): array
     {
-        return $this->entities;
+        if (null === $this->entities && null !== $this->provider) {
+            /** @var AuditingService[] $auditingServices */
+            $auditingServices = $this->provider->getAuditingServices();
+            foreach ($auditingServices as $auditingService) {
+                $this->provider->loadAnnotations($auditingService->getEntityManager(), []);
+            }
+        }
+
+        return null === $this->entities ? [] : $this->entities;
     }
 
     /**
@@ -219,4 +233,14 @@ public function getStorageMapper(): ?callable
     {
         return $this->storageMapper;
     }
+
+    public function getProvider(): DoctrineProvider
+    {
+        return $this->provider;
+    }
+
+    public function setProvider(DoctrineProvider $provider): void
+    {
+        $this->provider = $provider;
+    }
 }
diff --git a/src/Provider/Doctrine/DoctrineProvider.php b/src/Provider/Doctrine/DoctrineProvider.php
@@ -31,6 +31,9 @@ public function __construct(ConfigurationInterface $configuration)
     {
         $this->configuration = $configuration;
         $this->transactionManager = new TransactionManager($this);
+
+        \assert($this->configuration instanceof Configuration);    // helps PHPStan
+        $this->configuration->setProvider($this);
     }
 
     public function registerAuditingService(AuditingServiceInterface $service): ProviderInterface
@@ -45,8 +48,6 @@ public function registerAuditingService(AuditingServiceInterface $service): Prov
         $evm->addEventSubscriber(new CreateSchemaListener($this));
         $evm->addEventSubscriber(new DoctrineSubscriber($this->transactionManager));
 
-        $this->loadAnnotations($entityManager);
-
         return $this;
     }
 
@@ -233,12 +234,12 @@ public function setStorageMapper(callable $storageMapper): void
         $this->configuration->setStorageMapper($storageMapper);
     }
 
-    private function loadAnnotations(EntityManagerInterface $entityManager): self
+    public function loadAnnotations(EntityManagerInterface $entityManager, ?array $entities = null): self
     {
         \assert($this->configuration instanceof Configuration);   // helps PHPStan
         $annotationLoader = new AnnotationLoader($entityManager);
         $this->configuration->setEntities(array_merge(
-            $this->configuration->getEntities(),
+            null === $entities ? $this->configuration->getEntities() : $entities,
             $annotationLoader->load()
         ));