Merge pull request #23 from jakzal/symfony-5

Allow Symfony 5

Author: jakzal

composer.json

@@ -9,12 +9,13 @@
         "zalas/injector": "^1.3"
     },
     "require-dev": {
-        "symfony/config": "^3.4 || ^4.3",
-        "symfony/dependency-injection": "^3.4 || ^4.3",
-        "symfony/http-kernel": "^3.4 || ^4.3",
+        "symfony/config": "^3.4 || ^4.4 || ^5.0",
+        "symfony/dependency-injection": "^3.4 || ^4.4 || ^5.0",
+        "symfony/http-kernel": "^3.4 || ^4.4 || ^5.0",
         "zalas/phpunit-globals": "^1.0",
-        "symfony/framework-bundle": "^3.4 || ^4.3",
-        "zalas/phpunit-doubles": "^1.2"
+        "symfony/framework-bundle": "^3.4 || ^4.4 || ^5.0",
+        "zalas/phpunit-doubles": "^1.2",
+        "phpspec/prophecy": "^1.9"
     },
     "autoload": {
         "psr-4": {

depfile.yml

@@ -42,6 +42,10 @@ layers:
     collectors:
       - type: className
         regex: ^Symfony\\Component\\HttpKernel\\.*
+  - name: Symfony Service Contracts
+    collectors:
+      - type: className
+        regex: ^Symfony\\Contracts\\Service\\.*
   - name: PHPUnit
     collectors:
       - type: className
@@ -71,6 +75,8 @@ layers:
             regex: ^Symfony\\Component\\DependencyInjection\\.*
           - type: className
             regex: ^Symfony\\Component\\HttpKernel\\.*
+          - type: className
+            regex: ^Symfony\\Contracts\\Service\\.*
 ruleset:
   Symfony Compiler:
     - Injector Factory
@@ -83,6 +89,7 @@ ruleset:
     - Psr Container
     - Symfony DependencyInjection
     - Symfony HttpKernel
+    - Symfony Service Contracts
   TestCase:
     - Psr Container
   TestListener:

src/Symfony/TestCase/SymfonyKernel.php

@@ -5,6 +5,7 @@
 
 use Symfony\Component\DependencyInjection\ResettableContainerInterface;
 use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * Mimics the behaviour of Symfony's KernelTestCase.
@@ -54,7 +55,7 @@ protected static function ensureKernelShutdown(): void
         if (static::$kernel instanceof KernelInterface) {
             $container = static::$kernel->getContainer();
             static::$kernel->shutdown();
-            if ($container instanceof ResettableContainerInterface) {
+            if ($container instanceof ResetInterface || $container instanceof ResettableContainerInterface) {
                 $container->reset();
             }
 

tests/Symfony/TestCase/SymfonyKernelTest.php

@@ -4,6 +4,7 @@
 namespace Zalas\Injector\PHPUnit\Tests\Symfony\TestCase;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\HttpKernel\KernelInterface;
 use Zalas\Injector\PHPUnit\Symfony\TestCase\SymfonyKernel;
 use Zalas\Injector\PHPUnit\Tests\Symfony\TestCase\Fixtures\NoFrameworkBundle\TestKernel;
@@ -117,8 +118,11 @@ public function test_it_prefers_env_variables_over_server()
     /**
      * @env KERNEL_CLASS=Zalas\Injector\PHPUnit\Tests\Symfony\TestCase\Fixtures\NoFrameworkBundle\TestKernel
      */
-    public function test_it_ensures_the_kernel_was_shut_down()
+    public function test_it_ensures_the_kernel_was_shut_down_on_legacy_symfony_versions()
     {
+        if (Kernel::MAJOR_VERSION > 4) {
+            $this->markTestSkipped();
+        }
         $kernel1 = self::bootKernel();
         $kernel2 = self::bootKernel();
 
@@ -129,15 +133,55 @@ public function test_it_ensures_the_kernel_was_shut_down()
     /**
      * @env KERNEL_CLASS=Zalas\Injector\PHPUnit\Tests\Symfony\TestCase\Fixtures\NoFrameworkBundle\TestKernel
      */
-    public function test_ensureKernelShutdown_shuts_down_the_kernel()
+    public function test_ensureKernelShutdown_shuts_down_the_kernel_on_legacy_symfony_versions()
     {
+        if (Kernel::MAJOR_VERSION > 4) {
+            $this->markTestSkipped();
+        }
         $kernel = self::bootKernel();
 
         self::ensureKernelShutdown();
 
         $this->assertNull($kernel->getContainer());
     }
 
+    /**
+     * @env KERNEL_CLASS=Zalas\Injector\PHPUnit\Tests\Symfony\TestCase\Fixtures\NoFrameworkBundle\TestKernel
+     */
+    public function test_it_ensures_the_kernel_was_shut_down()
+    {
+        if (Kernel::MAJOR_VERSION < 5) {
+            $this->markTestSkipped();
+        }
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessageMatches('/Cannot retrieve the container from a non-booted kernel/');
+
+        $kernel1 = self::bootKernel();
+        $kernel2 = self::bootKernel();
+
+        $this->assertNotNull($kernel2->getContainer());
+
+        $kernel1->getContainer();
+    }
+
+    /**
+     * @env KERNEL_CLASS=Zalas\Injector\PHPUnit\Tests\Symfony\TestCase\Fixtures\NoFrameworkBundle\TestKernel
+     */
+    public function test_ensureKernelShutdown_shuts_down_the_kernel()
+    {
+        if (Kernel::MAJOR_VERSION < 5) {
+            $this->markTestSkipped();
+        }
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessageMatches('/Cannot retrieve the container from a non-booted kernel/');
+
+        $kernel = self::bootKernel();
+
+        self::ensureKernelShutdown();
+
+        $kernel->getContainer();
+    }
+
     /**
      * @env KERNEL_CLASS=Zalas\Injector\PHPUnit\Tests\Symfony\TestCase\Fixtures\NoFrameworkBundle\TestKernel
      */