Skip to content

Commit ce77e1a

Browse files
weaverryanweaverryan
committed
Merge branch '2.0' into 2.1
Conflicts: cookbook/configuration/pdo_session_storage.rst
2 parents cf049ed + 6e08e18 commit ce77e1a

File tree

16 files changed

+68
-47
lines changed

16 files changed

+68
-47
lines changed

‎book/doctrine.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1313,7 +1313,7 @@ the current date, only when the entity is first persisted (i.e. inserted):
13131313
type: entity
13141314
# ...
13151315
lifecycleCallbacks:
1316-
prePersist: [ setCreatedValue ]
1316+
prePersist: [setCreatedValue]
13171317
13181318
.. code-block:: xml
13191319

‎book/service_container.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ straightforward. Parameters make defining services more organized and flexible:
192192
services:
193193
my_mailer:
194194
class: "%my_mailer.class%"
195-
arguments: [%my_mailer.transport%]
195+
arguments: ["%my_mailer.transport%"]
196196
197197
.. code-block:: xml
198198
@@ -335,7 +335,7 @@ directories don't exist, create them.
335335
services:
336336
my_mailer:
337337
class: "%my_mailer.class%"
338-
arguments: [%my_mailer.transport%]
338+
arguments: ["%my_mailer.transport%"]
339339
340340
.. code-block:: xml
341341
@@ -375,7 +375,7 @@ configuration.
375375
376376
# app/config/config.yml
377377
imports:
378-
- { resource: @AcmeHelloBundle/Resources/config/services.yml }
378+
- { resource: "@AcmeHelloBundle/Resources/config/services.yml" }
379379
380380
.. code-block:: xml
381381
@@ -574,7 +574,7 @@ the service container gives you a much more appealing option:
574574
# ...
575575
newsletter_manager:
576576
class: "%newsletter_manager.class%"
577-
arguments: [@my_mailer]
577+
arguments: ["@my_mailer"]
578578
579579
.. code-block:: xml
580580
@@ -665,7 +665,7 @@ Injecting the dependency by the setter method just needs a change of syntax:
665665
newsletter_manager:
666666
class: "%newsletter_manager.class%"
667667
calls:
668-
- [ setMailer, [ @my_mailer ] ]
668+
- [setMailer, ["@my_mailer"]]
669669
670670
.. code-block:: xml
671671
@@ -732,7 +732,7 @@ it exists and do nothing if it doesn't:
732732
services:
733733
newsletter_manager:
734734
class: "%newsletter_manager.class%"
735-
arguments: [@?my_mailer]
735+
arguments: ["@?my_mailer"]
736736
737737
.. code-block:: xml
738738
@@ -837,7 +837,7 @@ Configuring the service container is easy:
837837
services:
838838
newsletter_manager:
839839
class: "%newsletter_manager.class%"
840-
arguments: [@mailer, @templating]
840+
arguments: ["@mailer", "@templating"]
841841
842842
.. code-block:: xml
843843

‎components/dependency_injection/factories.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ in the previous example takes the ``templating`` service as an argument:
162162
factory_service: newsletter_factory
163163
factory_method: get
164164
arguments:
165-
- @templating
165+
- "@templating"
166166
167167
.. code-block:: xml
168168

‎components/dependency_injection/introduction.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,11 +236,11 @@ config files:
236236
services:
237237
mailer:
238238
class: Mailer
239-
arguments: [%mailer.transport%]
239+
arguments: ["%mailer.transport%"]
240240
newsletter_manager:
241241
class: NewsletterManager
242242
calls:
243-
- [ setMailer, [ @mailer ] ]
243+
- [setMailer, ["@mailer"]]
244244
245245
.. code-block:: xml
246246

‎components/dependency_injection/parentservices.rst

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ The service config for these classes would look something like this:
6464
newsletter_manager:
6565
class: "%newsletter_manager.class%"
6666
calls:
67-
- [ setMailer, [ @my_mailer ] ]
68-
- [ setEmailFormatter, [ @my_email_formatter] ]
67+
- [setMailer, ["@my_mailer"]]
68+
- [setEmailFormatter, ["@my_email_formatter"]]
6969
7070
greeting_card_manager:
7171
class: "%greeting_card_manager.class%"
7272
calls:
73-
- [ setMailer, [ @my_mailer ] ]
74-
- [ setEmailFormatter, [ @my_email_formatter] ]
73+
- [setMailer, ["@my_mailer"]]
74+
- [setEmailFormatter, ["@my_email_formatter"]]
7575
7676
.. code-block:: xml
7777
@@ -192,8 +192,8 @@ a parent for a service.
192192
mail_manager:
193193
abstract: true
194194
calls:
195-
- [ setMailer, [ @my_mailer ] ]
196-
- [ setEmailFormatter, [ @my_email_formatter] ]
195+
- [setMailer, ["@my_mailer"]]
196+
- [setEmailFormatter, ["@my_email_formatter"]]
197197
198198
newsletter_manager:
199199
class: "%newsletter_manager.class%"
@@ -312,15 +312,26 @@ to the ``NewsletterManager`` class, the config would look like this:
312312
mail_manager:
313313
abstract: true
314314
calls:
315+
<<<<<<< HEAD
315316
- [ setMailer, [ @my_mailer ] ]
316317
- [ setEmailFormatter, [ @my_email_formatter] ]
317318

