From bde0efd01caa651178f2a8ba8cb5a3fa62279be0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= <postmaster@greg0ire.fr>
Date: Thu, 12 Jan 2017 23:20:30 +0100
Subject: [PATCH] Implement PSR-11

Delegate lookup is optional and thus, not implemented.
---
 composer.json                                               | 2 ++
 .../Bundle/FrameworkBundle/Resources/config/services.xml    | 1 +
 .../Component/DependencyInjection/ContainerInterface.php    | 3 ++-
 .../DependencyInjection/Exception/ExceptionInterface.php    | 4 +++-
 .../Exception/ServiceNotFoundException.php                  | 4 +++-
 src/Symfony/Component/DependencyInjection/composer.json     | 6 +++++-
 6 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 37cb3ca5e3..3f3585a596 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 @@
             <argument type="collection" />
         </service>
 
+        <service id="Psr\Container\ContainerInterface" alias="service_container" public="false" />
         <service id="Symfony\Component\DependencyInjection\ContainerInterface" alias="service_container" public="false" />
         <service id="Symfony\Component\DependencyInjection\Container" alias="service_container" public="false" />
 
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 <fabien@symfony.com>
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
-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 <fabien@symfony.com>
  * @author Bulat Shakirzyanov <bulat@theopenskyproject.com>
  */
-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 <schmittjoh@gmail.com>
  */
-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 b658759e7b..890ae1dab1 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",
@@ -32,6 +33,9 @@
     "conflict": {
         "symfony/yaml": "<3.2"
     },
+    "provide": {
+        "psr/container-implementation": "1.0"
+    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\DependencyInjection\\": "" },
         "exclude-from-classmap": [