feat(storage): support multiple storages

innocenzi · innocenzi · commit 90f23612ebd1 · 2025-04-29T18:25:59.000+02:00
diff --git a/packages/container/src/Container.php b/packages/container/src/Container.php
@@ -12,7 +12,7 @@ interface Container
 {
     public function register(string $className, callable $definition): self;
 
-    public function unregister(string $className): self;
+    public function unregister(string $className, bool $tagged = false): self;
 
     public function singleton(string $className, mixed $definition, ?string $tag = null): self;
 
diff --git a/packages/container/src/GenericContainer.php b/packages/container/src/GenericContainer.php
@@ -16,6 +16,7 @@
 use Tempest\Reflection\MethodReflector;
 use Tempest\Reflection\ParameterReflector;
 use Tempest\Reflection\TypeReflector;
+use Tempest\Support\Arr;
 use Throwable;
 
 final class GenericContainer implements Container
@@ -44,6 +45,13 @@ public function setDefinitions(array $definitions): self
         return $this;
     }
 
+    public function setSingletons(array $singletons): self
+    {
+        $this->singletons = new ArrayIterator($singletons);
+
+        return $this;
+    }
+
     public function setInitializers(array $initializers): self
     {
         $this->initializers = new ArrayIterator($initializers);
@@ -85,10 +93,19 @@ public function register(string $className, callable $definition): self
         return $this;
     }
 
-    public function unregister(string $className): self
+    public function unregister(string $className, bool $tagged = false): self
     {
         unset($this->definitions[$className], $this->singletons[$className]);
 
+        if ($tagged) {
+            $singletons = Arr\filter(
+                array: $this->getSingletons(),
+                filter: static fn (mixed $_, string $key) => ! str_starts_with($key, "{$className}#"),
+            );
+
+            $this->setSingletons($singletons);
+        }
+
         return $this;
     }
 
@@ -241,6 +258,28 @@ public function addInitializer(ClassReflector|string $initializerClass): Contain
         return $this;
     }
 
+    public function removeInitializer(ClassReflector|string $initializerClass): Container
+    {
+        if (! ($initializerClass instanceof ClassReflector)) {
+            $initializerClass = new ClassReflector($initializerClass);
+        }
+
+        if ($initializerClass->getType()->matches(DynamicInitializer::class)) {
+            $index = array_find_key(
+                array: $this->dynamicInitializers->getArrayCopy(),
+                callback: static fn (string $className) => $className === $initializerClass->getName(),
+            );
+
+            unset($this->dynamicInitializers[$index]);
+
+            return $this;
+        }
+
+        unset($this->initializers[$initializerClass->getName()]);
+
+        return $this;
+    }
+
     private function resolve(string $className, ?string $tag = null, mixed ...$params): ?object
     {
         $class = new ClassReflector($className);
diff --git a/packages/container/tests/ContainerTest.php b/packages/container/tests/ContainerTest.php
@@ -443,6 +443,25 @@ public function test_unregister_singleton(): void
         $container->get(InterfaceA::class);
     }
 
