From 857ce7c7be4ac83f82ede7c7bc88df5ebe2f0b66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Tou=C5=A1ek?= Date: Tue, 14 Mar 2017 22:27:21 +0100 Subject: [PATCH] [FrameworkBundle][TwigBundle] Require PSR-11 container instead of Symfony container --- .../Bundle/FrameworkBundle/Templating/DelegatingEngine.php | 2 +- src/Symfony/Bundle/FrameworkBundle/Templating/PhpEngine.php | 2 +- .../Bundle/FrameworkBundle/Templating/TimedPhpEngine.php | 2 +- .../Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/DelegatingEngine.php b/src/Symfony/Bundle/FrameworkBundle/Templating/DelegatingEngine.php index c204ffa2f03b2..1104cd73634c3 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/DelegatingEngine.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/DelegatingEngine.php @@ -11,8 +11,8 @@ namespace Symfony\Bundle\FrameworkBundle\Templating; +use Psr\Container\ContainerInterface; use Symfony\Component\Templating\DelegatingEngine as BaseDelegatingEngine; -use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\Response; /** diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/PhpEngine.php b/src/Symfony/Bundle/FrameworkBundle/Templating/PhpEngine.php index 41382f769c65f..f9f5a5215fdfe 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/PhpEngine.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/PhpEngine.php @@ -11,10 +11,10 @@ namespace Symfony\Bundle\FrameworkBundle\Templating; +use Psr\Container\ContainerInterface; use Symfony\Component\Templating\PhpEngine as BasePhpEngine; use Symfony\Component\Templating\Loader\LoaderInterface; use Symfony\Component\Templating\TemplateNameParserInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\Response; /** diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/TimedPhpEngine.php b/src/Symfony/Bundle/FrameworkBundle/Templating/TimedPhpEngine.php index 3295cc73a726f..6ab1b507ca264 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/TimedPhpEngine.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/TimedPhpEngine.php @@ -11,10 +11,10 @@ namespace Symfony\Bundle\FrameworkBundle\Templating; +use Psr\Container\ContainerInterface; use Symfony\Component\Templating\TemplateNameParserInterface; use Symfony\Component\Stopwatch\Stopwatch; use Symfony\Component\Templating\Loader\LoaderInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; /** * Times the time spent to render a template. diff --git a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php index 9eea901f6dde4..022e3752d9f3d 100644 --- a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php +++ b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php @@ -11,9 +11,9 @@ namespace Symfony\Bundle\TwigBundle\CacheWarmer; +use Psr\Container\ContainerInterface; use Symfony\Component\Finder\Finder; use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Bundle\FrameworkBundle\CacheWarmer\TemplateFinderInterface; use Symfony\Component\Templating\TemplateReference;