Add service tagged collection test

Author: tgalopin

src/DependencyInjection/Compiler/LazyFactoryPass.php

@@ -16,6 +16,11 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
+/**
+ * @author Titouan Galopin <galopintitouan@gmail.com>
+ *
+ * @internal
+ */
 class LazyFactoryPass implements CompilerPassInterface
 {
     /**

src/DependencyInjection/Compiler/PluginPass.php

@@ -16,6 +16,11 @@
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 
+/**
+ * @author BoShurik <boshurik@gmail.com>
+ *
+ * @internal
+ */
 class PluginPass implements CompilerPassInterface
 {
     /**

src/DependencyInjection/FlysystemExtension.php

@@ -90,6 +90,7 @@ private function createLazyStorageDefinition(string $storageName, array $options
         $definition->setFactory([new Reference('flysystem.adapter.lazy.factory'), 'createStorage']);
         $definition->setArgument(0, $resolver->resolve($options)['source']);
         $definition->setArgument(1, $storageName);
+        $definition->addTag('flysystem.storage', ['storage' => $storageName]);
 
         return $definition;
     }

tests/DependencyInjection/FlysytemExtensionTest.php

@@ -53,6 +53,32 @@ public function provideFilesystems()
      * @dataProvider provideFilesystems
      */
     public function testFileystems(string $fsName)
+    {
+        $kernel = $this->createFysystemKernel();
+        $fs = $kernel->getContainer()->get('flysystem.test.'.$fsName);
+
+        $this->assertInstanceOf(FilesystemInterface::class, $fs, 'Filesystem "'.$fsName.'" should be an instance of FilesystemInterface');
+        $this->assertEquals('plugin', $fs->pluginTest());
+    }
+
+    /**
+     * @dataProvider provideFilesystems
+     */
+    public function testTaggedCollection(string $fsName)
+    {
+        $kernel = $this->createFysystemKernel();
+
+        if (!$kernel->getContainer()->has('storages_tagged_collection')) {
+            $this->markTestSkipped('Symfony 4.3+ is required to use indexed tagged service collections');
+        }
+
+        $storages = iterator_to_array($kernel->getContainer()->get('storages_tagged_collection')->locator);
+
+        $this->assertInstanceOf(FilesystemInterface::class, $storages[$fsName]);
+        $this->assertEquals('plugin', $storages[$fsName]->pluginTest());
+    }
+
+    private function createFysystemKernel()
     {
         (new Dotenv())->populate([
             'AWS_BUCKET' => 'bucket-name',
@@ -69,9 +95,7 @@ public function testFileystems(string $fsName)
             $container->set($service, $mock);
         }
 
-        $fs = $container->get('flysystem.test.'.$fsName);
-        $this->assertInstanceOf(FilesystemInterface::class, $fs, 'Filesystem "'.$fsName.'" should be an instance of FilesystemInterface');
-        $this->assertEquals('plugin', $fs->pluginTest());
+        return $kernel;
     }
 
     private function getClientMocks()

tests/Kernel/FlysystemAppKernel.php

@@ -42,6 +42,10 @@ public function registerContainerConfiguration(LoaderInterface $loader)
         $loader->load(__DIR__.'/config/framework.yaml', 'yaml');
         $loader->load(__DIR__.'/config/flysystem.yaml', 'yaml');
         $loader->load(__DIR__.'/config/services.yaml', 'yaml');
+
+        if (self::VERSION_ID > 40300) {
+            $loader->load(__DIR__.'/config/tagged_collection.yaml', 'yaml');
+        }
     }
 
     public function setAdapterClients(array $adapterClients)

tests/Kernel/config/tagged_collection.yaml

@@ -0,0 +1,6 @@
+services:
+    storages_tagged_collection:
+        class: 'stdClass'
+        public: true
+        properties:
+            locator: !tagged { tag: 'flysystem.storage', index_by: 'storage' }