Implement PSR-11

greg0ire · greg0ire · commit f8bf6ea956ba · 2017-01-13T00:10:40.000+01:00
This is a work in progress, obviously. TODO: - use a stable version of the package; - act on the outcome of php-fig/container#8 ; - solve the mandatory NotFoundExceptionInterface on non-existing service problem (with a flag ?).
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/InvalidArgumentException.php b/src/Symfony/Component/DependencyInjection/Exception/InvalidArgumentException.php
@@ -11,11 +11,13 @@
 
 namespace Symfony\Component\DependencyInjection\Exception;
 
+use Psr\Container\ContainerException;
+
 /**
  * Base InvalidArgumentException for Dependency Injection component.
  *
  * @author Bulat Shakirzyanov <bulat@theopenskyproject.com>
  */
-class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface, ContainerException
 {
 }
diff --git a/src/Symfony/Component/DependencyInjection/Exception/ServiceCircularReferenceException.php b/src/Symfony/Component/DependencyInjection/Exception/ServiceCircularReferenceException.php
@@ -11,12 +11,14 @@
 
 namespace Symfony\Component\DependencyInjection\Exception;
 
+use Psr\Container\ContainerException;
+
 /**
  * This exception is thrown when a circular reference is detected.
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
-class ServiceCircularReferenceException extends RuntimeException
+class ServiceCircularReferenceException extends RuntimeException implements ContainerException
 {
     private $serviceId;
     private $path;
diff --git 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\NotFoundException;
+
 /**
  * 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 NotFoundException
 {
     private $id;
     private $sourceId;
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,11 +11,13 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\DependencyInjection\Exception;`
`13`	`13`
	`14`	`+use Psr\Container\ContainerException;`
	`15`	`+`
`14`	`16`	`/**`
`15`	`17`	`* Base InvalidArgumentException for Dependency Injection component.`
`16`	`18`	`*`
`17`	`19`	`* @author Bulat Shakirzyanov <bulat@theopenskyproject.com>`
`18`	`20`	`*/`
`19`		`-class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface`
	`21`	`+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface, ContainerException`
`20`	`22`	`{`
`21`	`23`	`}`
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\ContainerException;`
	`15`	`+`
`14`	`16`	`/**`
`15`	`17`	`* This exception is thrown when a circular reference is detected.`
`16`	`18`	`*`
`17`	`19`	`* @author Johannes M. Schmitt <schmittjoh@gmail.com>`
`18`	`20`	`*/`
`19`		`-class ServiceCircularReferenceException extends RuntimeException`
	`21`	`+class ServiceCircularReferenceException extends RuntimeException implements ContainerException`
`20`	`22`	`{`
`21`	`23`	`private $serviceId;`
`22`	`24`	`private $path;`