Merge pull request #14 from mindplay-dk/2.0.1

2.0.1

UPGRADING.md

@@ -1,6 +1,15 @@
 Upgrading
 =========
 
+#### 2.0.1
+
+This release improves *forward* compatibility with `psr/container`, and backwards compatibility with
+the deprecated `container-interop/container-interop` package.
+
+Version 3.0 will most likely remove backwards compatibility with `container-interop/container-interop`,
+but as that is a breaking change, this update merely adds forward compatibility with the final PSR-11
+package.
+
 #### 2.0.0
 
 Version 2 introduces some BC breaks from version 1.x, as described below.

composer.json

@@ -11,7 +11,8 @@
     ],
     "require": {
         "php": ">=5.5",
-        "container-interop/container-interop": "~1.0"
+        "psr/container": "^1.0",
+        "container-interop/container-interop": "^1.2"
     },
     "require-dev": {
         "mindplay/benchpress": "dev-master",

src/Container.php

@@ -3,7 +3,7 @@
 namespace mindplay\unbox;
 
 use Interop\Container\ContainerInterface;
-use InvalidArgumentException;
+use Psr\Container\ContainerInterface as PsrContainerInterface;
 use ReflectionClass;
 use ReflectionFunction;
 use ReflectionParameter;
@@ -27,10 +27,11 @@ public function __construct(Configuration $config)
 
         $this->values = $this->values +
             [
-                get_class($this)          => $this,
-                __CLASS__                 => $this,
-                ContainerInterface::class => $this,
-                FactoryInterface::class   => $this,
+                get_class($this)             => $this,
+                __CLASS__                    => $this,
+                PsrContainerInterface::class => $this,
+                ContainerInterface::class    => $this,
+                FactoryInterface::class      => $this,
             ];
     }
 
@@ -41,7 +42,6 @@ public function __construct(Configuration $config)
      *
      * @return mixed
      *
-     * @throws ContainerException
      * @throws NotFoundException
      */
     public function get($name)
@@ -55,7 +55,7 @@ public function get($name)
                 $params = $this->resolve($reflection->getParameters(), $this->factory_map[$name]);
 
                 $this->values[$name] = call_user_func_array($factory, $params);
-            } elseif (!array_key_exists($name, $this->values)) {
+            } elseif (! array_key_exists($name, $this->values)) {
                 throw new NotFoundException($name);
             }
 
@@ -129,16 +129,18 @@ public function call($callback, $map = [])
      * @param mixed|mixed[] $map        mixed list/map of parameter values (and/or boxed values)
      *
      * @return mixed
+     *
+     * @throws InvalidArgumentException
      */
     public function create($class_name, $map = [])
     {
-        if (!class_exists($class_name)) {
+        if (! class_exists($class_name)) {
             throw new InvalidArgumentException("unable to create component: {$class_name}");
         }
 
         $reflection = new ReflectionClass($class_name);
 
-        if (!$reflection->isInstantiable()) {
+        if (! $reflection->isInstantiable()) {
             throw new InvalidArgumentException("unable to create instance of abstract class: {$class_name}");
         }
 
@@ -163,7 +165,6 @@ public function create($class_name, $map = [])
      * @return array parameters
      *
      * @throws ContainerException
-     * @throws NotFoundException
      */
     protected function resolve(array $params, $map, $safe = true)
     {

src/ContainerException.php

@@ -10,6 +10,6 @@
  */
 class ContainerException
     extends Exception
-    implements InteropContainerException
+    implements InteropContainerException # which extends Psr\Container\ContainerExceptionInterface
 {
 }