Migrating from container-interop to PSR-11

composer.json

@@ -20,7 +20,7 @@
     ],
     "require": {
         "php": "^7.0",
-        "container-interop/container-interop": "^1.1",
+        "psr/container": "^1.0",
         "psr/log": "^1.0"
     },
     "require-dev": {

src/Bootstrap/Bootstrap.php

@@ -15,8 +15,8 @@
 use Phoundation\Config\Loader\ConfigLoaderInterface;
 use Phoundation\Di\Container\Factory\DiContainerFactoryInterface;
 use Phoundation\Config\Config;
-use Interop\Container\ContainerInterface;
 use Phoundation\ErrorHandling\RunnerInterface;
+use Psr\Container\ContainerInterface;
 
 /**
  * @author Nikola Posa <[email protected]>
@@ -49,7 +49,7 @@ public function __construct(ConfigLoaderInterface $configLoader, DiContainerFact
         $this->diContainerFactory = $diContainerFactory;
     }
 
-    public function __invoke()
+    public function __invoke() : ContainerInterface
     {
         $this->loadConfig();
         $this->buildDiContainer();

src/Config/Config.php

@@ -19,7 +19,7 @@
  */
 class Config extends ArrayObject
 {
-    public static function fromArray(array $config)
+    public static function fromArray(array $config) : Config
     {
         return new self($config);
     }

src/Di/Container/Factory/AbstractFactory.php

@@ -12,8 +12,8 @@
 
 namespace Phoundation\Di\Container\Factory;
 
-use Interop\Container\ContainerInterface;
 use Phoundation\Config\Config;
+use Psr\Container\ContainerInterface;
 
 /**
  * @author Nikola Posa <[email protected]>
@@ -49,11 +49,11 @@ public function __invoke(Config $config) : ContainerInterface
         return $container;
     }
 
-    abstract protected function createContainer();
+    abstract protected function createContainer() : ContainerInterface;
 
-    abstract protected function configure($container);
+    abstract protected function configure(ContainerInterface $container);
 
-    final protected function getConfig()
+    final protected function getConfig() : Config
     {
         return $this->config;
     }

src/Di/Container/Factory/AuraDiFactory.php

@@ -14,6 +14,7 @@
 
 use Aura\Di\Container;
 use Aura\Di\ContainerBuilder;
+use Psr\Container\ContainerInterface;
 
 /**
  * @author Nikola Posa <[email protected]>
@@ -25,12 +26,12 @@ final class AuraDiFactory extends AbstractFactory
      */
     protected $container;
 
-    protected function createContainer()
+    protected function createContainer() : ContainerInterface
     {
         return (new ContainerBuilder())->newInstance();
     }
 
-    protected function configure($container)
+    protected function configure(ContainerInterface $container)
     {
         $this->container = $container;
 

src/Di/Container/Factory/DiContainerFactoryInterface.php

@@ -12,8 +12,8 @@
 
 namespace Phoundation\Di\Container\Factory;
 
-use Interop\Container\ContainerInterface;
 use Phoundation\Config\Config;
+use Psr\Container\ContainerInterface;
 
 /**
  * @author Nikola Posa <[email protected]>

src/Di/Container/Factory/PimpleFactory.php

@@ -12,6 +12,7 @@
 
 namespace Phoundation\Di\Container\Factory;
 
+use Psr\Container\ContainerInterface;
 use Xtreamwayz\Pimple\Container;
 
 /**
@@ -24,12 +25,12 @@ final class PimpleFactory extends AbstractFactory
      */
     private $container;
 
-    protected function createContainer()
+    protected function createContainer() : ContainerInterface
     {
         return new Container();
     }
 
-    protected function configure($container)
+    protected function configure(ContainerInterface $container)
     {
         $this->container = $container;
 

src/Di/Container/Factory/ZendServiceManagerFactory.php

@@ -12,19 +12,20 @@
 
 namespace Phoundation\Di\Container\Factory;
 
+use Psr\Container\ContainerInterface;
 use Zend\ServiceManager\ServiceManager;
 
 /**
  * @author Nikola Posa <[email protected]>
  */
 final class ZendServiceManagerFactory extends AbstractFactory
 {
-    protected function createContainer()
+    protected function createContainer() : ContainerInterface
     {
         return new ServiceManager();
     }
 
-    protected function configure($container)
+    protected function configure(ContainerInterface $container)
     {
         /* @var $container ServiceManager */
 

tests/Bootstrap/BootstrapTest.php

@@ -15,10 +15,10 @@
 use PHPUnit\Framework\TestCase;
 use Phoundation\Bootstrap\Bootstrap;
 use Phoundation\Config\Loader\StaticConfigLoader;
-use Interop\Container\ContainerInterface;
 use Phoundation\Config\Config;
 use Phoundation\Di\Container\Factory\DiContainerFactoryInterface;
 use Phoundation\Di\Container\Factory\ZendServiceManagerFactory;
+use Psr\Container\ContainerInterface;
 use Zend\ServiceManager\ServiceManager;
 use Phoundation\ErrorHandling\RunnerInterface;
 use Phoundation\ErrorHandling\WhoopsRunner;

tests/Di/Container/Factory/ContainerFactoryTest.php

@@ -14,10 +14,10 @@
 
 use PHPUnit\Framework\TestCase;
 use Phoundation\Di\Container\Factory\DiContainerFactoryInterface;
-use Interop\Container\ContainerInterface;
 use Phoundation\Config\Config;
 use Phoundation\Tests\TestAsset\Service\InMemoryLogger;
 use Phoundation\Tests\TestAsset\Service\InMemoryLoggerFactory;
+use Psr\Container\ContainerInterface;
 
 /**
  * @author Nikola Posa <[email protected]>