From 658148dbcc25cd0cd2b3b5b52ab6afc31ad9309e Mon Sep 17 00:00:00 2001 From: Adam Misiorny Date: Wed, 3 Jun 2015 08:37:01 +0200 Subject: [PATCH] add comment about DI fallback --- DependencyInjection/Factory/Resolver/AwsS3ResolverFactory.php | 1 + DependencyInjection/LiipImagineExtension.php | 2 ++ 2 files changed, 3 insertions(+) diff --git a/DependencyInjection/Factory/Resolver/AwsS3ResolverFactory.php b/DependencyInjection/Factory/Resolver/AwsS3ResolverFactory.php index 45ccf6ccc..3b2bc0bee 100644 --- a/DependencyInjection/Factory/Resolver/AwsS3ResolverFactory.php +++ b/DependencyInjection/Factory/Resolver/AwsS3ResolverFactory.php @@ -20,6 +20,7 @@ public function create(ContainerBuilder $container, $resolverName, array $config if (method_exists($awsS3ClientDefinition, 'setFactory')) { $awsS3ClientDefinition->setFactory(array('Aws\S3\S3Client', 'factory')); } else { + // to be removed when dependency on Symfony DependencyInjection is bumped to 2.6 $awsS3ClientDefinition->setFactoryClass('Aws\S3\S3Client'); $awsS3ClientDefinition->setFactoryMethod('factory'); } diff --git a/DependencyInjection/LiipImagineExtension.php b/DependencyInjection/LiipImagineExtension.php index 1e0174e9d..7b22246e5 100644 --- a/DependencyInjection/LiipImagineExtension.php +++ b/DependencyInjection/LiipImagineExtension.php @@ -129,8 +129,10 @@ private function setFactories($container) foreach ($factories as $service => $factory) { $definition = $container->getDefinition($service); if (method_exists($definition, 'setFactory')) { + // to be inlined in imagine.xml when dependency on Symfony DependencyInjection is bumped to 2.6 $definition->setFactory($factory); } else { + // to be removed when dependency on Symfony DependencyInjection is bumped to 2.6 $definition->setFactoryClass($factory[0]); $definition->setFactoryMethod($factory[1]); }