avoid using same kernel for orm and phpcr

Author: ElectricMaxxx

src/Functional/BaseTestCase.php

@@ -85,17 +85,25 @@ public function getContainer()
      */
     public function getKernel()
     {
-        if (null === self::$kernel) {
-            $kernel = parent::bootKernel();
-            if ($kernel instanceof KernelInterface) {
-                self::$kernel = $kernel;
+        if (null === static::$kernel) {
+            parent::bootKernel(static::getKernelConfiguration());
+        }
+
+        if (static::$kernel instanceof  KernelInterface) {
+            $kernelEnvironment = static::$kernel->getEnvironment();
+            $expectedEnvironment = isset($this->getKernelConfiguration()['environment'])
+                ? $this->getKernelConfiguration()['environment']
+                : 'phpcr';
+            if ($kernelEnvironment !== $expectedEnvironment) {
+                parent::bootKernel(static::getKernelConfiguration());
             }
         }
-        if (!self::$kernel->getContainer()) {
-            self::$kernel->boot();
+
+        if (!static::$kernel->getContainer()) {
+            static::$kernel->boot();
         }
 
-        return self::$kernel;
+        return static::$kernel;
     }
 
     /**

tests/Fixtures/TestTestCase.php

@@ -18,15 +18,15 @@ class TestTestCase extends BaseTestCase
 {
     public function setKernel(KernelInterface $kernel)
     {
-        self::$kernel = $kernel;
+        static::$kernel = $kernel;
     }
 
     protected static function createKernel(array $options = [])
     {
-        if (null === self::$kernel) {
+        if (null === static::$kernel) {
             return parent::createKernel($options);
         }
 
-        return self::$kernel;
+        return static::$kernel;
     }
 }