Skip to content

Commit 958da81

Browse files
weaverryanweaverryan
committed
Merge branch 'config-update' of https://github.com/kbond/symfony-docs into kbond-config-update
Conflicts: reference/configuration/doctrine.rst reference/configuration/framework.rst
2 parents c095ebd + 505a694 commit 958da81

File tree

7 files changed

+310
-126
lines changed

7 files changed

+310
-126
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: 139 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -12,62 +12,159 @@ Configuration Reference
1212
doctrine:
1313
dbal:
1414
default_connection: default
15+
types:
16+
# Prototype
17+
name:
18+
class: ~ # Required
19+
commented: true
20+
1521
connections:
1622
default:
1723
dbname: database
24+
25+
# Prototype
26+
name:
27+
dbname: ~
1828
host: localhost
19-
port: 1234
20-
user: user
21-
password: secret
29+
port: ~
30+
user: root
31+
password: ~
32+
charset: ~
33+
path: ~
34+
memory: ~
35+
36+
# The unix socket to use for MySQL
37+
unix_socket: ~
38+
39+
# True to use as persistent connection for the ibm_db2 driver
40+
persistent: ~
41+
42+
# The protocol to use for the ibm_db2 driver (default to TCPIP if ommited)
43+
protocol: ~
44+
45+
# True to use dbname as service name instead of SID for Oracle
46+
service: ~
47+
48+
# The session mode to use for the oci8 driver
49+
sessionMode: ~
50+
51+
# True to use a pooled server with the oci8 driver
52+
pooled: ~
53+
54+
# Configuring MultipleActiveResultSets for the pdo_sqlsrv driver
55+
MultipleActiveResultSets: ~
2256
driver: pdo_mysql
23-
driver_class: MyNamespace\MyDriverImpl
57+
platform_service: ~
58+
logging: true
59+
profiling: true
60+
driver_class: ~
61+
wrapper_class: ~
2462
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
63+
# Prototype
64+
key: []
3365
mapping_types:
34-
enum: string
35-
conn1:
36-
# ...
37-
types:
38-
custom: Acme\HelloBundle\MyCustomType
66+
67+
# Prototype
68+
name: []
69+
slaves:
70+
71+
# Prototype
72+
name:
73+
dbname: ~
74+
host: localhost
75+
port: ~
76+
user: root
77+
password: ~
78+
charset: ~
79+
path: ~
80+
memory: ~
81+
82+
# The unix socket to use for MySQL
83+
unix_socket: ~
84+
85+
# True to use as persistent connection for the ibm_db2 driver
86+
persistent: ~
87+
88+
# The protocol to use for the ibm_db2 driver (default to TCPIP if ommited)
89+
protocol: ~
90+
91+
# True to use dbname as service name instead of SID for Oracle
92+
service: ~
93+
94+
# The session mode to use for the oci8 driver
95+
sessionMode: ~
96+
97+
# True to use a pooled server with the oci8 driver
98+
pooled: ~
99+
100+
# Configuring MultipleActiveResultSets for the pdo_sqlsrv driver
101+
MultipleActiveResultSets: ~
102+
39103
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
104+
default_entity_manager: ~
105+
auto_generate_proxy_classes: false
106+
proxy_dir: %kernel.cache_dir%/doctrine/orm/Proxies
107+
proxy_namespace: Proxies
44108
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, memcache or service
52-
metadata_cache_driver: array
53-
query_cache_driver: array
109+
# Prototype
110+
name:
111+
query_cache_driver:
112+
type: array # Required
113+
host: ~
114+
port: ~
115+
instance_class: ~
116+
class: ~
117+
metadata_cache_driver:
118+
type: array # Required
119+
host: ~
120+
port: ~
121+
instance_class: ~
122+
class: ~
54123
result_cache_driver:
55-
type: memcache
56-
host: localhost
57-
port: 11211
58-
instance_class: Memcache
59-
class: Doctrine\Common\Cache\MemcacheCache
124+
type: array # Required
125+
host: ~
126+
port: ~
127+
instance_class: ~
128+
class: ~
129+
connection: ~
130+
class_metadata_factory_name: Doctrine\ORM\Mapping\ClassMetadataFactory
131+
default_repository_class: Doctrine\ORM\EntityRepository
132+
auto_mapping: false
133+
hydrators:
134+
135+
# Prototype
136+
name: []
137+
mappings:
138+
139+
# Prototype
140+
name:
141+
mapping: true
142+
type: ~
143+
dir: ~
144+
alias: ~
145+
prefix: ~
146+
is_bundle: ~
60147
dql:
61148
string_functions:
62-
test_string: Acme\HelloBundle\DQL\StringFunction
149+
150+
# Prototype
151+
name: []
63152
numeric_functions:
64-
test_numeric: Acme\HelloBundle\DQL\NumericFunction
153+
154+
# Prototype
155+
name: []
65156
datetime_functions:
66-
test_datetime: Acme\HelloBundle\DQL\DatetimeFunction
67-
hydrators:
68-
custom: Acme\HelloBundle\Hydrators\CustomHydrator
69-
em2:
70-
# ...
157+
158+
# Prototype
159+
name: []
160+
161+
# Register SQL Filters in the entity manager
162+
filters:
163+
164+
# Prototype
165+
name:
166+
class: ~ # Required
167+
enabled: false
71168
72169
.. code-block:: xml
73170

‎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: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ Configuration Reference
1818
level: ERROR
1919
bubble: false
2020
formatter: my_formatter
21+
processors:
22+
- some_callable
2123
main:
2224
type: fingers_crossed
2325
action_level: WARNING
@@ -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: ~
@@ -50,8 +53,11 @@ Configuration Reference
5053
to_email: ~
5154
subject: ~
5255
email_prototype:
53-
id: ~ # Required (when the email_prototype is used)
54-
method: ~
56+
id: ~ # Required (when the email_prototype is used)
57+
factory-method: ~
58+
channels:
59+
type: ~
60+
elements: []
5561
formatter: ~
5662
5763
.. code-block:: xml

0 commit comments

Comments
 (0)