Fix routing in kernel (#37)

* Fix routing in kernel

* Fix CS

* Add missing ;

* Fix CS

Author: chapterjason

src/AppKernel.php

@@ -39,6 +39,11 @@ class AppKernel extends Kernel
      */
     private $compilerPasses = [];
 
+    /**
+     * @var string|null
+     */
+    private $routingFile = null;
+
     /**
      * @param string $cachePrefix
      */
@@ -121,7 +126,7 @@ public function registerContainerConfiguration(LoaderInterface $loader)
         $loader->load(function (ContainerBuilder $container) use ($loader) {
             $container->loadFromExtension('framework', [
                 'router' => [
-                    'resource' => 'kernel:loadRoutes',
+                    'resource' => 'kernel::loadRoutes',
                     'type' => 'service',
                 ],
             ]);
@@ -131,6 +136,20 @@ public function registerContainerConfiguration(LoaderInterface $loader)
                 $loader->load($path);
             }
 
+            $kernelClass = false !== strpos(static::class, "@anonymous\0") ? parent::class : static::class;
+
+            if (!$container->hasDefinition('kernel')) {
+                $container->register('kernel', $kernelClass)
+                    ->addTag('controller.service_arguments')
+                    ->setAutoconfigured(true)
+                    ->setSynthetic(true)
+                    ->setPublic(true)
+                ;
+            }
+
+            $kernelDefinition = $container->getDefinition('kernel');
+            $kernelDefinition->addTag('routing.route_loader');
+
             $container->addObjectResource($this);
         });
     }
@@ -143,7 +162,12 @@ public function registerContainerConfiguration(LoaderInterface $loader)
     public function loadRoutes(LoaderInterface $loader)
     {
         $routes = new RouteCollectionBuilder($loader);
-        $routes->import(__DIR__.'/config/routing.yml');
+
+        if ($this->routingFile) {
+            $routes->import($this->routingFile);
+        } else {
+            $routes->import(__DIR__.'/config/routing.yml');
+        }
 
         return $routes->build();
     }
@@ -169,4 +193,12 @@ public function addCompilerPasses(array $compilerPasses)
     {
         $this->compilerPasses = $compilerPasses;
     }
+
+    /**
+     * @param string|null $routingFile
+     */
+    public function setRoutingFile($routingFile)
+    {
+        $this->routingFile = $routingFile;
+    }
 }

src/BaseBundleTestCase.php

@@ -27,6 +27,11 @@ abstract class BaseBundleTestCase extends TestCase
      */
     abstract protected function getBundleClass();
 
+    /**
+     * @var string|null
+     */
+    private $routingFile = null;
+
     /**
      * Boots the Kernel for this test.
      *
@@ -68,6 +73,7 @@ protected function createKernel()
         $this->kernel = new $class(uniqid('cache'));
         $this->kernel->addBundle($this->getBundleClass());
         $this->kernel->addCompilerPasses($this->compilerPasses);
+        $this->kernel->setRoutingFile($this->routingFile);
 
         return $this->kernel;
     }
@@ -92,11 +98,16 @@ public function ensureKernelShutdown()
         }
     }
 
-    /**
-     * @param CompilerPassInterface $compilerPass
-     */
     protected function addCompilerPass(CompilerPassInterface $compilerPass)
     {
         $this->compilerPasses[] = $compilerPass;
     }
+
+    /**
+     * @param string|null $routingFile
+     */
+    public function setRoutingFile($routingFile)
+    {
+        $this->routingFile = $routingFile;
+    }
 }