Remove unecessary DefinitionFactory circular reference in Adapter definitions builders

Author: tgalopin

src/Adapter/AdapterDefinitionFactory.php

@@ -29,20 +29,20 @@ class AdapterDefinitionFactory
     public function __construct()
     {
         $this->builders = [
-            new Builder\AwsAdapterDefinitionBuilder($this),
-            new Builder\AzureAdapterDefinitionBuilder($this),
-            new Builder\CacheAdapterDefinitionBuilder($this),
-            new Builder\DropboxAdapterDefinitionBuilder($this),
-            new Builder\FtpAdapterDefinitionBuilder($this),
-            new Builder\GcloudAdapterDefinitionBuilder($this),
-            new Builder\LocalAdapterDefinitionBuilder($this),
-            new Builder\MemoryAdapterDefinitionBuilder($this),
-            new Builder\NullAdapterDefinitionBuilder($this),
-            new Builder\RackspaceAdapterDefinitionBuilder($this),
-            new Builder\ReplicateAdapterDefinitionBuilder($this),
-            new Builder\SftpAdapterDefinitionBuilder($this),
-            new Builder\WebdavAdapterDefinitionBuilder($this),
-            new Builder\ZipAdapterDefinitionBuilder($this),
+            new Builder\AwsAdapterDefinitionBuilder(),
+            new Builder\AzureAdapterDefinitionBuilder(),
+            new Builder\CacheAdapterDefinitionBuilder(),
+            new Builder\DropboxAdapterDefinitionBuilder(),
+            new Builder\FtpAdapterDefinitionBuilder(),
+            new Builder\GcloudAdapterDefinitionBuilder(),
+            new Builder\LocalAdapterDefinitionBuilder(),
+            new Builder\MemoryAdapterDefinitionBuilder(),
+            new Builder\NullAdapterDefinitionBuilder(),
+            new Builder\RackspaceAdapterDefinitionBuilder(),
+            new Builder\ReplicateAdapterDefinitionBuilder(),
+            new Builder\SftpAdapterDefinitionBuilder(),
+            new Builder\WebdavAdapterDefinitionBuilder(),
+            new Builder\ZipAdapterDefinitionBuilder(),
         ];
     }
 

src/Adapter/Builder/AbstractAdapterDefinitionBuilder.php

@@ -11,7 +11,6 @@
 
 namespace League\FlysystemBundle\Adapter\Builder;
 
