bug #6708 Routes should be just imported, not mounted (OndraM)

wouterj · wouterj · commit 47bae3b16e24 · 2016-07-04T13:37:06.000+02:00
This PR was merged into the master branch. Discussion ---------- Routes should be just imported, not mounted Finishes #6612 Commits ------- 34a3166 Routes should be just imported, not mounted
diff --git a/cookbook/configuration/micro-kernel-trait.rst b/cookbook/configuration/micro-kernel-trait.rst
@@ -188,15 +188,12 @@ to hold the kernel. Now it looks like this::
         {
             // import the WebProfilerRoutes, only if the bundle is enabled
             if (isset($this->bundles['WebProfilerBundle'])) {
-                $routes->mount('/_wdt', $routes->import('@WebProfilerBundle/Resources/config/routing/wdt.xml'));
-                $routes->mount('/_profiler', $routes->import('@WebProfilerBundle/Resources/config/routing/profiler.xml'));
+                $routes->import('@WebProfilerBundle/Resources/config/routing/wdt.xml', '/_wdt');
+                $routes->import('@WebProfilerBundle/Resources/config/routing/profiler.xml', '/_profiler');
             }
 
             // load the annotation routes
-            $routes->mount(
-                '/',
-                $routes->import(__DIR__.'/../src/App/Controller/', '/', 'annotation')
-            );
+            $routes->import(__DIR__.'/../src/App/Controller/', '/', 'annotation');
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -188,15 +188,12 @@ to hold the kernel. Now it looks like this::`
`188`	`188`	`{`
`189`	`189`	`// import the WebProfilerRoutes, only if the bundle is enabled`
`190`	`190`	`if (isset($this->bundles['WebProfilerBundle'])) {`
`191`		`- $routes->mount('/_wdt', $routes->import('@WebProfilerBundle/Resources/config/routing/wdt.xml'));`
`192`		`- $routes->mount('/_profiler', $routes->import('@WebProfilerBundle/Resources/config/routing/profiler.xml'));`
	`191`	`+ $routes->import('@WebProfilerBundle/Resources/config/routing/wdt.xml', '/_wdt');`
	`192`	`+ $routes->import('@WebProfilerBundle/Resources/config/routing/profiler.xml', '/_profiler');`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`// load the annotation routes`
`196`		`- $routes->mount(`
`197`		`- '/',`
`198`		`- $routes->import(__DIR__.'/../src/App/Controller/', '/', 'annotation')`
`199`		`- );`
	`196`	`+ $routes->import(__DIR__.'/../src/App/Controller/', '/', 'annotation');`
`200`	`197`	`}`
`201`	`198`	`}`
`202`	`199`