Merge pull request #84 from eivydas/path-and-url

Pass path and url parameters to Filesystem
bushbaby · Mar 6, 2024 · b5f65d7 · b5f65d7
2 parents 2eee1c5 + 3b57fcd
commit b5f65d7
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 10 deletions.
diff --git a/config/bsb_flysystem.local.php.dist b/config/bsb_flysystem.local.php.dist
@@ -195,8 +195,8 @@ return [
                 'adapter' => 'local_default',
                 'adapter_options' => null,
                 'options' => [
-                    'pathNormalizer' => null, // returns PathNormalizer::class
-                    'publicUrlGenerator' => null, // returns \League\Flysystem\UrlGeneration\PublicUrlGeneratorInterface::class
+                    'pathNormalizer' => null, // returns \League\Flysystem\PathNormalizer::class
+                    'publicUrlGenerator' => null, // returns \League\Flysystem\UrlGeneration\PublicUrlGenerator::class
                     'temporaryUrlGenerator' => null, // returns \League\Flysystem\UrlGeneration\TemporaryUrlGenerator::class
                 ],
             ],

diff --git a/src/Adapter/Factory/AbstractAdapterFactory.php b/src/Adapter/Factory/AbstractAdapterFactory.php
@@ -107,12 +107,12 @@ public function __invoke(ContainerInterface $container, $requestedName, ?array $
     /**
      * Merges the options given from the ServiceLocator Config object with the create options of the class.
      */
-    protected function mergeMvcConfig(ContainerInterface $container, string $requestedName = null): void
+    protected function mergeMvcConfig(ContainerInterface $container, ?string $requestedName = null): void
     {
         $config = $container->has('config') ? $container->get('config') : [];
 
-        if (! isset($config['bsb_flysystem']['adapters'][$requestedName]['options']) ||
-            ! \is_array(($config['bsb_flysystem']['adapters'][$requestedName]['options']))
+        if (! isset($config['bsb_flysystem']['adapters'][$requestedName]['options'])
+            || ! \is_array(($config['bsb_flysystem']['adapters'][$requestedName]['options']))
         ) {
             return;
         }

diff --git a/src/Exception/RequirementsException.php b/src/Exception/RequirementsException.php
@@ -21,7 +21,7 @@
 
 class RequirementsException extends RuntimeException
 {
-    public function __construct(array $requirements, string $for, int $code = 0, \Exception $previous = null)
+    public function __construct(array $requirements, string $for, int $code = 0, ?\Exception $previous = null)
     {
         $requirements = array_map(function ($r) {
             return sprintf("'%s'", trim($r));

diff --git a/src/Filesystem/Factory/FilesystemFactory.php b/src/Filesystem/Factory/FilesystemFactory.php
@@ -73,6 +73,21 @@ public function __invoke(ContainerInterface $container, string $requestedName, ?
 
         $options = $configForRequestedFS['options'] ?? [];
 
-        return new Filesystem($adapter, $options);
+        $pathNormalizer = $options['pathNormalizer'] ?? null;
+        if (null !== $pathNormalizer) {
+            $pathNormalizer = $container->get($pathNormalizer);
+        }
+
+        $publicUrlGenerator = $options['publicUrlGenerator'] ?? null;
+        if (null !== $publicUrlGenerator) {
+            $publicUrlGenerator = $container->get($publicUrlGenerator);
+        }
+
+        $temporaryUrlGenerator = $options['temporaryUrlGenerator'] ?? null;
+        if (null !== $temporaryUrlGenerator) {
+            $temporaryUrlGenerator = $container->get($temporaryUrlGenerator);
+        }
+
+        return new Filesystem($adapter, $options, $pathNormalizer, $publicUrlGenerator, $temporaryUrlGenerator);
     }
 }
diff --git a/src/Service/Factory/FilesystemManagerFactory.php b/src/Service/Factory/FilesystemManagerFactory.php
@@ -25,7 +25,7 @@
 
 class FilesystemManagerFactory
 {
-    public function __invoke(ContainerInterface $container, $requestedName, array $options = null): FilesystemManager
+    public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null): FilesystemManager
     {
         $filesystems = ($container->has('config') ? $container->get('config') : [])['bsb_flysystem']['filesystems'] ?? [];
 

diff --git a/test/Assets/bsb_flysystem.local.php b/test/Assets/bsb_flysystem.local.php
@@ -210,8 +210,8 @@
                 'adapter' => 'local_default',
                 'adapter_options' => null,
                 'options' => [
-                    'pathNormalizer' => null, // returns PathNormalizer::class
-                    'publicUrlGenerator' => null, // returns \League\Flysystem\UrlGeneration\PublicUrlGeneratorInterface::class
+                    'pathNormalizer' => null, // returns \League\Flysystem\PathNormalizer::class
+                    'publicUrlGenerator' => null, // returns \League\Flysystem\UrlGeneration\PublicUrlGenerator::class
                     'temporaryUrlGenerator' => null, // returns \League\Flysystem\UrlGeneration\TemporaryUrlGenerator::class
                 ],
             ],