Implement PSR-11

greg0ire · Grégoire Paris · commit ff1b247799b0 · 2017-01-13T15:00:39.000+01:00
Delegate lookup is optional and thus, not implemented.
diff --git 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@dev",
         "psr/log": "~1.0",
         "symfony/polyfill-intl-icu": "~1.0",
         "symfony/polyfill-mbstring": "~1.0",
@@ -99,7 +100,8 @@
         "phpdocumentor/type-resolver": "<0.2.0"
     },
     "provide": {
-        "psr/cache-implementation": "1.0"
+        "psr/cache-implementation": "1.0",
+        "psr/container-implementation": "1.0"
     },
     "autoload": {
         "psr-4": {
diff --git 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 @@
  * @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
@@ -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/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@dev"
     },
     "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": [

Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,14 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\DependencyInjection\Exception;`
`13`	`13`
	`14`	`+use Psr\Container\ContainerExceptionInterface;`
	`15`	`+`
`14`	`16`	`/**`
`15`	`17`	`* Base ExceptionInterface for Dependency Injection component.`
`16`	`18`	`*`
`17`	`19`	`* @author Fabien Potencier <[email protected]>`
`18`	`20`	`* @author Bulat Shakirzyanov <[email protected]>`
`19`	`21`	`*/`
`20`		`-interface ExceptionInterface`
	`22`	`+interface ExceptionInterface extends ContainerExceptionInterface`
`21`	`23`	`{`
`22`	`24`	`}`