diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated default configuration in skeleton

Browse Source
This commit is contained in:
Fabien Potencier 2010-08-11 15:12:59 +02:00
parent 7b65956343
commit 875366f584
10 changed files with 101 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/config.php
View File

@ -6,24 +6,50 @@ $container->loadFromExtension('kernel', 'config', array(
));
$container->loadFromExtension('web', 'config', array(
'router' => array('resource' => '%kernel.root_dir%/config/routing.php'),
'router' => array('resource' => '%kernel.root_dir%/config/routing.php'),
'validation' => array('enabled' => true, 'annotations' => true),
));
$container->loadFromExtension('web', 'templating', array(
'escaping' => "htmlspecialchars",
'assets_version' => "SomeVersionScheme",
# 'assets_version' => "SomeVersionScheme",
));
// Sessions
/*
$container->loadFromExtension('kernel', 'session', array(
'default_locale' => "fr",
'session' => array(
'name' => "SYMFONY",
'type' => "Native",
'lifetime' => "3600",
)
));
*/
// Twig Configuration
/*
$container->loadFromExtension('twig', 'config', array('auto_reload' => true));
*/
// Doctrine Configuration
/*
$container->loadFromExtension('doctrine', 'dbal', array(
'dbname' => 'xxxxxxxx',
'user' => 'root',
'user' => 'xxxxxxxx',
'password' => '',
));
$container->loadFromExtension('doctrine', 'orm');
*/
$container->loadFromExtension('doctrine', 'orm', array());
// Swiftmailer Configuration
/*
$container->loadFromExtension('swift', 'mailer', array(
'transport' => "gmail",
'username' => "xxxxxxxx",
'password' => "xxxxxxxx",
'transport' => "smtp",
'encryption' => "ssl",
'auth_mode' => "login",
'host' => "smtp.gmail.com",
'username' => "xxxxxxxx",
'password' => "xxxxxxxx",
));
*/

8
src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/config_dev.php
View File

@ -2,11 +2,11 @@
$loader->import('config.php');
$container->loadFromExtension('web', 'config', array(
'toolbar' => true,
));
$container->loadFromExtension('zend', 'logger', array(
'priority' => 'info',
'path' => '%kernel.logs_dir%/%kernel.environment%.log',
));
$container->loadFromExtension('web', 'config', array(
'toolbar' => true,
));

5
src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/php/config/config_test.php
View File