-use League\FlysystemBundle\Adapter\AdapterDefinitionFactory;
 use League\FlysystemBundle\Exception\MissingPackageException;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -23,13 +22,6 @@
  */
 abstract class AbstractAdapterDefinitionBuilder implements AdapterDefinitionBuilderInterface
 {
-    protected $definitionFactory;
-
-    public function __construct(AdapterDefinitionFactory $definitionFactory)
-    {
-        $this->definitionFactory = $definitionFactory;
-    }
-
     final public function createDefinition(array $options): Definition
     {
         $this->ensureRequiredPackagesAvailable();

tests/Adapter/Builder/AbstractAdapterDefinitionBuilderTest.php

@@ -13,13 +13,14 @@
 
 use League\Flysystem\AwsS3v3\AwsS3Adapter;
 use League\FlysystemBundle\Adapter\Builder\AwsAdapterDefinitionBuilder;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Reference;
 
-class AwsAdapterDefinitionBuilderTest extends AbstractAdapterDefinitionBuilderTest
+class AwsAdapterDefinitionBuilderTest extends TestCase
 {
     public function createBuilder()
     {
-        return new AwsAdapterDefinitionBuilder($this->createDefinitionFactory());
+        return new AwsAdapterDefinitionBuilder();
     }
 
     public function provideValidOptions()

tests/Adapter/Builder/AwsAdapterDefinitionBuilderTest.php

@@ -13,13 +13,14 @@
 
 use League\Flysystem\AzureBlobStorage\AzureBlobStorageAdapter;
 use League\FlysystemBundle\Adapter\Builder\AzureAdapterDefinitionBuilder;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Reference;
 
-class AzureAdapterDefinitionBuilderTest extends AbstractAdapterDefinitionBuilderTest
+class AzureAdapterDefinitionBuilderTest extends TestCase
 {
     public function createBuilder()
     {
-        return new AzureAdapterDefinitionBuilder($this->createDefinitionFactory());
+        return new AzureAdapterDefinitionBuilder();
     }
 
     public function provideValidOptions()

tests/Adapter/Builder/AzureAdapterDefinitionBuilderTest.php

@@ -14,14 +14,15 @@
 use League\Flysystem\Cached\CachedAdapter;
 use League\Flysystem\Cached\Storage\Psr6Cache;
 use League\FlysystemBundle\Adapter\Builder\CacheAdapterDefinitionBuilder;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 
-class CacheAdapterDefinitionBuilderTest extends AbstractAdapterDefinitionBuilderTest
+class CacheAdapterDefinitionBuilderTest extends TestCase
 {
     public function createBuilder()
     {
-        return new CacheAdapterDefinitionBuilder($this->createDefinitionFactory());
+        return new CacheAdapterDefinitionBuilder();
     }
 
     public function provideValidOptions()

tests/Adapter/Builder/CacheAdapterDefinitionBuilderTest.php

@@ -12,14 +12,15 @@
 namespace Tests\League\FlysystemBundle\Adapter\Builder;
 
 use League\FlysystemBundle\Adapter\Builder\DropboxAdapterDefinitionBuilder;
+use PHPUnit\Framework\TestCase;
 use Spatie\FlysystemDropbox\DropboxAdapter;
 use Symfony\Component\DependencyInjection\Reference;
 
-class DropboxAdapterDefinitionBuilderTest extends AbstractAdapterDefinitionBuilderTest
+class DropboxAdapterDefinitionBuilderTest extends TestCase
 {
     public function createBuilder()
     {
-        return new DropboxAdapterDefinitionBuilder($this->createDefinitionFactory());
+        return new DropboxAdapterDefinitionBuilder();
     }
 
     public function provideValidOptions()

tests/Adapter/Builder/DropboxAdapterDefinitionBuilderTest.php

@@ -12,15 +12,16 @@
 namespace Tests\League\FlysystemBundle\Adapter\Builder;
 
 use League\FlysystemBundle\Adapter\Builder\GcloudAdapterDefinitionBuilder;
+use PHPUnit\Framework\TestCase;
 use Superbalist\Flysystem\GoogleStorage\GoogleStorageAdapter;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 
-class GcloudAdapterDefinitionBuilderTest extends AbstractAdapterDefinitionBuilderTest
+class GcloudAdapterDefinitionBuilderTest extends TestCase
 {
     public function createBuilder()
     {
-        return new GcloudAdapterDefinitionBuilder($this->createDefinitionFactory());
+        return new GcloudAdapterDefinitionBuilder();
     }
 
     public function provideValidOptions()

tests/Adapter/Builder/GcloudAdapterDefinitionBuilderTest.php

@@ -13,12 +13,13 @@
 
 use League\Flysystem\Adapter\Local;
 use League\FlysystemBundle\Adapter\Builder\LocalAdapterDefinitionBuilder;
+use PHPUnit\Framework\TestCase;
 
-class LocalAdapterDefinitionBuilderTest extends AbstractAdapterDefinitionBuilderTest
+class LocalAdapterDefinitionBuilderTest extends TestCase
 {
     public function createBuilder()
     {
-        return new LocalAdapterDefinitionBuilder($this->createDefinitionFactory());
+        return new LocalAdapterDefinitionBuilder();
     }
 
     public function provideValidOptions()

tests/Adapter/Builder/LocalAdapterDefinitionBuilderTest.php

@@ -13,12 +13,13 @@
 
 use League\Flysystem\Memory\MemoryAdapter;
 use League\FlysystemBundle\Adapter\Builder\MemoryAdapterDefinitionBuilder;
+use PHPUnit\Framework\TestCase;
 
-class MemoryAdapterDefinitionBuilderTest extends AbstractAdapterDefinitionBuilderTest
+class MemoryAdapterDefinitionBuilderTest extends TestCase
 {
     public function createBuilder()
     {
-        return new MemoryAdapterDefinitionBuilder($this->createDefinitionFactory());
+        return new MemoryAdapterDefinitionBuilder();
     }
 
     public function testOptionsBehavior()