Remove NullTagAwareAdapter and update bindings

Deleted the NullTagAwareAdapter class and changed references to it throughout the codebase. Adjusted the etagPool initialization and modified DI bindings to handle null instances properly. Ensured compatibility with TagAwareAdapterInterface.
bearsunday · Sep 10, 2024 · 23f475f · 23f475f
1 parent fb214bf
commit 23f475f
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 97 deletions.
diff --git a/src/NullTagAwareAdapter.php b/src/NullTagAwareAdapter.php
diff --git a/src/QueryRepositoryModule.php b/src/QueryRepositoryModule.php
@@ -54,7 +54,7 @@ protected function configure(): void
                 'tagsPool' => EtagPool::class,
             ],
         )->in(Scope::SINGLETON);
-        $this->bind(TagAwareAdapterInterface::class)->annotatedWith(EtagPool::class)->to(NullTagAwareAdapter::class);
+        $this->bind(TagAwareAdapterInterface::class)->annotatedWith(EtagPool::class)->toInstance(null);
         // core
         $this->bind(QueryRepositoryInterface::class)->to(QueryRepository::class)->in(Scope::SINGLETON);
         $this->bind(CacheDependencyInterface::class)->to(CacheDependency::class);

diff --git a/src/ResourceStorage.php b/src/ResourceStorage.php
@@ -81,7 +81,7 @@ private function initializePools(ProviderInterface $roPoolProvider, ProviderInte
         $this->etagPoolProvider = $etagPoolProvider;
         $this->roPool = $roPoolProvider->get();
         $etagPool = $this->etagPoolProvider->get();
-        $this->etagPool = $etagPool instanceof NullTagAwareAdapter ?  $this->roPool : $etagPool;
+        $this->etagPool = $etagPool instanceof TagAwareAdapterInterface ? $etagPool : $this->roPool; // @phpstan-ignore-line
     }
 
     /**

diff --git a/src/StorageRedisDsnModule.php b/src/StorageRedisDsnModule.php
@@ -4,7 +4,6 @@
 
 namespace BEAR\QueryRepository;
 
-use BEAR\RepositoryModule\Annotation\EtagPool;
 use BEAR\RepositoryModule\Annotation\RedisDsn;
 use BEAR\RepositoryModule\Annotation\RedisDsnOptions;
 use BEAR\RepositoryModule\Annotation\ResourceObjectPool;
@@ -70,7 +69,6 @@ protected function configure(): void
         ]);
         $this->bind(ProviderInterface::class)->annotatedWith('redis')->to(RedisDsnProvider::class);
         $this->bind()->annotatedWith('redis')->toProvider(RedisDsnProvider::class);
-        $this->bind(TagAwareAdapterInterface::class)->annotatedWith(EtagPool::class)->to(NullTagAwareAdapter::class);
         $this->bind(TagAwareAdapterInterface::class)->annotatedWith(ResourceObjectPool::class)->toConstructor(
             RedisTagAwareAdapter::class,
             [