Adaptions for Symfony 4.0

1up-lab · Nov 15, 2017 · 9cbf45f · 9cbf45f
1 parent b4eea24
commit 9cbf45f
Show file tree

Hide file tree

Showing 31 changed files with 77 additions and 69 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,10 +5,8 @@ php:
   - 7.1
 
 env:
-  - SYMFONY_VERSION=2.7.*
-  - SYMFONY_VERSION=2.8.*
-  - SYMFONY_VERSION=3.3.*
-  - SYMFONY_VERSION=4.0.*
+  - SYMFONY_VERSION=^3.3
+  - SYMFONY_VERSION=^4.0
   - SYMFONY_VERSION=dev-master
 
 cache:
@@ -18,11 +16,17 @@ cache:
 matrix:
   allow_failures:
     - env: SYMFONY_VERSION=dev-master
+  exclude:
+    - php: 7.0
+      env: SYMFONY_VERSION=^4.0
+    - php: 7.0
+      env: SYMFONY_VERSION=dev-master
 
 before_install:
-  - composer selfupdate
+  - travis_retry composer selfupdate
 
 before_script:
+  - if [ "$SYMFONY_VERSION" = "^4.0" ]; then composer config minimum-stability dev; composer config prefer-stable true; fi
   - travis_wait composer require symfony/framework-bundle:${SYMFONY_VERSION} --prefer-source
   - travis_wait composer install --dev --prefer-source
 

diff --git a/DependencyInjection/Factory/Adapter/AwsS3V2Factory.php b/DependencyInjection/Factory/Adapter/AwsS3V2Factory.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Reference;
 use Oneup\FlysystemBundle\DependencyInjection\Factory\AdapterFactoryInterface;
 
