PSR-11 friendly kernels

src/KernelWithPhpDiContainer.php

@@ -0,0 +1,49 @@
+<?php
+/**
+ * PHP-DI
+ *
+ * @link      http://php-di.org/
+ * @copyright Matthieu Napoli (http://mnapoli.fr/)
+ * @license   http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
+ */
+
+namespace DI\Bridge\Symfony;
+
+use Psr\Container\ContainerInterface;
+
+/**
+ * Customization of Symfony's kernel to setup PHP-DI.
+ *
+ * Extend this class instead of Symfony's base kernel.
+ *
+ * @author Matthieu Napoli <[email protected]>
+ */
+abstract class KernelWithPhpDiContainer extends KernelWithPsr11Container
+{
+    /**
+     * @var ContainerInterface
+     */
+    private $phpdiContainer;
+
+    /**
+     * Implement this method to configure PHP-DI.
+     *
+     * @return ContainerInterface
+     */
+    abstract protected function buildPHPDIContainer(\DI\ContainerBuilder $builder);
+
+    /**
+     * @return ContainerInterface
+     */
+    protected function getFallbackContainer()
+    {
+        if ($this->phpdiContainer === null) {
+            $builder = new \DI\ContainerBuilder();
+            $builder->wrapContainer($this->getContainer());
+
+            $this->phpdiContainer = $this->buildPHPDIContainer($builder);
+        }
+
+        return $this->phpdiContainer;
+    }
+}

src/Kernel.php → src/KernelWithPsr11Container.php

@@ -15,32 +15,20 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
- * Customization of Symfony's kernel to setup PHP-DI.
+ * Customization of Symfony's kernel to setup any PSR-11 container.
  *
  * Extend this class instead of Symfony's base kernel.
  *
- * @author Matthieu Napoli <[email protected]>
+ * @author Julien Janvier <[email protected]>
  */
-abstract class Kernel extends \Symfony\Component\HttpKernel\Kernel
+abstract class KernelWithPsr11Container extends \Symfony\Component\HttpKernel\Kernel
 {
-    /**
-     * @var ContainerInterface
-     */
-    private $phpdiContainer;
-
     public function __construct($environment, $debug)
     {
         parent::__construct($environment, $debug);
         $this->disableDebugClassLoader();
     }
 
-    /**
-     * Implement this method to configure PHP-DI.
-     *
-     * @return ContainerInterface
-     */
-    abstract protected function buildPHPDIContainer(\DI\ContainerBuilder $builder);
-
     protected function getContainerBaseClass()
     {
         return SymfonyContainerBridge::class;
@@ -62,7 +50,7 @@ protected function initializeContainer()
         /** @var SymfonyContainerBridge $rootContainer */
         $rootContainer = $this->getContainer();
 
-        $rootContainer->setFallbackContainer($this->getPHPDIContainer());
+        $rootContainer->setFallbackContainer($this->getFallbackContainer());
     }
 
     /**
@@ -102,15 +90,5 @@ private function disableDebugClassLoader()
     /**
      * @return ContainerInterface
      */
-    protected function getPHPDIContainer()
-    {
-        if ($this->phpdiContainer === null) {
-            $builder = new \DI\ContainerBuilder();
-            $builder->wrapContainer($this->getContainer());
-
-            $this->phpdiContainer = $this->buildPHPDIContainer($builder);
-        }
-
-        return $this->phpdiContainer;
-    }
+    abstract protected function getFallbackContainer();
 }

src/SymfonyContainerBridge.php

@@ -9,8 +9,9 @@
 
 namespace DI\Bridge\Symfony;
 
-use DI\NotFoundException;
+use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use Symfony\Component\DependencyInjection\Container as SymfonyContainer;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface as SymfonyContainerInterface;
@@ -85,10 +86,12 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE
             }
 
             return $entry;
-        } catch (NotFoundException $e) {
+        } catch (NotFoundExceptionInterface $e) {
             if ($invalidBehavior === self::EXCEPTION_ON_INVALID_REFERENCE) {
                 throw new ServiceNotFoundException($id, null, $e);
             }
+        } catch (ContainerExceptionInterface $e) {
+            throw new \Exception('Error while retrieving the entry.', $e->getCode(), $e);
         }
 
         return null;

tests/FunctionalTest/Fixtures/AppKernel.php

@@ -2,11 +2,11 @@
 
 namespace DI\Bridge\Symfony\Test\FunctionalTest\Fixtures;
 
-use DI\Bridge\Symfony\Kernel;
+use DI\Bridge\Symfony\KernelWithPhpDiContainer;
 use DI\ContainerBuilder;
 use Symfony\Component\Config\Loader\LoaderInterface;
 
-class AppKernel extends Kernel
+class AppKernel extends KernelWithPhpDiContainer
 {
     private $configFile;
 

tests/FunctionalTest/KernelTest.php → tests/FunctionalTest/KernelWithPhpDiContainerTest.php

@@ -16,7 +16,7 @@
 /**
  * @coversNothing
  */
-class KernelTest extends AbstractFunctionalTest
+class KernelWithPhpDiContainerTest extends AbstractFunctionalTest
 {
     /**
      * @test