Refactor - create filesystems with a factory and provider will retreive the service which is the filesystem inc config

Author: silverbackdan

src/DependencyInjection/CompilerPass/FlysystemCompilerPass.php

@@ -14,6 +14,7 @@
 namespace Silverback\ApiComponentsBundle\DependencyInjection\CompilerPass;
 
 use League\Flysystem\Filesystem;
+use Silverback\ApiComponentsBundle\Flysystem\FilesystemFactory;
 use Silverback\ApiComponentsBundle\Flysystem\FilesystemProvider;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -33,13 +34,16 @@ public function process(ContainerBuilder $container): void
                 $definition = new Definition();
                 $definition
                     ->setClass(Filesystem::class)
-                    ->setFactory([new Reference(FilesystemProvider::class), 'getFilesystem'])
+                    ->setFactory([new Reference(FilesystemFactory::class), 'create'])
                     ->setArguments([
                         $attributes['alias'],
                         $attributes['config'] ?? []
                     ]);
                 $serviceName = sprintf('api_components.filesystem.%s', $attributes['alias']);
-                $container->setDefinition($serviceName, $definition)->addTag(FilesystemProvider::FILESYSTEM_TAG, [ 'alias' => $attributes['alias'] ]);
+                $container
+                    ->setDefinition($serviceName, $definition)
+                    ->addTag(FilesystemProvider::FILESYSTEM_TAG, [ 'alias' => $attributes['alias'] ])
+                ;
             }
         }
     }

src/Flysystem/FilesystemFactory.php

@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Silverback API Components Bundle Project
+ *
+ * (c) Daniel West <daniel@silverback.is>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Silverback\ApiComponentsBundle\Flysystem;
+
+use League\Flysystem\Filesystem;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ServiceLocator;
+
+/**
+ * @author Daniel West <daniel@silverback.is>
+ */
+class FilesystemFactory
+{
+    public function __construct(private readonly ServiceLocator $adapters)
+    {}
+
+    /**
+     * @throws RuntimeException
+     */
+    public function create(string $name, array $config = []): Filesystem
+    {
+        return new Filesystem($this->adapters->get($name), $config);
+    }
+}

src/Flysystem/FilesystemProvider.php

@@ -14,6 +14,8 @@
 namespace Silverback\ApiComponentsBundle\Flysystem;
 
 use League\Flysystem\Filesystem;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\ServiceLocator;
 
@@ -24,23 +26,17 @@
 class FilesystemProvider
 {
     public const FILESYSTEM_ADAPTER_TAG = 'silverback.api_components.filesystem_adapter';
-    public const FILESYSTEM_TAG = 'silverback.api_components.filesystem_adapter';
+    public const FILESYSTEM_TAG = 'silverback.api_components.filesystem';
 
-    private array $filesystems = [];
-
-    public function __construct(private readonly ServiceLocator $adapters)
+    public function __construct(private readonly ServiceLocator $filesystems)
     {}
 
     /**
-     * @throws RuntimeException
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
-    private function createFilesystem(string $name, array $config = []): Filesystem
-    {
-        return $this->filesystems[$name] = new Filesystem($this->adapters->get($name), $config);
-    }
-
-    public function getFilesystem(string $name, array $config = []): ?Filesystem
+    public function getFilesystem(string $name): ?Filesystem
     {
-        return $this->filesystems[$name] ?? $this->createFilesystem($name,$config);
+        return $this->filesystems->get($name);
     }
 }

src/Resources/config/services.php

@@ -93,6 +93,7 @@
 use Silverback\ApiComponentsBundle\Factory\User\Mailer\WelcomeEmailFactory;
 use Silverback\ApiComponentsBundle\Factory\User\UserFactory;
 use Silverback\ApiComponentsBundle\Filter\OrSearchFilter;
+use Silverback\ApiComponentsBundle\Flysystem\FilesystemFactory;
 use Silverback\ApiComponentsBundle\Flysystem\FilesystemProvider;
 use Silverback\ApiComponentsBundle\Form\Type\User\ChangePasswordType;
 use Silverback\ApiComponentsBundle\Form\Type\User\NewEmailAddressType;
@@ -387,9 +388,13 @@
         ->tag('doctrine.repository_service');
 
     $services
-        ->set(FilesystemProvider::class)
+        ->set(FilesystemFactory::class)
         ->args([tagged_locator(FilesystemProvider::FILESYSTEM_ADAPTER_TAG, 'alias')]);
 
+    $services
+        ->set(FilesystemProvider::class)
+        ->args([tagged_locator(FilesystemProvider::FILESYSTEM_TAG, 'alias')]);
+
     $services
         ->set(FlysystemDataLoader::class)
         ->args(