+    public function test_unregister_tagged(): void
+    {
+        $container = new GenericContainer();
+
+        $container->singleton(
+            TaggedDependency::class,
+            new TaggedDependency('web'),
+            tag: 'web',
+        );
+
+        $this->assertInstanceOf(TaggedDependency::class, $container->get(TaggedDependency::class, 'web'));
+
+        $container->unregister(TaggedDependency::class, tagged: true);
+
+        $this->expectException(CannotResolveTaggedDependency::class);
+
+        $container->get(TaggedDependency::class, 'web');
+    }
+
     public function test_has(): void
     {
         $container = new GenericContainer();
diff --git a/packages/storage/src/Config/AzureStorageConfig.php b/packages/storage/src/Config/AzureStorageConfig.php
@@ -5,6 +5,7 @@
 use League\Flysystem\AzureBlobStorage\AzureBlobStorageAdapter;
 use League\Flysystem\FilesystemAdapter;
 use MicrosoftAzure\Storage\Blob\BlobRestProxy;
+use UnitEnum;
 
 final class AzureStorageConfig implements StorageConfig
 {
@@ -30,6 +31,11 @@ public function __construct(
          * Whether the storage is read-only.
          */
         public bool $readonly = false,
+
+        /**
+         * Identifier for this storage configuration.
+         */
+        public null|string|UnitEnum $tag = null,
     ) {}
 
     public function createAdapter(): FilesystemAdapter
diff --git a/packages/storage/src/Config/CustomStorageConfig.php b/packages/storage/src/Config/CustomStorageConfig.php
@@ -3,6 +3,7 @@
 namespace Tempest\Storage\Config;
 
 use League\Flysystem\FilesystemAdapter;
+use UnitEnum;
 
 use function Tempest\get;
 
@@ -20,6 +21,11 @@ public function __construct(
          * Whether the storage is read-only.
          */
         public bool $readonly = false,
+
+        /**
+         * Identifier for this storage configuration.
+         */
+        public null|string|UnitEnum $tag = null,
     ) {}
 
     public function createAdapter(): FilesystemAdapter
diff --git a/packages/storage/src/Config/FTPStorageConfig.php b/packages/storage/src/Config/FTPStorageConfig.php
@@ -5,6 +5,7 @@
 use League\Flysystem\FilesystemAdapter;
 use League\Flysystem\Ftp\FtpAdapter;
 use League\Flysystem\Ftp\FtpConnectionOptions;
+use UnitEnum;
 
 final class FTPStorageConfig implements StorageConfig
 {
@@ -29,7 +30,16 @@ public function __construct(
         public ?bool $ignorePassiveAddress = null,
         public bool $recurseManually = true,
         public bool $timestampsOnUnixListingsEnabled = false,
+
+        /**
+         * Whether the storage is read-only.
+         */
         public bool $readonly = false,
+
+        /**
+         * Identifier for this storage configuration.
+         */
+        public null|string|UnitEnum $tag = null,
     ) {}
 
     public function createAdapter(): FilesystemAdapter
diff --git a/packages/storage/src/Config/GoogleCloudStorageConfig.php b/packages/storage/src/Config/GoogleCloudStorageConfig.php
@@ -5,6 +5,7 @@
 use Google\Cloud\Storage\StorageClient;
 use League\Flysystem\FilesystemAdapter;
 use League\Flysystem\GoogleCloudStorage\GoogleCloudStorageAdapter;
+use UnitEnum;
 
 final class GoogleCloudStorageConfig implements StorageConfig
 {
@@ -45,6 +46,11 @@ public function __construct(
          * Whether the storage is read-only.
          */
         public bool $readonly = false,
+
+        /**
+         * Identifier for this storage configuration.
+         */
+        public null|string|UnitEnum $tag = null,
     ) {}
 
     public function createAdapter(): FilesystemAdapter
diff --git a/packages/storage/src/Config/InMemoryStorageConfig.php b/packages/storage/src/Config/InMemoryStorageConfig.php
@@ -4,6 +4,7 @@
 
 use League\Flysystem\FilesystemAdapter;
 use League\Flysystem\InMemory\InMemoryFilesystemAdapter;
+use UnitEnum;
 
 final class InMemoryStorageConfig implements StorageConfig
 {
@@ -14,6 +15,11 @@ public function __construct(
          * Whether the storage is read-only.
          */
         public bool $readonly = false,
+
+        /**
+         * Identifier for this storage configuration.
+         */
+        public null|string|UnitEnum $tag = null,
     ) {}
 
     public function createAdapter(): FilesystemAdapter
diff --git a/packages/storage/src/Config/LocalStorageConfig.php b/packages/storage/src/Config/LocalStorageConfig.php
@@ -4,6 +4,7 @@
 
 use League\Flysystem\FilesystemAdapter;
 use League\Flysystem\Local\LocalFilesystemAdapter;
+use UnitEnum;
 
 final class LocalStorageConfig implements StorageConfig
 {
@@ -19,6 +20,11 @@ public function __construct(
          * Whether the storage is read-only.
          */
         public bool $readonly = false,
+
+        /**
+         * Identifier for this storage configuration.
+         */
+        public null|string|UnitEnum $tag = null,
     ) {}
 
     public function createAdapter(): FilesystemAdapter
diff --git a/packages/storage/src/Config/R2StorageConfig.php b/packages/storage/src/Config/R2StorageConfig.php
@@ -4,6 +4,7 @@
 
 use League\Flysystem\AwsS3V3\AwsS3V3Adapter;
 use League\Flysystem\FilesystemAdapter;
+use UnitEnum;
 
 final class R2StorageConfig implements StorageConfig
 {
@@ -44,6 +45,11 @@ public function __construct(
          * Other options.
          */
         public array $options = [],
+
+        /**
+         * Identifier for this storage configuration.
+         */
+        public null|string|UnitEnum $tag = null,
     ) {}
 
     public function createAdapter(): FilesystemAdapter
diff --git a/packages/storage/src/Config/S3StorageConfig.php b/packages/storage/src/Config/S3StorageConfig.php
@@ -5,6 +5,7 @@
 use Aws\S3\S3Client;
 use League\Flysystem\AwsS3V3\AwsS3V3Adapter;
 use League\Flysystem\FilesystemAdapter;
+use UnitEnum;
 
 final class S3StorageConfig implements StorageConfig
 {
@@ -60,6 +61,11 @@ public function __construct(
          * Other options.
          */
         public array $options = [],
+
+        /**
+         * Identifier for this storage configuration.
+         */
+        public null|string|UnitEnum $tag = null,
     ) {}
 
     public function createAdapter(): FilesystemAdapter
diff --git a/packages/storage/src/Config/SFTPStorageConfig.php b/packages/storage/src/Config/SFTPStorageConfig.php
@@ -5,6 +5,7 @@
 use League\Flysystem\FilesystemAdapter;
 use League\Flysystem\PhpseclibV3\SftpAdapter;
 use League\Flysystem\PhpseclibV3\SftpConnectionProvider;
+use UnitEnum;
 
 final class SFTPStorageConfig implements StorageConfig
 {
@@ -22,7 +23,16 @@ public function __construct(
         public int $timeoutInSeconds = 10,
         public int $maxTries = 3,
         public ?string $hostFingerprint = null,
+
+        /**
+         * Whether the storage is read-only.
+         */
         public bool $readonly = false,
+
+        /**
+         * Identifier for this storage configuration.
+         */
+        public null|string|UnitEnum $tag = null,
     ) {}
 
     public function createAdapter(): FilesystemAdapter
diff --git a/packages/storage/src/Config/StorageConfig.php b/packages/storage/src/Config/StorageConfig.php
@@ -3,8 +3,9 @@
 namespace Tempest\Storage\Config;
 
 use League\Flysystem\FilesystemAdapter;
+use Tempest\Container\HasTag;
 
-interface StorageConfig
+interface StorageConfig extends HasTag
 {
     /**
      * Whether the storage is read-only.
diff --git a/packages/storage/src/Config/ZipArchiveStorageConfig.php b/packages/storage/src/Config/ZipArchiveStorageConfig.php
@@ -6,6 +6,7 @@
 use League\Flysystem\Local\LocalFilesystemAdapter;
 use League\Flysystem\ZipArchive\FilesystemZipArchiveProvider;
 use League\Flysystem\ZipArchive\ZipArchiveAdapter;
+use UnitEnum;
 
 final class ZipArchiveStorageConfig implements StorageConfig
 {
@@ -26,6 +27,11 @@ public function __construct(
          * Whether the storage is read-only.
          */
         public bool $readonly = false,
+
+        /**
+         * Identifier for this storage configuration.
+         */
+        public null|string|UnitEnum $tag = null,
     ) {}
 
     public function createAdapter(): FilesystemAdapter
diff --git a/packages/storage/src/StorageInitializer.php b/packages/storage/src/StorageInitializer.php
@@ -3,17 +3,23 @@
 namespace Tempest\Storage;
 
 use Tempest\Container\Container;
-use Tempest\Container\Initializer;
+use Tempest\Container\DynamicInitializer;
 use Tempest\Container\Singleton;
+use Tempest\Reflection\ClassReflector;
 use Tempest\Storage\Config\StorageConfig;
 
-final class StorageInitializer implements Initializer
+final class StorageInitializer implements DynamicInitializer
 {
+    public function canInitialize(ClassReflector $class, ?string $tag): bool
+    {
+        return $class->getType()->matches(Storage::class);
+    }
+
     #[Singleton]
-    public function initialize(Container $container): Storage
+    public function initialize(ClassReflector $class, ?string $tag, Container $container): Storage
     {
         return new GenericStorage(
-            storageConfig: $container->get(StorageConfig::class), // TODO(innocenzi): tag
+            storageConfig: $container->get(StorageConfig::class, $tag),
         );
     }
 }
diff --git a/packages/storage/src/Testing/RestrictedStorageInitializer.php b/packages/storage/src/Testing/RestrictedStorageInitializer.php
@@ -3,17 +3,23 @@
 namespace Tempest\Storage\Testing;
 
 use Tempest\Container\Container;
-use Tempest\Container\Initializer;
+use Tempest\Container\DynamicInitializer;
 use Tempest\Container\Singleton;
 use Tempest\Discovery\SkipDiscovery;
+use Tempest\Reflection\ClassReflector;
 use Tempest\Storage\Storage;
 
 #[SkipDiscovery]
-final class RestrictedStorageInitializer implements Initializer
+final class RestrictedStorageInitializer implements DynamicInitializer
 {
+    public function canInitialize(ClassReflector $class, ?string $tag): bool
+    {
+        return $class->getType()->matches(Storage::class);
+    }
+
     #[Singleton]
-    public function initialize(Container $container): Storage
+    public function initialize(ClassReflector $class, ?string $tag, Container $container): Storage
     {
-        return new RestrictedStorage();
+        return new RestrictedStorage($tag);
     }
 }
diff --git a/packages/storage/src/Testing/StorageTester.php b/packages/storage/src/Testing/StorageTester.php
diff --git a/packages/storage/src/Testing/TestingStorage.php b/packages/storage/src/Testing/TestingStorage.php
diff --git a/packages/storage/tests/StorageTest.php b/packages/storage/tests/StorageTest.php
diff --git a/tests/Integration/Container/Commands/ContainerShowCommandTest.php b/tests/Integration/Container/Commands/ContainerShowCommandTest.php
diff --git a/tests/Integration/Storage/MultipleStoragesTest.php b/tests/Integration/Storage/MultipleStoragesTest.php
diff --git a/tests/Integration/Storage/StorageTesterTest.php b/tests/Integration/Storage/StorageTesterTest.php

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ interface Container`
`12`	`12`	`{`
`13`	`13`	`public function register(string $className, callable $definition): self;`
`14`	`14`
`15`		`- public function unregister(string $className): self;`
	`15`	`+ public function unregister(string $className, bool $tagged = false): self;`
`16`	`16`
`17`	`17`	`public function singleton(string $className, mixed $definition, ?string $tag = null): self;`
`18`	`18`