From 909acf99e7cfafd63dff773158bab29c686e292e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Tou=C5=A1ek?= Date: Sat, 11 Mar 2017 19:56:19 +0100 Subject: [PATCH 1/2] Require PSR-11 container instead of Symfony container --- src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php | 2 +- .../Routing/Loader/DependencyInjection/ServiceRouterLoader.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php index 0888f97ca91d8..941d77cf591a2 100644 --- a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php +++ b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php @@ -13,7 +13,7 @@ use Doctrine\Common\EventArgs; use Doctrine\Common\EventManager; -use Symfony\Component\DependencyInjection\ContainerInterface; +use Psr\Container\ContainerInterface; /** * Allows lazy loading of listener services. diff --git a/src/Symfony/Component/Routing/Loader/DependencyInjection/ServiceRouterLoader.php b/src/Symfony/Component/Routing/Loader/DependencyInjection/ServiceRouterLoader.php index 69382571ceedf..6c1621635b943 100644 --- a/src/Symfony/Component/Routing/Loader/DependencyInjection/ServiceRouterLoader.php +++ b/src/Symfony/Component/Routing/Loader/DependencyInjection/ServiceRouterLoader.php @@ -11,7 +11,7 @@ namespace Symfony\Component\Routing\Loader\DependencyInjection; -use Symfony\Component\DependencyInjection\ContainerInterface; +use Psr\Container\ContainerInterface; use Symfony\Component\Routing\Loader\ObjectRouteLoader; /** From 84f61b340ddf9d3a313b8239aca249b8dca041fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Tou=C5=A1ek?= Date: Sun, 12 Mar 2017 10:21:41 +0100 Subject: [PATCH 2/2] Fix routing component dev dependency --- src/Symfony/Component/Routing/composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json index a2a625cc5dd32..38069dc4e9ab0 100644 --- a/src/Symfony/Component/Routing/composer.json +++ b/src/Symfony/Component/Routing/composer.json @@ -23,13 +23,14 @@ "symfony/http-foundation": "~2.8|~3.0", "symfony/yaml": "~3.3", "symfony/expression-language": "~2.8|~3.0", - "symfony/dependency-injection": "~2.8|~3.0", + "symfony/dependency-injection": "~3.3", "doctrine/annotations": "~1.0", "doctrine/common": "~2.2", "psr/log": "~1.0" }, "conflict": { "symfony/config": "<2.8", + "symfony/dependency-injection": "<3.3", "symfony/yaml": "<3.3" }, "suggest": {