Skip to content

Commit 91ff414

Browse files
kbondkbond
committed
updated configuration reference
1 parent 88a2fdc commit 91ff414

File tree

8 files changed

+305
-182
lines changed

8 files changed

+305
-182
lines changed

‎reference/configuration/assetic.rst

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,20 @@ Full Default Configuration
1212
.. code-block:: yaml
1313
1414
assetic:
15-
debug: true
16-
use_controller: true
15+
debug: %kernel.debug%
16+
use_controller:
17+
enabled: %kernel.debug%
18+
profiler: false
1719
read_from: %kernel.root_dir%/../web
1820
write_to: %assetic.read_from%
1921
java: /usr/bin/java
2022
node: /usr/bin/node
23+
ruby: /usr/bin/ruby
2124
sass: /usr/bin/sass
25+
variables:
26+
27+
# Prototype
28+
name: []
2229
bundles:
2330
2431
# Defaults (all currently registered bundles):
@@ -30,7 +37,6 @@ Full Default Configuration
3037
- DoctrineBundle
3138
- AsseticBundle
3239
- ...
33-
3440
assets:
3541
3642
# Prototype
@@ -49,4 +55,4 @@ Full Default Configuration
4955
functions:
5056
5157
# Prototype
52-
name: []
58+
name: []

‎reference/configuration/doctrine.rst

Lines changed: 141 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -11,63 +11,159 @@ Configuration Reference
1111
1212
doctrine:
1313
dbal:
14-
default_connection: default
14+
default_connection: ~
15+
types:
16+
17+
# Prototype
18+
name:
19+
class: ~ # Required
20+
commented: true
1521
connections:
16-
default:
17-
dbname: database
22+
23+
# Prototype
24+
name:
25+
dbname: ~
1826
host: localhost
19-
port: 1234
20-
user: user
21-
password: secret
27+
port: ~
28+
user: root
29+
password: ~
30+
charset: ~
31+
path: ~
32+
memory: ~
33+
34+
# The unix socket to use for MySQL
35+
unix_socket: ~
36+
37+
# True to use as persistent connection for the ibm_db2 driver
38+
persistent: ~
39+
40+
# The protocol to use for the ibm_db2 driver (default to TCPIP if ommited)
41+
protocol: ~
42+
43+
# True to use dbname as service name instead of SID for Oracle
44+
service: ~
45+
46+
# The session mode to use for the oci8 driver
47+
sessionMode: ~
48+
49+
# True to use a pooled server with the oci8 driver
50+
pooled: ~
51+
52+
# Configuring MultipleActiveResultSets for the pdo_sqlsrv driver
53+
MultipleActiveResultSets: ~
2254
driver: pdo_mysql
23-
driver_class: MyNamespace\MyDriverImpl
55+
platform_service: ~
56+
logging: true
57+
profiling: true
58+
driver_class: ~
59+
wrapper_class: ~
2460
options:
25-
foo: bar
26-
path: %kernel.data_dir%/data.sqlite
27-
memory: true
28-
unix_socket: /tmp/mysql.sock
29-
wrapper_class: MyDoctrineDbalConnectionWrapper
30-
charset: UTF8
31-
logging: %kernel.debug%
32-
platform_service: MyOwnDatabasePlatformService
61+
62+
# Prototype
63+
key: []
3364
mapping_types:
34-
enum: string
35-
conn1:
36-
# ...
37-
types:
38-
custom: Acme\HelloBundle\MyCustomType
65+
66+
# Prototype
67+
name: []
68+
slaves:
69+
70+
# Prototype
71+
name:
72+
dbname: ~
73+
host: localhost
74+
port: ~
75+
user: root
76+
password: ~
77+
charset: ~
78+
path: ~
79+
memory: ~
80+
81+
# The unix socket to use for MySQL
82+
unix_socket: ~
83+
84+
# True to use as persistent connection for the ibm_db2 driver
85+
persistent: ~
86+
87+
# The protocol to use for the ibm_db2 driver (default to TCPIP if ommited)
88+
protocol: ~
89+
90+
# True to use dbname as service name instead of SID for Oracle
91+
service: ~
92+
93+
# The session mode to use for the oci8 driver
94+
sessionMode: ~
95+
96+
# True to use a pooled server with the oci8 driver
97+
pooled: ~
98+
99+
# Configuring MultipleActiveResultSets for the pdo_sqlsrv driver
100+
MultipleActiveResultSets: ~
39101
orm:
40-
auto_generate_proxy_classes: false
41-
proxy_namespace: Proxies
42-
proxy_dir: %kernel.cache_dir%/doctrine/orm/Proxies
43-
default_entity_manager: default # The first defined is used if not set
102+
default_entity_manager: ~
103+
auto_generate_proxy_classes: false
104+
proxy_dir: %kernel.cache_dir%/doctrine/orm/Proxies
105+
proxy_namespace: Proxies
44106
entity_managers:
45-
default:
46-
# The name of a DBAL connection (the one marked as default is used if not set)
47-
connection: conn1
48-
mappings: # Required
49-
AcmeHelloBundle: ~
50-
class_metadata_factory_name: Doctrine\ORM\Mapping\ClassMetadataFactory
51-
# All cache drivers have to be array, apc, xcache or memcache
52-
metadata_cache_driver: array
53-
query_cache_driver: array
107+
108+
# Prototype
109+
name:
110+
query_cache_driver:
111+
type: array # Required
112+
host: ~
113+
port: ~
114+
instance_class: ~
115+
class: ~
116+
metadata_cache_driver:
117+
type: array # Required
118+
host: ~
119+
port: ~
120+
instance_class: ~
121+
class: ~
54122
result_cache_driver:
55-
type: memcache
56-
host: localhost
57-
port: 11211
58-
instance_class: Memcache
59-
class: Doctrine\Common\Cache\MemcacheCache
123+
type: array # Required
124+
host: ~
125+
port: ~
126+
instance_class: ~
127+
class: ~
128+
connection: ~
129+
class_metadata_factory_name: Doctrine\ORM\Mapping\ClassMetadataFactory
130+
default_repository_class: Doctrine\ORM\EntityRepository
131+
auto_mapping: false
132+
hydrators:
133+
134+
# Prototype
135+
name: []
136+
mappings:
137+
138+
# Prototype
139+
name:
140+
mapping: true
141+
type: ~
142+
dir: ~
143+
alias: ~
144+
prefix: ~
145+
is_bundle: ~
60146
dql:
61147
string_functions:
62-
test_string: Acme\HelloBundle\DQL\StringFunction
148+
149+
# Prototype
150+
name: []
63151
numeric_functions:
64-
test_numeric: Acme\HelloBundle\DQL\NumericFunction
152+
153+
# Prototype
154+
name: []
65155
datetime_functions:
66-
test_datetime: Acme\HelloBundle\DQL\DatetimeFunction
67-
hydrators:
68-
custom: Acme\HelloBundle\Hydrators\CustomHydrator
69-
em2:
70-
# ...
156+
157+
# Prototype
158+
name: []
159+
160+
# Register SQL Filters in the entity manager
161+
filters:
162+
163+
# Prototype
164+
name:
165+
class: ~ # Required
166+
enabled: false
71167
72168
.. code-block:: xml
73169

