Skip to content

Commit 51abbea

Browse files
committed
[#2200] Removing one more reference to auto_start and updating all of the configuration to the latest 2.1
1 parent 457cf48 commit 51abbea

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

quick_tour/the_architecture.rst

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -140,14 +140,16 @@ PHP. Have a look at the default configuration:
140140
#esi: ~
141141
#translator: { fallback: "%locale%" }
142142
secret: "%secret%"
143-
router: { resource: "%kernel.root_dir%/config/routing.yml" }
143+
router:
144+
resource: "%kernel.root_dir%/config/routing.yml"
145+
strict_requirements: "%kernel.debug%"
144146
form: true
145147
csrf_protection: true
146148
validation: { enable_annotations: true }
147149
templating: { engines: ['twig'] } #assets_version: SomeVersionScheme
148150
default_locale: "%locale%"
149-
session:
150-
auto_start: true
151+
trusted_proxies: ~
152+
session: ~
151153
152154
# Twig Configuration
153155
twig:
@@ -159,13 +161,13 @@ PHP. Have a look at the default configuration:
159161
debug: "%kernel.debug%"
160162
use_controller: false
161163
bundles: [ ]
162-
# java: /usr/bin/java
164+
#java: /usr/bin/java
163165
filters:
164166
cssrewrite: ~
165-
# closure:
166-
# jar: "%kernel.root_dir%/java/compiler.jar"
167-
# yui_css:
168-
# jar: "%kernel.root_dir%/java/yuicompressor-2.4.2.jar"
167+
#closure:
168+
# jar: "%kernel.root_dir%/Resources/java/compiler.jar"
169+
#yui_css:
170+
# jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar"
169171
170172
# Doctrine Configuration
171173
doctrine:
@@ -188,10 +190,7 @@ PHP. Have a look at the default configuration:
188190
host: "%mailer_host%"
189191
username: "%mailer_user%"
190192
password: "%mailer_password%"
191-
192-
jms_security_extra:
193-
secure_controllers: true
194-
secure_all_services: false
193+
spool: { type: memory }
195194
196195
Each entry like ``framework`` defines the configuration for a specific bundle.
197196
For example, ``framework`` configures the ``FrameworkBundle`` while ``swiftmailer``

0 commit comments

Comments
 (0)