Skip to content

Commit 505a694

Browse files
committed
added missing examples
1 parent 91ff414 commit 505a694

File tree

5 files changed

+70
-7
lines changed

5 files changed

+70
-7
lines changed

reference/configuration/doctrine.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,16 @@ Configuration Reference
1111
1212
doctrine:
1313
dbal:
14-
default_connection: ~
14+
default_connection: default
1515
types:
16-
1716
# Prototype
1817
name:
1918
class: ~ # Required
2019
commented: true
20+
2121
connections:
22+
default:
23+
dbname: database
2224
2325
# Prototype
2426
name:
@@ -98,6 +100,7 @@ Configuration Reference
98100
99101
# Configuring MultipleActiveResultSets for the pdo_sqlsrv driver
100102
MultipleActiveResultSets: ~
103+
101104
orm:
102105
default_entity_manager: ~
103106
auto_generate_proxy_classes: false

reference/configuration/monolog.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Configuration Reference
2121
processors:
2222
- some_callable
2323
main:
24-
type: fingerscrossed
24+
type: fingers_crossed
2525
action_level: WARNING
2626
buffer_size: 30
2727
handler: custom
@@ -50,7 +50,7 @@ Configuration Reference
5050
to_email: ~
5151
subject: ~
5252
email_prototype:
53-
id: ~ # Required
53+
id: ~ # Required (when the email_prototype is used)
5454
factory-method: ~
5555
channels:
5656
type: ~

reference/configuration/security.rst

Lines changed: 60 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ Each part will be explained in the next section.
4646
security_identity: acl_security_identities
4747
voter:
4848
allow_if_object_identity_unavailable: true
49-
encoders:
5049
50+
encoders:
5151
# Examples:
5252
Acme\DemoBundle\Entity\User1: sha512
5353
Acme\DemoBundle\Entity\User2:
@@ -62,8 +62,8 @@ Each part will be explained in the next section.
6262
encode_as_base64: true
6363
iterations: 5000
6464
id: ~
65-
providers: # Required
6665
66+
providers: # Required
6767
# Examples:
6868
memory:
6969
name: memory
@@ -84,7 +84,64 @@ Each part will be explained in the next section.
8484
id: ~
8585
chain:
8686
providers: []
87+
8788
firewalls: # Required
89+
# Examples:
90+
somename:
91+
pattern: .*
92+
request_matcher: some.service.id
93+
access_denied_url: /foo/error403
94+
access_denied_handler: some.service.id
95+
entry_point: some.service.id
96+
provider: name
97+
context: name
98+
stateless: false
99+
x509:
100+
provider: name
101+
http_basic:
102+
provider: name
103+
http_digest:
104+
provider: name
105+
form_login:
106+
check_path: /login_check
107+
login_path: /login
108+
use_forward: false
109+
always_use_default_target_path: false
110+
default_target_path: /
111+
target_path_parameter: _target_path
112+
use_referer: false
113+
failure_path: /foo
114+
failure_forward: false
115+
failure_handler: some.service.id
116+
success_handler: some.service.id
117+
username_parameter: _username
118+
password_parameter: _password
119+
csrf_parameter: _csrf_token
120+
intention: authenticate
121+
csrf_provider: my.csrf_provider.id
122+
post_only: true
123+
remember_me: false
124+
remember_me:
125+
token_provider: name
126+
key: someS3cretKey
127+
name: NameOfTheCookie
128+
lifetime: 3600 # in seconds
129+
path: /foo
130+
domain: somedomain.foo
131+
secure: false
132+
httponly: true
133+
always_remember_me: false
134+
remember_me_parameter: _remember_me
135+
logout:
136+
path: /logout
137+
target: /
138+
invalidate_session: false
139+
delete_cookies:
140+
a: { path: null, domain: null }
141+
b: { path: null, domain: null }
142+
handlers: [some.service.id, another.service.id]
143+
success_handler: some.service.id
144+
anonymous: ~
88145
89146
# Prototype
90147
name:
@@ -118,6 +175,7 @@ Each part will be explained in the next section.
118175
provider: ~
119176
parameter: _switch_user
120177
role: ROLE_ALLOWED_TO_SWITCH
178+
121179
access_control:
122180
requires_channel: ~
123181

reference/configuration/swiftmailer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,4 +193,4 @@ Full Default Configuration
193193
sleep: 0
194194
delivery_address: ~
195195
disable_delivery: ~
196-
logging: true
196+
logging: %kernel.debug%

reference/configuration/web_profiler.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ Full Default Configuration
1515
1616
# DEPRECATED, it is not useful anymore and can be removed safely from your configuration
1717
verbose: true
18+
19+
# display the web debug toolbar at the bottom of pages with a summary of profiler info
1820
toolbar: false
1921
position: bottom
2022
intercept_redirects: false

0 commit comments

Comments
 (0)