Add internal tags and increase coverage

tgalopin · tgalopin · commit 2f2ec2c2a3d2 · 2019-04-09T15:31:42.000+02:00
diff --git a/src/Adapter/Builder/AdapterDefinitionBuilderInterface.php b/src/Adapter/Builder/AdapterDefinitionBuilderInterface.php
@@ -15,6 +15,8 @@
 
 /**
  * @author Titouan Galopin <galopintitouan@gmail.com>
+ *
+ * @internal
  */
 interface AdapterDefinitionBuilderInterface
 {
diff --git a/src/Adapter/Builder/AwsAdapterDefinitionBuilder.php b/src/Adapter/Builder/AwsAdapterDefinitionBuilder.php
@@ -18,6 +18,8 @@
 
 /**
  * @author Titouan Galopin <galopintitouan@gmail.com>
+ *
+ * @internal
  */
 class AwsAdapterDefinitionBuilder extends AbstractAdapterDefinitionBuilder
 {
diff --git a/src/Adapter/Builder/AzureAdapterDefinitionBuilder.php b/src/Adapter/Builder/AzureAdapterDefinitionBuilder.php
@@ -18,6 +18,8 @@
 
 /**
  * @author Titouan Galopin <galopintitouan@gmail.com>
+ *
+ * @internal
  */
 class AzureAdapterDefinitionBuilder extends AbstractAdapterDefinitionBuilder
 {
diff --git a/src/Adapter/Builder/CacheAdapterDefinitionBuilder.php b/src/Adapter/Builder/CacheAdapterDefinitionBuilder.php
@@ -19,6 +19,8 @@
 
 /**
  * @author Titouan Galopin <galopintitouan@gmail.com>
+ *
+ * @internal
  */
 class CacheAdapterDefinitionBuilder extends AbstractAdapterDefinitionBuilder
 {
diff --git a/src/Adapter/Builder/DropboxAdapterDefinitionBuilder.php b/src/Adapter/Builder/DropboxAdapterDefinitionBuilder.php
@@ -18,6 +18,8 @@
 
 /**
  * @author Titouan Galopin <galopintitouan@gmail.com>
+ *
+ * @internal
  */
 class DropboxAdapterDefinitionBuilder extends AbstractAdapterDefinitionBuilder
 {
diff --git a/src/Adapter/Builder/FtpAdapterDefinitionBuilder.php b/src/Adapter/Builder/FtpAdapterDefinitionBuilder.php
@@ -17,6 +17,8 @@
 
 /**
  * @author Titouan Galopin <galopintitouan@gmail.com>
+ *
+ * @internal
  */
 class FtpAdapterDefinitionBuilder extends AbstractAdapterDefinitionBuilder
 {
diff --git a/src/Adapter/Builder/GcloudAdapterDefinitionBuilder.php b/src/Adapter/Builder/GcloudAdapterDefinitionBuilder.php
@@ -18,6 +18,8 @@
 
 /**
  * @author Titouan Galopin <galopintitouan@gmail.com>
+ *
+ * @internal
  */
 class GcloudAdapterDefinitionBuilder extends AbstractAdapterDefinitionBuilder
 {
diff --git a/src/Adapter/Builder/LocalAdapterDefinitionBuilder.php b/src/Adapter/Builder/LocalAdapterDefinitionBuilder.php
@@ -17,6 +17,8 @@
 
 /**
  * @author Titouan Galopin <galopintitouan@gmail.com>
+ *
+ * @internal
  */
 class LocalAdapterDefinitionBuilder extends AbstractAdapterDefinitionBuilder
 {
diff --git a/src/Adapter/Builder/RackspaceAdapterDefinitionBuilder.php b/src/Adapter/Builder/RackspaceAdapterDefinitionBuilder.php
@@ -18,6 +18,8 @@
 
 /**
  * @author Titouan Galopin <galopintitouan@gmail.com>
+ *
+ * @internal
  */
 class RackspaceAdapterDefinitionBuilder extends AbstractAdapterDefinitionBuilder
 {
diff --git a/src/Adapter/Builder/ReplicateAdapterDefinitionBuilder.php b/src/Adapter/Builder/ReplicateAdapterDefinitionBuilder.php
@@ -18,6 +18,8 @@
 
 /**
  * @author Titouan Galopin <galopintitouan@gmail.com>
+ *
+ * @internal
  */
 class ReplicateAdapterDefinitionBuilder extends AbstractAdapterDefinitionBuilder
 {
diff --git a/src/Adapter/Builder/SftpAdapterDefinitionBuilder.php b/src/Adapter/Builder/SftpAdapterDefinitionBuilder.php
@@ -17,6 +17,8 @@
 
 /**
  * @author Titouan Galopin <galopintitouan@gmail.com>
+ *
+ * @internal
  */
 class SftpAdapterDefinitionBuilder extends AbstractAdapterDefinitionBuilder
 {
diff --git a/src/Adapter/Builder/WebdavAdapterDefinitionBuilder.php b/src/Adapter/Builder/WebdavAdapterDefinitionBuilder.php
@@ -18,6 +18,8 @@
 
 /**
  * @author Titouan Galopin <galopintitouan@gmail.com>
+ *
+ * @internal
  */
 class WebdavAdapterDefinitionBuilder extends AbstractAdapterDefinitionBuilder
 {
diff --git a/src/Adapter/Builder/ZipAdapterDefinitionBuilder.php b/src/Adapter/Builder/ZipAdapterDefinitionBuilder.php
@@ -18,6 +18,8 @@
 
 /**
  * @author Titouan Galopin <galopintitouan@gmail.com>
+ *
+ * @internal
  */
 class ZipAdapterDefinitionBuilder extends AbstractAdapterDefinitionBuilder
 {
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -28,8 +28,7 @@ public function getConfigTreeBuilder()
 
         $rootNode
             ->children()
-                ->scalarNode('default_filesystem')->isRequired()->end()
-                ->arrayNode('filesystems')
+                ->arrayNode('storages')
                     ->arrayPrototype()
                         ->children()
                             ->scalarNode('adapter')->isRequired()->end()
diff --git a/src/DependencyInjection/FlysystemExtension.php b/src/DependencyInjection/FlysystemExtension.php
@@ -31,40 +31,27 @@ public function load(array $configs, ContainerBuilder $container)
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $this->registerFilesystems($container, $config['filesystems']);
-
-        // Create default filesystem alias
-        if (!isset($config['filesystems'][$config['default_filesystem']])) {
-            throw new \LogicException('Default filesystem "'.$config['default_filesystem'].'" is not defined in the "flysystem.filesystems" configuration key.');
-        }
-
-        $container->setAlias(FilesystemInterface::class, $config['default_filesystem'])->setPublic(false);
-        $container->setAlias('flysystem', $config['default_filesystem'])->setPublic(false);
-    }
-
-    private function registerFilesystems(ContainerBuilder $container, array $filesystems)
-    {
         $adapterFactory = new AdapterDefinitionFactory();
 
-        foreach ($filesystems as $fsName => $fsConfig) {
+        foreach ($config['storages'] as $storageName => $storageConfig) {
             // Create adapter service definition
-            if ($adapter = $adapterFactory->createDefinition($fsConfig['adapter'], $fsConfig['options'])) {
+            if ($adapter = $adapterFactory->createDefinition($storageConfig['adapter'], $storageConfig['options'])) {
                 // Native adapter
-                $container->setDefinition('flysystem.adapter.'.$fsName, $adapter)->setPublic(false);
+                $container->setDefinition('flysystem.adapter.'.$storageName, $adapter)->setPublic(false);
             } else {
                 // Custom adapter
-                $container->setAlias('flysystem.adapter.'.$fsName, $fsConfig['adapter'])->setPublic(false);
+                $container->setAlias('flysystem.adapter.'.$storageName, $storageConfig['adapter'])->setPublic(false);
             }
 
-            // Create filesystem service definition
-            $definition = $this->createFilesystemDefinition(new Reference('flysystem.adapter.'.$fsName), $fsConfig);
+            // Create storage service definition
+            $definition = $this->createStorageDefinition(new Reference('flysystem.adapter.'.$storageName), $storageConfig);
 
-            $container->setDefinition($fsName, $definition);
-            $container->registerAliasForArgument($fsName, FilesystemInterface::class, $fsName)->setPublic(false);
+            $container->setDefinition($storageName, $definition);
+            $container->registerAliasForArgument($storageName, FilesystemInterface::class, $storageName)->setPublic(false);
         }
     }
 
-    private function createFilesystemDefinition(Reference $adapter, array $config)
+    private function createStorageDefinition(Reference $adapter, array $config)
     {
         $definition = new Definition(Filesystem::class);
         $definition->setPublic(false);
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
diff --git a/tests/DependencyInjection/FlysytemExtensionTest.php b/tests/DependencyInjection/FlysytemExtensionTest.php
@@ -12,6 +12,7 @@
 namespace Tests\League\FlysystemBundle\DependencyInjection;
 
 use Aws\S3\S3Client;
+use Google\Cloud\Storage\Bucket;
 use Google\Cloud\Storage\StorageClient;
 use League\Flysystem\FilesystemInterface;
 use MicrosoftAzure\Storage\Blob\BlobRestProxy;
@@ -42,11 +43,14 @@ public function testCreateFileystems()
 
     private function getClientMocks()
     {
+        $gcloud = $this->createMock(StorageClient::class);
+        $gcloud->method('bucket')->willReturn($this->createMock(Bucket::class));
+
         return [
             'aws_client_service' => $this->createMock(S3Client::class),
             'azure_client_service' => $this->createMock(BlobRestProxy::class),
             'dropbox_client_service' => $this->createMock(DropboxClient::class),
-            'gcloud_client_service' => $this->createMock(StorageClient::class),
+            'gcloud_client_service' => $gcloud,
             'rackspace_container_service' => $this->createMock(Container::class),
             'webdav_client_service' => $this->createMock(WebDAVClient::class),
         ];
@@ -57,6 +61,17 @@ private function getFilesystems()
         return [
             'fs_aws',
             'fs_azure',
+            'fs_cache',
+            'fs_custom',
+            'fs_dropbox',
+            'fs_ftp',
+            'fs_gcloud',
+            'fs_local',
+            'fs_rackspace',
+            'fs_replicate',
+            'fs_sftp',
+            'fs_webdav',
+            'fs_zip',
         ];
     }
 }
diff --git a/tests/Kernel/EmptyAppKernel.php b/tests/Kernel/EmptyAppKernel.php
@@ -29,8 +29,7 @@ public function registerContainerConfiguration(LoaderInterface $loader)
     {
         $loader->load(function (ContainerBuilder $container) {
             $container->loadFromExtension('flysystem', [
-                'default_filesystem' => 'app',
-                'filesystems' => ['app' => ['adapter' => 'flysystem.adapter.local']],
+                'storages' => ['uploads.storage' => ['adapter' => 'local', 'options' => ['directory' => __DIR__]]],
             ]);
         });
     }
diff --git a/tests/Kernel/FrameworkAppKernel.php b/tests/Kernel/FrameworkAppKernel.php
@@ -30,10 +30,8 @@ public function registerContainerConfiguration(LoaderInterface $loader)
     {
         $loader->load(function (ContainerBuilder $container) {
             $container->loadFromExtension('framework', ['secret' => '$ecret']);
-
             $container->loadFromExtension('flysystem', [
-                'default_filesystem' => 'uploads.storage',
-                'filesystems' => ['uploads.storage' => ['adapter' => 'local', 'options' => ['directory' => __DIR__]]],
+                'storages' => ['uploads.storage' => ['adapter' => 'local', 'options' => ['directory' => __DIR__]]],
             ]);
         });
     }
diff --git a/tests/Kernel/config/flysystem.yaml b/tests/Kernel/config/flysystem.yaml
@@ -1,6 +1,5 @@
 flysystem:
-    default_filesystem: 'fs_cache'
-    filesystems:
+    storages:
         fs_aws:
             adapter: 'aws'
             options:

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`
`16`	`16`	`/**`
`17`	`17`	`* @author Titouan Galopin <galopintitouan@gmail.com>`
	`18`	`+ *`
	`19`	`+ * @internal`
`18`	`20`	`*/`
`19`	`21`	`interface AdapterDefinitionBuilderInterface`
`20`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@`
`18`	`18`
`19`	`19`	`/**`
`20`	`20`	`* @author Titouan Galopin <galopintitouan@gmail.com>`
	`21`	`+ *`
	`22`	`+ * @internal`
`21`	`23`	`*/`
`22`	`24`	`class AwsAdapterDefinitionBuilder extends AbstractAdapterDefinitionBuilder`
`23`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@`
`19`	`19`
`20`	`20`	`/**`
`21`	`21`	`* @author Titouan Galopin <galopintitouan@gmail.com>`
	`22`	`+ *`
	`23`	`+ * @internal`
`22`	`24`	`*/`
`23`	`25`	`class CacheAdapterDefinitionBuilder extends AbstractAdapterDefinitionBuilder`
`24`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@`
`17`	`17`
`18`	`18`	`/**`
`19`	`19`	`* @author Titouan Galopin <galopintitouan@gmail.com>`
	`20`	`+ *`
	`21`	`+ * @internal`
`20`	`22`	`*/`
`21`	`23`	`class FtpAdapterDefinitionBuilder extends AbstractAdapterDefinitionBuilder`
`22`	`24`	`{`