From ebae1d7bf20d7e68f19f83c6ef71a43967a29d10 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 1 Sep 2010 10:33:48 +0200 Subject: [PATCH] [FrameworkBundle] updated skeleton with the web profiler configuration --- .../skeleton/application/generic/Kernel.php | 24 +++++++++---------- .../application/php/config/config_dev.php | 6 +++++ .../application/php/config/config_test.php | 3 ++- .../application/php/config/routing.php | 2 +- .../application/php/config/routing_dev.php | 10 ++++++++ .../application/xml/config/config_dev.xml | 10 +++++++- .../application/xml/config/config_test.xml | 3 ++- .../application/xml/config/routing.xml | 2 ++ .../application/xml/config/routing_dev.xml | 10 ++++++++ .../application/yml/config/config_dev.yml | 5 ++++ .../application/yml/config/config_test.yml | 3 ++- .../application/yml/config/routing.yml | 3 +++ .../application/yml/config/routing_dev.yml | 6 +++++ 13 files changed, 70 insertions(+), 17 deletions(-) create mode 100644 src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/routing_dev.php create mode 100644 src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/config/routing_dev.xml create mode 100644 src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/routing_dev.yml 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 6bf5fb0d59..60ed85aae0 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/generic/Kernel.php +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/generic/Kernel.php @@ -5,12 +5,6 @@ require_once __DIR__.'/../src/autoload.php'; use Symfony\Framework\Kernel; use Symfony\Component\DependencyInjection\Loader\LoaderInterface; -use Symfony\Framework\KernelBundle; -use Symfony\Bundle\FrameworkBundle\FrameworkBundle; -use Symfony\Bundle\ZendBundle\ZendBundle; -use Symfony\Bundle\DoctrineBundle\DoctrineBundle; -use Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle; - class {{ class }}Kernel extends Kernel { public function registerRootDir() @@ -21,18 +15,24 @@ class {{ class }}Kernel extends Kernel public function registerBundles() { $bundles = array( - new KernelBundle(), - new FrameworkBundle(), + new Symfony\Framework\KernelBundle(), + new Symfony\Bundle\FrameworkBundle\FrameworkBundle(), // enable third-party bundles - new ZendBundle(), - new DoctrineBundle(), - new SwiftmailerBundle(), + new Symfony\Bundle\ZendBundle\ZendBundle(), + new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(), + new Symfony\Bundle\DoctrineBundle\DoctrineBundle(), + //new Symfony\Bundle\DoctrineMigrationsBundle\DoctrineMigrationsBundle(), + //new Symfony\Bundle\DoctrineMongoDBBundle\DoctrineMongoDBBundle(), + //new Symfony\Bundle\PropelBundle\PropelBundle(), + //new Symfony\Bundle\TwigBundle\TwigBundle(), - // register your bundles here + // register your bundles + new Application\HelloBundle\HelloBundle(), ); if ($this->isDebug()) { + $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(), } return $bundles; diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/config_dev.php b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/config_dev.php index 0bf9c2224d..fa76445d1d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/config_dev.php +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/config_dev.php @@ -3,7 +3,13 @@ $loader->import('config.php'); $container->loadFromExtension('web', 'config', array( + 'router' => array('resource' => '%kernel.root_dir%/config/routing_dev.php'), + 'profiler' => array('only-exceptions' => false), +)); + +$container->loadFromExtension('webprofiler', 'config', array( 'toolbar' => true, + 'intercept-redirects' => true, )); $container->loadFromExtension('zend', 'logger', array( diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/config_test.php b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/config_test.php index 607dcff634..3e85558417 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/config_test.php +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/config_test.php @@ -6,8 +6,9 @@ $container->loadFromExtension('kernel', 'config', array( 'error_handler' => false, )); -$container->loadFromExtension('web', 'config', array( +$container->loadFromExtension('webprofiler', 'config', array( 'toolbar' => false, + 'intercept-redirects' => false, )); $container->loadFromExtension('zend', 'logger', array( 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 2601c4cf2b..1c2df4de95 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 @@ -4,9 +4,9 @@ use Symfony\Component\Routing\RouteCollection; use Symfony\Component\Routing\Route; $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/php/config/routing_dev.php b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/routing_dev.php new file mode 100644 index 0000000000..7a6b024fd6 --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/routing_dev.php @@ -0,0 +1,10 @@ +addCollection($loader->import(__DIR__.'/routing.php')); + +$collection->addCollection($loader->import("WebProfilerBundle/Resources/config/routing/profiler.xml"), '/_profiler'); + +return $collection; diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/config/config_dev.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/config/config_dev.xml index fda30769de..4a6777f531 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/config/config_dev.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/config/config_dev.xml @@ -4,15 +4,23 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:zend="http://www.symfony-project.org/schema/dic/zend" xmlns:web="http://www.symfony-project.org/schema/dic/symfony" + xmlns:webprofiler="http://www.symfony-project.org/schema/dic/webprofiler" xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd + http://www.symfony-project.org/schema/dic/webprofiler http://www.symfony-project.org/schema/dic/webprofiler/webprofiler-1.0.xsd http://www.symfony-project.org/schema/dic/zend http://www.symfony-project.org/schema/dic/zend/zend-1.0.xsd"> - + + + + + - FrameworkBundle:Default:index + + diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/config/routing_dev.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/config/routing_dev.xml new file mode 100644 index 0000000000..721dd6a0ce --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/config/routing_dev.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/config_dev.yml b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/config_dev.yml index 1dc4a5f9c7..5f0c270df2 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/config_dev.yml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/config_dev.yml @@ -2,7 +2,12 @@ imports: - { resource: config.yml } web.config: + router: { resource: "%kernel.root_dir%/config/routing_dev.yml" } + profiler: { only_exceptions: false } + +webprofiler.config: toolbar: true + intercept_redirects: true zend.logger: priority: debug diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/config_test.yml b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/config_test.yml index 269ecbd1e8..9c3250071c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/config_test.yml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/config_test.yml @@ -4,8 +4,9 @@ imports: kernel.config: error_handler: false -web.config: +webprofiler.config: toolbar: false + intercept_redirects: false zend.logger: priority: debug 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 01b8716b46..bad9727a2d 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,3 +1,6 @@ homepage: pattern: / defaults: { _controller: FrameworkBundle:Default:index } + +hello: + resource: HelloBundle/Resources/config/routing.yml diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/routing_dev.yml b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/routing_dev.yml new file mode 100644 index 0000000000..d66afa47ad --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/routing_dev.yml @@ -0,0 +1,6 @@ +_main: + resource: routing.yml + +_profiler: + resource: WebProfilerBundle/Resources/config/routing/profiler.xml + prefix: /_profiler