From a4d496309ba68ed5d0aea897e10fe8bb2b3440ab Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 1 Sep 2010 13:28:35 +0200 Subject: [PATCH] [FrameworkBundle] fixed skeleton --- .../Resources/skeleton/application/generic/Kernel.php | 3 +-- .../Resources/skeleton/application/php/config/routing.php | 1 - .../Resources/skeleton/application/xml/config/routing.xml | 2 -- .../Resources/skeleton/application/yml/config/routing.yml | 3 --- 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/generic/Kernel.php b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/generic/Kernel.php index 60ed85aae0..22aa81b55f 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/generic/Kernel.php +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/generic/Kernel.php @@ -28,11 +28,10 @@ class {{ class }}Kernel extends Kernel //new Symfony\Bundle\TwigBundle\TwigBundle(), // register your bundles - new Application\HelloBundle\HelloBundle(), ); if ($this->isDebug()) { - $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(), + $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); } return $bundles; diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/routing.php b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/routing.php index 1c2df4de95..f0e4dba995 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/routing.php +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/routing.php @@ -7,6 +7,5 @@ $collection = new RouteCollection(); $collection->addRoute('homepage', new Route('/', array( '_controller' => 'FrameworkBundle:Default:index', ))); -$collection->addCollection($loader->import("HelloBundle/Resources/config/routing.php")); return $collection; diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/config/routing.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/config/routing.xml index a9ec84bc69..614a3f36c6 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/config/routing.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/config/routing.xml @@ -7,6 +7,4 @@ FrameworkBundle:Default:index - - diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/routing.yml b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/routing.yml index bad9727a2d..01b8716b46 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/routing.yml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/routing.yml @@ -1,6 +1,3 @@ homepage: pattern: / defaults: { _controller: FrameworkBundle:Default:index } - -hello: - resource: HelloBundle/Resources/config/routing.yml