319+
=======
320+
- [setMailer, ["@my_mailer"]]
321+
- [setEmailFormatter, ["@my_email_formatter"]]
322+
323+
>>>>>>> e1ae126cb094754b7f4e72bbdb4388fed7f2d188
318324
newsletter_manager:
319325
class: "%newsletter_manager.class%"
320326
parent: mail_manager
321327
calls:
328+
<<<<<<< HEAD
322329
- [ setMailer, [ @my_alternative_mailer ] ]
323330

331+
=======
332+
- [setMailer, ["@my_alternative_mailer"]]
333+
334+
>>>>>>> e1ae126cb094754b7f4e72bbdb4388fed7f2d188
324335
greeting_card_manager:
325336
class: "%greeting_card_manager.class%"
326337
parent: mail_manager
@@ -439,14 +450,24 @@ If you had the following config:
439450
mail_manager:
440451
abstract: true
441452
calls:
453+
<<<<<<< HEAD
442454
- [ setFilter, [ @my_filter ] ]
443455

456+
=======
457+
- [setFilter, ["@my_filter"]]
458+
459+
>>>>>>> e1ae126cb094754b7f4e72bbdb4388fed7f2d188
444460
newsletter_manager:
445461
class: "%newsletter_manager.class%"
446462
parent: mail_manager
447463
calls:
464+
<<<<<<< HEAD
448465
- [ setFilter, [ @another_filter ] ]
449466

467+
=======
468+
- [setFilter, ["@another_filter"]]
469+
470+
>>>>>>> e1ae126cb094754b7f4e72bbdb4388fed7f2d188
450471
.. code-block:: xml
451472
452473
<parameters>

‎components/dependency_injection/tags.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ For example you may add the following transports as services:
7979
acme_mailer.transport.smtp:
8080
class: \Swift_SmtpTransport
8181
arguments:
82-
- %mailer_host%
82+
- "%mailer_host%"
8383
tags:
8484
- { name: acme_mailer.transport }
8585
acme_mailer.transport.sendmail:
@@ -219,7 +219,7 @@ To answer this, change the service declaration:
219219
acme_mailer.transport.smtp:
220220
class: \Swift_SmtpTransport
221221
arguments:
222-
- %mailer_host%
222+
- "%mailer_host%"
223223
tags:
224224
- { name: acme_mailer.transport, alias: foo }
225225
acme_mailer.transport.sendmail:

‎components/dependency_injection/types.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ service container configuration:
4343
# ...
4444
newsletter_manager:
4545
class: NewsletterManager
46-
arguments: [@my_mailer]
46+
arguments: ["@my_mailer"]
4747
4848
.. code-block:: xml
4949
@@ -119,7 +119,7 @@ accepts the dependency::
119119
newsletter_manager:
120120
class: NewsletterManager
121121
calls:
122-
- [ setMailer, [ @my_mailer ] ]
122+
- [setMailer, ["@my_mailer"]]
123123
124124
.. code-block:: xml
125125
@@ -186,7 +186,7 @@ Another possibility is just setting public fields of the class directly::
186186
newsletter_manager:
187187
class: NewsletterManager
188188
properties:
189-
mailer: @my_mailer
189+
mailer: "@my_mailer"
190190
191191
.. code-block:: xml
192192

‎cookbook/configuration/pdo_session_storage.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ configuration format of your choice):
4848
4949
session.handler.pdo:
5050
class: Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler
51-
arguments: [@pdo, %pdo.db_options%]
51+
arguments: ["@pdo", "%pdo.db_options%"]
5252
5353
.. code-block:: xml
5454
@@ -137,8 +137,8 @@ parameter.ini by referencing the database-related parameters defined there:
137137
class: PDO
138138
arguments:
139139
- "mysql:host=%database_host%;port=%database_port%;dbname=%database_name%"
140-
- %database_user%
141-
- %database_password%
140+
- "%database_user%"
141+
- "%database_password%"
142142
143143
.. code-block:: xml
144144