@ -10,5 +10,8 @@ $container->loadFromExtension('web', 'config', array(
'toolbar' => false,
));
$container->loadFromExtension('kernel', 'test', array(
$container->loadFromExtension('zend', 'logger', array(
'priority' => 'debug',
));
$container->loadFromExtension('kernel', 'test');

36
src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/config/config.xml
View File

@ -2,13 +2,17 @@
<container xmlns="http://www.symfony-project.org/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:swift="http://www.symfony-project.org/schema/dic/swiftmailer"
xmlns:doctrine="http://www.symfony-project.org/schema/dic/doctrine"
xmlns:kernel="http://www.symfony-project.org/schema/dic/symfony/kernel"
xmlns:zend="http://www.symfony-project.org/schema/dic/zend"
xmlns:web="http://www.symfony-project.org/schema/dic/symfony"
xmlns:doctrine="http://www.symfony-project.org/schema/dic/doctrine"
xmlns:twig="http://www.symfony-project.org/schema/dic/twig"
xmlns:swift="http://www.symfony-project.org/schema/dic/swiftmailer"
xmlns:zend="http://www.symfony-project.org/schema/dic/zend"
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/symfony http://www.symfony-project.org/schema/dic/symfony/symfony-1.0.xsd
http://www.symfony-project.org/schema/dic/doctrine http://www.symfony-project.org/schema/dic/doctrine/doctrine-1.0.xsd
http://www.symfony-project.org/schema/dic/zend http://www.symfony-project.org/schema/dic/zend/zend-1.0.xsd
http://www.symfony-project.org/schema/dic/twig http://www.symfony-project.org/schema/dic/twig/twig-1.0.xsd
http://www.symfony-project.org/schema/dic/swiftmailer http://www.symfony-project.org/schema/dic/swiftmailer/swiftmailer-1.0.xsd">
<kernel:config
@ -18,24 +22,32 @@
<web:config>
<web:router resource="%kernel.root_dir%/config/routing.xml" />
<web:validation enabled="true" annotations="true" />
</web:config>
<web:templating
escaping="htmlspecialchars"
assets_version="SomeVersionScheme"
/>
<doctrine:dbal
dbname="xxxxxxxx"
user="root"
password=""
/>
<!-- Twig Configuration -->
<!--
<twig:config auto_reload="true" />
-->
<!-- Doctrine Configuration -->
<!--
<doctrine:dbal dbname="xxxxxxxx" user="xxxxxxxx" password="" />
<doctrine:orm />
-->
<!-- Swiftmailer Configuration -->
<!--
<swift:mailer
transport="gmail"
transport="smtp"
encryption="ssl"
auth_mode="login"
host="smtp.gmail.com"
username="xxxxxxxx"
password="xxxxxxxx"
/>
password="xxxxxxxx" />
-->
</container>

8
src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/config/config_dev.xml
View File

@ -11,12 +11,12 @@
<import resource="config.xml" />
</imports>
<web:config
toolbar="true"
/>
<zend:logger
priority="info"
path="%kernel.logs_dir%/%kernel.environment%.log"
/>
<web:config
toolbar="true"
/>
</container>

10
src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/config/config_test.xml
View File

@ -12,16 +12,16 @@
<import resource="config_dev.xml" />
</imports>
<kernel:config
error_handler="false"
/>
<web:config
toolbar="false"
/>
<kernel:config
error_handler="false"
/>
<zend:logger
priority="info"
priority="debug"
/>
<kernel:test />

30
src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/config.yml
View File

@ -3,20 +3,28 @@ kernel.config:
error_handler: null
web.config:
router: { resource: "%kernel.root_dir%/config/routing.yml" }
router: { resource: "%kernel.root_dir%/config/routing.yml" }
validation: { enabled: true, annotations: true }
web.templating:
escaping: htmlspecialchars
assets_version: SomeVersionScheme
#assets_version: SomeVersionScheme
doctrine.dbal:
dbname: xxxxxxxx
user: root
password: ~
## Twig Configuration
#twig.config:
# auto_reload: true
doctrine.orm: ~
## Doctrine Configuration
#doctrine.dbal:
# dbname: xxxxxxxx
# user: xxxxxxxx
# password: ~
swift.mailer:
transport: gmail
username: xxxxxxxx
password: xxxxxxxx
## Swiftmailer Configuration
#swift.mailer:
# transport: smtp
# encryption: ssl
# auth_mode: login
# host: smtp.gmail.com
# username: xxxxxxxx
# password: xxxxxxxx

8
src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/config_dev.yml
View File

@ -1,9 +1,9 @@
imports:
- { resource: config.yml }
zend.logger:
priority: debug
path: %kernel.logs_dir%/%kernel.environment%.log
web.config:
toolbar: true
zend.logger:
priority: debug
path: %kernel.root_dir%/logs/%kernel.environment%.log

6
src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yml/config/config_test.yml
View File

@ -4,10 +4,10 @@ imports:
kernel.config:
error_handler: false
zend.logger:
priority: debug
web.config:
toolbar: false
zend.logger:
priority: debug
kernel.test: ~

1
src/Symfony/Framework/KernelBundle.php
View File

@ -3,7 +3,6 @@
namespace Symfony\Framework;
use Symfony\Framework\Bundle\Bundle;
use Symfony\Framework\ClassCollectionLoader;
/*
* This file is part of the Symfony framework.