From 9cbf45fe461c9b519c716e35f091e6e8ac5ffe44 Mon Sep 17 00:00:00 2001 From: David Greminger Date: Wed, 15 Nov 2017 17:03:15 +0100 Subject: [PATCH] Adaptions for Symfony 4.0 --- .travis.yml | 14 +++++++++----- .../Factory/Adapter/AwsS3V2Factory.php | 4 ++-- .../Factory/Adapter/AwsS3V3Factory.php | 4 ++-- .../Factory/Adapter/DropboxFactory.php | 4 ++-- .../Factory/Adapter/FallbackFactory.php | 4 ++-- DependencyInjection/Factory/Adapter/FtpFactory.php | 4 ++-- .../Factory/Adapter/GaufretteFactory.php | 4 ++-- .../Factory/Adapter/GoogleCloudStorageFactory.php | 4 ++-- .../Factory/Adapter/GridFSFactory.php | 4 ++-- .../Factory/Adapter/LocalFactory.php | 4 ++-- .../Factory/Adapter/MemoryAdapterFactory.php | 4 ++-- .../Factory/Adapter/NullAdapterFactory.php | 4 ++-- .../Factory/Adapter/RackspaceFactory.php | 4 ++-- .../Factory/Adapter/ReplicateFactory.php | 4 ++-- .../Factory/Adapter/SftpFactory.php | 4 ++-- .../Factory/Adapter/WebDavFactory.php | 4 ++-- DependencyInjection/Factory/Adapter/ZipFactory.php | 4 ++-- .../Factory/Cache/AdapterFactory.php | 4 ++-- .../Factory/Cache/MemcachedFactory.php | 4 ++-- .../Factory/Cache/MemoryFactory.php | 4 ++-- DependencyInjection/Factory/Cache/NoopFactory.php | 4 ++-- .../Factory/Cache/PhpRedisFactory.php | 4 ++-- .../Factory/Cache/PredisFactory.php | 4 ++-- DependencyInjection/Factory/Cache/Psr6Factory.php | 4 ++-- DependencyInjection/Factory/Cache/StashFactory.php | 4 ++-- DependencyInjection/OneupFlysystemExtension.php | 8 ++++---- Resources/config/flysystem.xml | 2 +- Resources/config/stream_wrappers.xml | 2 +- Tests/App/AppKernel.php | 8 ++++++-- composer.json | 12 ++++++------ phpunit.xml.dist | 4 ++-- 31 files changed, 77 insertions(+), 69 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8da1b8a..bbad7a7 100644 --- 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 index a64d5dc..6999651 100644 --- 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 index 73025f9..10cd079 100644 --- 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 index 6aaae4f..c021b02 100644 --- 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 index 5ac28cc..8d9e7da 100644 --- 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 index b28ce66..d88359e 100644 --- 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 index 2718d18..8834d08 100644 --- 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 index adb69a0..685b8cf 100644 --- 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 index cc3adc9..79f8165 100644 --- 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 index e38aacb..e7a0b67 100644 --- 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 index ecb4f11..9edac34 100644 --- 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 index 6e1fefe..fe738be 100644 --- 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 index 0b4e0d1..44a8687 100644 --- 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 index f68844e..f59b6ca 100644 --- 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 index 951fb53..0129b57 100644 --- 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 index 6c91058..47e626e 100644 --- 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 index ffa6c1f..c30eddc 100644 --- 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 index 18020de..9e6894c 100644 --- 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 index d9cb9c3..96f4497 100644 --- 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 index f08fb6a..425d078 100644 --- 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 index 6d388d8..18cf164 100644 --- 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')) ; } diff --git a/DependencyInjection/Factory/Cache/PhpRedisFactory.php b/DependencyInjection/Factory/Cache/PhpRedisFactory.php index a8edb4d..ab3dad7 100644 --- a/DependencyInjection/Factory/Cache/PhpRedisFactory.php +++ b/DependencyInjection/Factory/Cache/PhpRedisFactory.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.php_redis')) + ->setDefinition($id, new ChildDefinition('oneup_flysystem.cache.php_redis')) ->replaceArgument(0, new Reference($config['client'])) ->replaceArgument(1, $config['key']) ->replaceArgument(2, $config['expires']) diff --git a/DependencyInjection/Factory/Cache/PredisFactory.php b/DependencyInjection/Factory/Cache/PredisFactory.php index f9146f1..d8ce67d 100644 --- a/DependencyInjection/Factory/Cache/PredisFactory.php +++ b/DependencyInjection/Factory/Cache/PredisFactory.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.predis')) + ->setDefinition($id, new ChildDefinition('oneup_flysystem.cache.predis')) ->replaceArgument(0, new Reference($config['client'])) ->replaceArgument(1, $config['key']) ->replaceArgument(2, $config['expires']) diff --git a/DependencyInjection/Factory/Cache/Psr6Factory.php b/DependencyInjection/Factory/Cache/Psr6Factory.php index e325c6d..7a06ef5 100644 --- a/DependencyInjection/Factory/Cache/Psr6Factory.php +++ b/DependencyInjection/Factory/Cache/Psr6Factory.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.psr6')) + ->setDefinition($id, new ChildDefinition('oneup_flysystem.cache.psr6')) ->replaceArgument(0, new Reference($config['service'])) ->replaceArgument(1, $config['key']) ->replaceArgument(2, $config['expires']) diff --git a/DependencyInjection/Factory/Cache/StashFactory.php b/DependencyInjection/Factory/Cache/StashFactory.php index 53d6ee1..4f41b32 100644 --- a/DependencyInjection/Factory/Cache/StashFactory.php +++ b/DependencyInjection/Factory/Cache/StashFactory.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.stash')) + ->setDefinition($id, new ChildDefinition('oneup_flysystem.cache.stash')) ->replaceArgument(0, new Reference($config['pool'])) ->replaceArgument(1, $config['key']) ->replaceArgument(2, $config['expires']) diff --git a/DependencyInjection/OneupFlysystemExtension.php b/DependencyInjection/OneupFlysystemExtension.php index e7134e9..c7631f7 100644 --- a/DependencyInjection/OneupFlysystemExtension.php +++ b/DependencyInjection/OneupFlysystemExtension.php @@ -6,7 +6,7 @@ use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\Loader; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\DependencyInjection\DefinitionDecorator; +use Symfony\Component\DependencyInjection\ChildDefinition; use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\HttpKernel\DependencyInjection\Extension; @@ -101,7 +101,7 @@ private function createFilesystem($name, array $config, ContainerBuilder $contai $cache = $caches[$config['cache']]; $container - ->setDefinition($adapter.'_cached', new DefinitionDecorator('oneup_flysystem.adapter.cached')) + ->setDefinition($adapter.'_cached', new ChildDefinition('oneup_flysystem.adapter.cached')) ->replaceArgument(0, new Reference($adapter)) ->replaceArgument(1, new Reference($cache)); } @@ -123,7 +123,7 @@ private function createFilesystem($name, array $config, ContainerBuilder $contai } $container - ->setDefinition($id, new DefinitionDecorator('oneup_flysystem.filesystem')) + ->setDefinition($id, new ChildDefinition('oneup_flysystem.filesystem')) ->replaceArgument(0, new Reference($cache ? $adapter.'_cached' : $adapter)) ->replaceArgument(1, $options) ->addTag('oneup_flysystem.filesystem', $tagParams); @@ -213,7 +213,7 @@ private function loadStreamWrappers(array $configs, array $filesystems, Loader\X $streamWrapper = array_merge(['configuration' => null], $filesystem['stream_wrapper']); - $configuration = new DefinitionDecorator('oneup_flysystem.stream_wrapper.configuration.def'); + $configuration = new ChildDefinition('oneup_flysystem.stream_wrapper.configuration.def'); $configuration ->replaceArgument(0, $streamWrapper['protocol']) ->replaceArgument(1, $filesystems[$name]) diff --git a/Resources/config/flysystem.xml b/Resources/config/flysystem.xml index ec9ab9e..88172f5 100644 --- a/Resources/config/flysystem.xml +++ b/Resources/config/flysystem.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + diff --git a/Resources/config/stream_wrappers.xml b/Resources/config/stream_wrappers.xml index 587e89a..0cd3ea4 100644 --- a/Resources/config/stream_wrappers.xml +++ b/Resources/config/stream_wrappers.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + diff --git a/Tests/App/AppKernel.php b/Tests/App/AppKernel.php index b3ccb1e..49aeb00 100644 --- a/Tests/App/AppKernel.php +++ b/Tests/App/AppKernel.php @@ -1,5 +1,9 @@ - + @@ -21,4 +21,4 @@ - \ No newline at end of file +