‎cookbook/doctrine/multiple_entity_managers.rst

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,20 @@ The following configuration code shows how you can configure two entity managers
2727
default_connection: default
2828
connections:
2929
default:
30-
driver: %database_driver%
31-
host: %database_host%
32-
port: %database_port%
33-
dbname: %database_name%
34-
user: %database_user%
35-
password: %database_password%
30+
driver: "%database_driver%"
31+
host: "%database_host%"
32+
port: "%database_port%"
33+
dbname: "%database_name%"
34+
user: "%database_user%"
35+
password: "%database_password%"
3636
charset: UTF8
3737
customer:
38-
driver: %database_driver2%
39-
host: %database_host2%
40-
port: %database_port2%
41-
dbname: %database_name2%
42-
user: %database_user2%
43-
password: %database_password2%
38+
driver: "%database_driver2%"
39+
host: "%database_host2%"
40+
port: "%database_port2%"
41+
dbname: "%database_name2%"
42+
user: "%database_user2%"
43+
password: "%database_password2%"
4444
charset: UTF8
4545
4646
orm:

‎cookbook/event_dispatcher/before_after_filters.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ your listener to be called just before any controller is executed.
156156
services:
157157
demo.tokens.action_listener:
158158
class: Acme\DemoBundle\EventListener\TokenListener
159-
arguments: [ %tokens% ]
159+
arguments: ["%tokens%"]
160160
tags:
161161
- { name: kernel.event_listener, event: kernel.controller, method: onKernelController }
162162
@@ -251,7 +251,7 @@ event:
251251
services:
252252
demo.tokens.action_listener:
253253
class: Acme\DemoBundle\EventListener\TokenListener
254-
arguments: [ %tokens% ]
254+
arguments: ["%tokens%"]
255255
tags:
256256
- { name: kernel.event_listener, event: kernel.controller, method: onKernelController }
257257
- { name: kernel.event_listener, event: kernel.response, method: onKernelResponse }

‎cookbook/logging/monolog.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ using a processor.
281281
282282
monolog.processor.session_request:
283283
class: Acme\MyBundle\SessionRequestProcessor
284-
arguments: [ @session ]
284+
arguments: ["@session"]
285285
tags:
286286
- { name: monolog.processor, method: processRecord }
287287

‎cookbook/security/custom_authentication_provider.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,11 +361,11 @@ to service ids that do not exist yet: ``wsse.security.authentication.provider``
361361
services:
362362
wsse.security.authentication.provider:
363363
class: Acme\DemoBundle\Security\Authentication\Provider\WsseProvider
364-
arguments: ['', %kernel.cache_dir%/security/nonces]
364+
arguments: ["", "%kernel.cache_dir%/security/nonces"]
365365
366366
wsse.security.authentication.listener:
367367
class: Acme\DemoBundle\Security\Firewall\WsseListener
368-
arguments: [@security.context, @security.authentication.manager]
368+
arguments: ["@security.context", "@security.authentication.manager"]
369369
370370
371371
.. code-block:: xml

‎cookbook/security/securing_services.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Then in your service configuration, you can inject the service:
8080
services:
8181
newsletter_manager:
8282
class: "%newsletter_manager.class%"
83-
arguments: [@security.context]
83+
arguments: ["@security.context"]
8484
8585
.. code-block:: xml
8686

‎cookbook/security/voters.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ and tag it as a "security.voter":
114114
services:
115115
security.access.blacklist_voter:
116116
class: Acme\DemoBundle\Security\Authorization\Voter\ClientIpVoter
117-
arguments: [@service_container, [123.123.123.123, 171.171.171.171]]
117+
arguments: ["@service_container", [123.123.123.123, 171.171.171.171]]
118118
public: false
119119
tags:
120-
- { name: security.voter }
120+
- { name: security.voter }
121121
122122
.. code-block:: xml
123123

‎cookbook/web_services/php_soap_extension.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ a ``HelloService`` object properly:
6262
services:
6363
hello_service:
6464
class: Acme\SoapBundle\Services\HelloService
65-
arguments: [@mailer]
65+
arguments: ["@mailer"]
6666
6767
.. code-block:: xml
6868

‎reference/dic_tags.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ channel when injecting the logger in a service.
372372
services:
373373
my_service:
374374
class: Fully\Qualified\Loader\Class\Name
375-
arguments: [@logger]
375+
arguments: ["@logger"]
376376
tags:
377377
- { name: monolog.logger, channel: acme }
378378

0 commit comments

Comments
 (0)