‎reference/configuration/framework.rst

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -246,11 +246,11 @@ Full Default Configuration
246246
247247
# general configuration
248248
charset: ~
249+
trust_proxy_headers: false
249250
secret: ~ # Required
250251
ide: ~
251252
test: ~
252253
default_locale: en
253-
trust_proxy_headers: false
254254
255255
# form configuration
256256
form:
@@ -267,13 +267,15 @@ Full Default Configuration
267267
profiler:
268268
only_exceptions: false
269269
only_master_requests: false
270-
dsn: sqlite:%kernel.cache_dir%/profiler.db
270+
dsn: file:%kernel.cache_dir%/profiler
271271
username:
272272
password:
273273
lifetime: 86400
274274
matcher:
275275
ip: ~
276-
path: ~
276+
277+
# use the urldecoded format
278+
path: ~ # Example: ^/path to resource/
277279
service: ~
278280
279281
# router configuration
@@ -285,26 +287,50 @@ Full Default Configuration
285287
286288
# session configuration
287289
session:
288-
auto_start: ~
290+
auto_start: false
289291
storage_id: session.storage.native
292+
handler_id: session.handler.native_file
290293
name: ~
291-
lifetime: 0
294+
cookie_lifetime: ~
295+
cookie_path: ~
296+
cookie_domain: ~
297+
cookie_secure: ~
298+
cookie_httponly: ~
299+
gc_divisor: ~
300+
gc_probability: ~
301+
gc_maxlifetime: ~
302+
save_path: %kernel.cache_dir%/sessions
303+
304+
# DEPRECATED! Please use: cookie_lifetime
305+
lifetime: ~
306+
307+
# DEPRECATED! Please use: cookie_path
292308
path: ~
309+
310+
# DEPRECATED! Please use: cookie_domain
293311
domain: ~
312+
313+
# DEPRECATED! Please use: cookie_secure
294314
secure: ~
315+
316+
# DEPRECATED! Please use: cookie_httponly
295317
httponly: ~
296318
297319
# templating configuration
298320
templating:
299321
assets_version: ~
300-
assets_version_format: "%%s?%%s"
322+
assets_version_format: %%s?%%s
323+
hinclude_default_template: ~
324+
form:
325+
resources:
326+
327+
# Default:
328+
- FrameworkBundle:Form
301329
assets_base_urls:
302330
http: []
303331
ssl: []
304332
cache: ~
305333
engines: # Required
306-
form:
307-
resources: [FrameworkBundle:Form]
308334
309335
# Example:
310336
- twig
@@ -314,7 +340,7 @@ Full Default Configuration
314340
# Prototype
315341
name:
316342
version: ~
317-
version_format: ~
343+
version_format: %%s?%%s
318344
base_urls:
319345
http: []
320346
ssl: []

‎reference/configuration/monolog.rst

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ Configuration Reference
1818
level: ERROR
1919
bubble: false
2020
formatter: my_formatter
21+
processors:
22+
- some_callable
2123
main:
22-
type: fingers_crossed
24+
type: fingerscrossed
2325
action_level: WARNING
2426
buffer_size: 30
2527
handler: custom
@@ -39,6 +41,7 @@ Configuration Reference
3941
facility: user
4042
max_files: 0
4143
action_level: WARNING
44+
activation_strategy: ~
4245
stop_buffering: true
4346
buffer_size: 0
4447
handler: ~
@@ -47,8 +50,11 @@ Configuration Reference
4750
to_email: ~
4851
subject: ~
4952
email_prototype:
50-
id: ~ # Required (when the email_prototype is used)
51-
method: ~
53+
id: ~ # Required
54+
factory-method: ~
55+
channels:
56+
type: ~
57+
elements: []
5258
formatter: ~
5359
5460
.. code-block:: xml

0 commit comments

Comments
 (0)