diff --git a/composer.json b/composer.json
index 8cc48dcf3d..cc8e9176a9 100644
--- a/composer.json
+++ b/composer.json
@@ -20,6 +20,7 @@
"doctrine/common": "~2.4",
"twig/twig": "~1.28|~2.0",
"psr/cache": "~1.0",
+ "psr/container": "^1.0",
"psr/log": "~1.0",
"psr/simple-cache": "^1.0",
"symfony/polyfill-intl-icu": "~1.0",
@@ -102,6 +103,7 @@
},
"provide": {
"psr/cache-implementation": "1.0",
+ "psr/container-implementation": "1.0",
"psr/simple-cache-implementation": "1.0"
},
"autoload": {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
index c4dfd51afe..c8123c4619 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
@@ -40,6 +40,7 @@
+
diff --git a/src/Symfony/Component/DependencyInjection/ContainerInterface.php b/src/Symfony/Component/DependencyInjection/ContainerInterface.php
index 7e2fbb1c8a..cfbc828722 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerInterface.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerInterface.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\DependencyInjection;
+use Psr\Container\ContainerInterface as PsrContainerInterface;
use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
use Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException;
use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
@@ -21,7 +22,7 @@ use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
* @author Fabien Potencier
* @author Johannes M. Schmitt
*/
-interface ContainerInterface
+interface ContainerInterface extends PsrContainerInterface
{
const EXCEPTION_ON_INVALID_REFERENCE = 1;
const NULL_ON_INVALID_REFERENCE = 2;
diff --git a/src/Symfony/Component/DependencyInjection/Exception/ExceptionInterface.php b/src/Symfony/Component/DependencyInjection/Exception/ExceptionInterface.php
index f5e9099f11..5bec478695 100644
--- a/src/Symfony/Component/DependencyInjection/Exception/ExceptionInterface.php
+++ b/src/Symfony/Component/DependencyInjection/Exception/ExceptionInterface.php
@@ -11,12 +11,14 @@
namespace Symfony\Component\DependencyInjection\Exception;
+use Psr\Container\ContainerExceptionInterface;
+
/**
* Base ExceptionInterface for Dependency Injection component.
*
* @author Fabien Potencier
* @author Bulat Shakirzyanov
*/
-interface ExceptionInterface
+interface ExceptionInterface extends ContainerExceptionInterface
{
}
diff --git a/src/Symfony/Component/DependencyInjection/Exception/ServiceNotFoundException.php b/src/Symfony/Component/DependencyInjection/Exception/ServiceNotFoundException.php
index e65da506bb..0194c4f372 100644
--- a/src/Symfony/Component/DependencyInjection/Exception/ServiceNotFoundException.php
+++ b/src/Symfony/Component/DependencyInjection/Exception/ServiceNotFoundException.php
@@ -11,12 +11,14 @@
namespace Symfony\Component\DependencyInjection\Exception;
+use Psr\Container\NotFoundExceptionInterface;
+
/**
* This exception is thrown when a non-existent service is requested.
*
* @author Johannes M. Schmitt
*/
-class ServiceNotFoundException extends InvalidArgumentException
+class ServiceNotFoundException extends InvalidArgumentException implements NotFoundExceptionInterface
{
private $id;
private $sourceId;
diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json
index 0d08d092be..13862942b6 100644
--- a/src/Symfony/Component/DependencyInjection/composer.json
+++ b/src/Symfony/Component/DependencyInjection/composer.json
@@ -16,7 +16,8 @@
}
],
"require": {
- "php": ">=5.5.9"
+ "php": ">=5.5.9",
+ "psr/container": "^1.0"
},
"require-dev": {
"symfony/yaml": "~3.2",
@@ -33,6 +34,9 @@
"symfony/config": "<3.3",
"symfony/yaml": "<3.2"
},
+ "provide": {
+ "psr/container-implementation": "1.0"
+ },
"autoload": {
"psr-4": { "Symfony\\Component\\DependencyInjection\\": "" },
"exclude-from-classmap": [