@@ -18,7 +18,7 @@ public function getKey()
     public function create(ContainerBuilder $container, $id, array $config)
     {
         $definition = $container
-            ->setDefinition($id, new DefinitionDecorator('oneup_flysystem.adapter.awss3v2'))
+            ->setDefinition($id, new ChildDefinition('oneup_flysystem.adapter.awss3v2'))
             ->replaceArgument(0, new Reference($config['client']))
             ->replaceArgument(1, $config['bucket'])
             ->replaceArgument(2, $config['prefix'])

diff --git a/DependencyInjection/Factory/Adapter/AwsS3V3Factory.php b/DependencyInjection/Factory/Adapter/AwsS3V3Factory.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Reference;
 use Oneup\FlysystemBundle\DependencyInjection\Factory\AdapterFactoryInterface;
 
@@ -18,7 +18,7 @@ public function getKey()
     public function create(ContainerBuilder $container, $id, array $config)
     {
         $definition = $container
-            ->setDefinition($id, new DefinitionDecorator('oneup_flysystem.adapter.awss3v3'))
+            ->setDefinition($id, new ChildDefinition('oneup_flysystem.adapter.awss3v3'))
             ->replaceArgument(0, new Reference($config['client']))
             ->replaceArgument(1, $config['bucket'])
             ->replaceArgument(2, $config['prefix'])

diff --git a/DependencyInjection/Factory/Adapter/DropboxFactory.php b/DependencyInjection/Factory/Adapter/DropboxFactory.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Reference;
 use Oneup\FlysystemBundle\DependencyInjection\Factory\AdapterFactoryInterface;
 
@@ -18,7 +18,7 @@ public function getKey()
     public function create(ContainerBuilder $container, $id, array $config)
     {
         $definition = $container
-            ->setDefinition($id, new DefinitionDecorator('oneup_flysystem.adapter.dropbox'))
+            ->setDefinition($id, new ChildDefinition('oneup_flysystem.adapter.dropbox'))
             ->replaceArgument(0, new Reference($config['client']))
             ->replaceArgument(1, $config['prefix'])
         ;

diff --git a/DependencyInjection/Factory/Adapter/FallbackFactory.php b/DependencyInjection/Factory/Adapter/FallbackFactory.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Reference;
 use Oneup\FlysystemBundle\DependencyInjection\Factory\AdapterFactoryInterface;
 
@@ -18,7 +18,7 @@ public function getKey()
     public function create(ContainerBuilder $container, $id, array $config)
     {
         $definition = $container
-            ->setDefinition($id, new DefinitionDecorator('oneup_flysystem.adapter.fallback'))
+            ->setDefinition($id, new ChildDefinition('oneup_flysystem.adapter.fallback'))
             ->replaceArgument(0, new Reference(sprintf('oneup_flysystem.%s_adapter', $config['mainAdapter'])))
             ->replaceArgument(1, new Reference(sprintf('oneup_flysystem.%s_adapter', $config['fallback'])))
             ->replaceArgument(2, $config['forceCopyOnMain'])

diff --git a/DependencyInjection/Factory/Adapter/FtpFactory.php b/DependencyInjection/Factory/Adapter/FtpFactory.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Oneup\FlysystemBundle\DependencyInjection\Factory\AdapterFactoryInterface;
 
 class FtpFactory implements AdapterFactoryInterface
@@ -17,7 +17,7 @@ public function getKey()
     public function create(ContainerBuilder $container, $id, array $config)
     {
         $definition = $container
-            ->setDefinition($id, new DefinitionDecorator('oneup_flysystem.adapter.ftp'))
+            ->setDefinition($id, new ChildDefinition('oneup_flysystem.adapter.ftp'))
             ->replaceArgument(0, $config)
         ;
     }

diff --git a/DependencyInjection/Factory/Adapter/GaufretteFactory.php b/DependencyInjection/Factory/Adapter/GaufretteFactory.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Reference;
 use Oneup\FlysystemBundle\DependencyInjection\Factory\AdapterFactoryInterface;
 
@@ -18,7 +18,7 @@ public function getKey()
     public function create(ContainerBuilder $container, $id, array $config)
     {
         $definition = $container
-            ->setDefinition($id, new DefinitionDecorator('oneup_flysystem.adapter.gaufrette'))
+            ->setDefinition($id, new ChildDefinition('oneup_flysystem.adapter.gaufrette'))
             ->replaceArgument(0, new Reference($config['adapter']))
         ;
     }

diff --git a/DependencyInjection/Factory/Adapter/GoogleCloudStorageFactory.php b/DependencyInjection/Factory/Adapter/GoogleCloudStorageFactory.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Reference;
 use Oneup\FlysystemBundle\DependencyInjection\Factory\AdapterFactoryInterface;
 
@@ -18,7 +18,7 @@ public function getKey()
     public function create(ContainerBuilder $container, $id, array $config)
     {
         $definition = $container
-            ->setDefinition($id, new DefinitionDecorator('oneup_flysystem.adapter.googlecloudstorage'))
+            ->setDefinition($id, new ChildDefinition('oneup_flysystem.adapter.googlecloudstorage'))
             ->replaceArgument(0, new Reference($config['client']))
             ->replaceArgument(1, new Reference($config['bucket']))
             ->replaceArgument(2, $config['prefix'])

diff --git a/DependencyInjection/Factory/Adapter/GridFSFactory.php b/DependencyInjection/Factory/Adapter/GridFSFactory.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Reference;
 use Oneup\FlysystemBundle\DependencyInjection\Factory\AdapterFactoryInterface;
 
@@ -18,7 +18,7 @@ public function getKey()
     public function create(ContainerBuilder $container, $id, array $config)
     {
         $definition = $container
-            ->setDefinition($id, new DefinitionDecorator('oneup_flysystem.adapter.gridfs'))
+            ->setDefinition($id, new ChildDefinition('oneup_flysystem.adapter.gridfs'))
             ->replaceArgument(0, new Reference($config['client']))
         ;
     }

diff --git a/DependencyInjection/Factory/Adapter/LocalFactory.php b/DependencyInjection/Factory/Adapter/LocalFactory.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Oneup\FlysystemBundle\DependencyInjection\Factory\AdapterFactoryInterface;
 use League\Flysystem\Adapter\Local;
 
@@ -18,7 +18,7 @@ public function getKey()
     public function create(ContainerBuilder $container, $id, array $config)
     {
         $container
-            ->setDefinition($id, new DefinitionDecorator('oneup_flysystem.adapter.local'))
+            ->setDefinition($id, new ChildDefinition('oneup_flysystem.adapter.local'))
             ->setLazy($config['lazy'])
             ->replaceArgument(0, $config['directory'])
             ->replaceArgument(1, $config['writeFlags'])

diff --git a/DependencyInjection/Factory/Adapter/MemoryAdapterFactory.php b/DependencyInjection/Factory/Adapter/MemoryAdapterFactory.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Oneup\FlysystemBundle\DependencyInjection\Factory\AdapterFactoryInterface;
 
 class MemoryAdapterFactory implements AdapterFactoryInterface
@@ -17,7 +17,7 @@ public function getKey()
     public function create(ContainerBuilder $container, $id, array $config)
     {
         $container
-            ->setDefinition($id, new DefinitionDecorator('oneup_flysystem.adapter.memory'))
+            ->setDefinition($id, new ChildDefinition('oneup_flysystem.adapter.memory'))
         ;
     }
 

diff --git a/DependencyInjection/Factory/Adapter/NullAdapterFactory.php b/DependencyInjection/Factory/Adapter/NullAdapterFactory.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Oneup\FlysystemBundle\DependencyInjection\Factory\AdapterFactoryInterface;
 
 class NullAdapterFactory implements AdapterFactoryInterface
@@ -17,7 +17,7 @@ public function getKey()
     public function create(ContainerBuilder $container, $id, array $config)
     {
         $container
-            ->setDefinition($id, new DefinitionDecorator('oneup_flysystem.adapter.nulladapter'))
+            ->setDefinition($id, new ChildDefinition('oneup_flysystem.adapter.nulladapter'))
         ;
     }
 

diff --git a/DependencyInjection/Factory/Adapter/RackspaceFactory.php b/DependencyInjection/Factory/Adapter/RackspaceFactory.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Reference;
 use Oneup\FlysystemBundle\DependencyInjection\Factory\AdapterFactoryInterface;
 
@@ -18,7 +18,7 @@ public function getKey()
     public function create(ContainerBuilder $container, $id, array $config)
     {
         $definition = $container
-            ->setDefinition($id, new DefinitionDecorator('oneup_flysystem.adapter.rackspace'))
+            ->setDefinition($id, new ChildDefinition('oneup_flysystem.adapter.rackspace'))
             ->setLazy($config['lazy'])
             ->replaceArgument(0, new Reference($config['container']))
             ->replaceArgument(1, $config['prefix'])

diff --git a/DependencyInjection/Factory/Adapter/ReplicateFactory.php b/DependencyInjection/Factory/Adapter/ReplicateFactory.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Reference;
 use Oneup\FlysystemBundle\DependencyInjection\Factory\AdapterFactoryInterface;
 
@@ -18,7 +18,7 @@ public function getKey()
     public function create(ContainerBuilder $container, $id, array $config)
     {
         $definition = $container
-            ->setDefinition($id, new DefinitionDecorator('oneup_flysystem.adapter.replicate'))
+            ->setDefinition($id, new ChildDefinition('oneup_flysystem.adapter.replicate'))
             ->replaceArgument(0, new Reference(sprintf('oneup_flysystem.%s_adapter', $config['sourceAdapter'])))
             ->replaceArgument(1, new Reference(sprintf('oneup_flysystem.%s_adapter', $config['replicaAdapter'])))
         ;

diff --git a/DependencyInjection/Factory/Adapter/SftpFactory.php b/DependencyInjection/Factory/Adapter/SftpFactory.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Oneup\FlysystemBundle\DependencyInjection\Factory\AdapterFactoryInterface;
 
 class SftpFactory implements AdapterFactoryInterface
@@ -17,7 +17,7 @@ public function getKey()
     public function create(ContainerBuilder $container, $id, array $config)
     {
         $definition = $container
-            ->setDefinition($id, new DefinitionDecorator('oneup_flysystem.adapter.sftp'))
+            ->setDefinition($id, new ChildDefinition('oneup_flysystem.adapter.sftp'))
             ->replaceArgument(0, $config)
         ;
     }

diff --git a/DependencyInjection/Factory/Adapter/WebDavFactory.php b/DependencyInjection/Factory/Adapter/WebDavFactory.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Reference;
 use Oneup\FlysystemBundle\DependencyInjection\Factory\AdapterFactoryInterface;
 
@@ -18,7 +18,7 @@ public function getKey()
     public function create(ContainerBuilder $container, $id, array $config)
     {
         $definition = $container
-            ->setDefinition($id, new DefinitionDecorator('oneup_flysystem.adapter.webdav'))
+            ->setDefinition($id, new ChildDefinition('oneup_flysystem.adapter.webdav'))
             ->replaceArgument(0, new Reference($config['client']))
             ->replaceArgument(1, $config['prefix'])
         ;

diff --git a/DependencyInjection/Factory/Adapter/ZipFactory.php b/DependencyInjection/Factory/Adapter/ZipFactory.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Reference;
 use Oneup\FlysystemBundle\DependencyInjection\Factory\AdapterFactoryInterface;
 
@@ -20,7 +20,7 @@ public function create(ContainerBuilder $container, $id, array $config)
         $archive = !is_null($config['archive']) ? new Reference($config['archive']) : null;
 
         $definition = $container
-            ->setDefinition($id, new DefinitionDecorator('oneup_flysystem.adapter.zip'))
+            ->setDefinition($id, new ChildDefinition('oneup_flysystem.adapter.zip'))
             ->replaceArgument(0, $config['location'])
             ->replaceArgument(1, $archive)
             ->replaceArgument(2, $config['prefix'])

diff --git a/DependencyInjection/Factory/Cache/AdapterFactory.php b/DependencyInjection/Factory/Cache/AdapterFactory.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Reference;
 use Oneup\FlysystemBundle\DependencyInjection\Factory\CacheFactoryInterface;
 
@@ -18,7 +18,7 @@ public function getKey()
     public function create(ContainerBuilder $container, $id, array $config)
     {
         $container
-            ->setDefinition($id, new DefinitionDecorator('oneup_flysystem.cache.adapter'))
+            ->setDefinition($id, new ChildDefinition('oneup_flysystem.cache.adapter'))
             ->replaceArgument(0, new Reference(sprintf('oneup_flysystem.%s_adapter', $config['adapter'])))
             ->replaceArgument(1, $config['key'])
             ->replaceArgument(2, $config['expires'])

diff --git a/DependencyInjection/Factory/Cache/MemcachedFactory.php b/DependencyInjection/Factory/Cache/MemcachedFactory.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Reference;
 use Oneup\FlysystemBundle\DependencyInjection\Factory\CacheFactoryInterface;
 
@@ -18,7 +18,7 @@ public function getKey()
     public function create(ContainerBuilder $container, $id, array $config)
     {
         $container
-            ->setDefinition($id, new DefinitionDecorator('oneup_flysystem.cache.memcached'))
+            ->setDefinition($id, new ChildDefinition('oneup_flysystem.cache.memcached'))
             ->replaceArgument(0, new Reference($config['client']))
             ->replaceArgument(1, $config['key'])
             ->replaceArgument(2, $config['expires'])

diff --git a/DependencyInjection/Factory/Cache/MemoryFactory.php b/DependencyInjection/Factory/Cache/MemoryFactory.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Oneup\FlysystemBundle\DependencyInjection\Factory\CacheFactoryInterface;
 
 class MemoryFactory implements CacheFactoryInterface
@@ -17,7 +17,7 @@ public function getKey()
     public function create(ContainerBuilder $container, $id, array $config)
     {
         $container
-            ->setDefinition($id, new DefinitionDecorator('oneup_flysystem.cache.memory'))
+            ->setDefinition($id, new ChildDefinition('oneup_flysystem.cache.memory'))
         ;
     }
 

diff --git a/DependencyInjection/Factory/Cache/NoopFactory.php b/DependencyInjection/Factory/Cache/NoopFactory.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Oneup\FlysystemBundle\DependencyInjection\Factory\CacheFactoryInterface;
 
 class NoopFactory implements CacheFactoryInterface
@@ -17,7 +17,7 @@ public function getKey()
     public function create(ContainerBuilder $container, $id, array $config)
     {
         $container
-            ->setDefinition($id, new DefinitionDecorator('oneup_flysystem.cache.noop'))
+            ->setDefinition($id, new ChildDefinition('oneup_flysystem.cache.noop'))
         ;
     }