Skip to content

Commit 15003d8

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: fix list items use valid XML in code block added Javier as a merger for the WebProfiler bundle use single quotes for YAML strings Typo in When Things Get More Advanced Remove phrase "in order" Remove excessive pluses [Reference] add missing version number replace EOL with EOM remove versionadded for unmaintained versions
2 parents 8e91949 + 21b8d85 commit 15003d8

File tree

27 files changed

+56
-71
lines changed

27 files changed

+56
-71
lines changed

best_practices/controllers.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ also show a 404 page if no ``Post`` can be found.
157157
When Things Get More Advanced
158158
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
159159

160-
This works without any configuration because the wildcard name ``{id}`` matches
160+
The above example works without any configuration because the wildcard name ``{id}`` matches
161161
the name of the property on the entity. If this isn't true, or if you have
162162
even more complex logic, the easiest thing to do is just query for the entity
163163
manually. In our application, we have this situation in ``CommentController``:

book/forms.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1831,10 +1831,6 @@ section.
18311831
The ``csrf_token_id`` option is optional but greatly enhances the security
18321832
of the generated token by making it different for each form.
18331833

1834-
.. versionadded:: 2.4
1835-
The ``csrf_token_id`` option was introduced in Symfony 2.4. Prior, you
1836-
had to use the ``intention`` option.
1837-
18381834
.. caution::
18391835

18401836
CSRF tokens are meant to be different for every user. This is why you

book/service_container.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ parameter and uses it in the service definition.
235235

236236
.. code-block:: xml
237237
238-
<argument type="string">http://symfony.com/?foo=%%s&bar=%%d</argument>
238+
<argument type="string">http://symfony.com/?foo=%%s&amp;bar=%%d</argument>
239239
240240
The purpose of parameters is to feed information into services. Of course
241241
there was nothing wrong with defining the service without using any parameters.

book/testing.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -288,9 +288,6 @@ document::
288288
// ...or simply check that the response is a redirect to any URL
289289
$this->assertTrue($client->getResponse()->isRedirect());
290290

291-
.. versionadded:: 2.4
292-
Support for HTTP status code constants was introduced in Symfony 2.4.
293-
294291
.. index::
295292
single: Tests; Client
296293

components/dependency_injection/configurators.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ The service config for the above classes would look something like this:
145145
newsletter_manager:
146146
class: NewsletterManager
147147
calls:
148-
- [setMailer, ["@my_mailer"]]
148+
- [setMailer, ['@my_mailer']]
149149
configurator: ['@email_configurator', configure]
150150
151151
greeting_card_manager:

components/dependency_injection/factories.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ method in the previous example takes the ``templating`` service as an argument:
138138
class: NewsletterManager
139139
factory: ["@newsletter_manager.factory", createNewsletterManager]
140140
arguments:
141-
- "@templating"
141+
- '@templating'
142142
143143
.. code-block:: xml
144144

components/dependency_injection/introduction.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ config files:
243243
newsletter_manager:
244244
class: NewsletterManager
245245
calls:
246-
- [setMailer, ["@mailer"]]
246+
- [setMailer, ['@mailer']]
247247
248248
.. code-block:: xml
249249

components/dependency_injection/parameters.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ the parameter value in one place if needed.
155155
156156
.. code-block:: xml
157157
158-
<argument>http://symfony.com/?foo=%%s&bar=%%d</argument>
158+
<argument>http://symfony.com/?foo=%%s&amp;bar=%%d</argument>
159159
160160
.. code-block:: php
161161

components/dependency_injection/parentservices.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -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: "NewsletterManager"
@@ -320,17 +320,17 @@ to the ``NewsletterManager`` class, the config would look like this:
320320
mail_manager:
321321
abstract: true
322322
calls:
323-
- [setMailer, ["@my_mailer"]]
324-
- [setEmailFormatter, ["@my_email_formatter"]]
323+
- [setMailer, ['@my_mailer']]
324+
- [setEmailFormatter, ['@my_email_formatter']]
325325
326326
newsletter_manager:
327-
class: "NewsletterManager"
327+
class: 'NewsletterManager'
328328
parent: mail_manager
329329
calls:
330-
- [setMailer, ["@my_alternative_mailer"]]
330+
- [setMailer, ['@my_alternative_mailer']]
331331
332332
greeting_card_manager:
333-
class: "GreetingCardManager"
333+
class: 'GreetingCardManager'
334334
parent: mail_manager
335335
336336
.. code-block:: xml

components/dependency_injection/types.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ that accepts the dependency::
126126
newsletter_manager:
127127
class: NewsletterManager
128128
calls:
129-
- [setMailer, ["@my_mailer"]]
129+
- [setMailer, ['@my_mailer']]
130130
131131
.. code-block:: xml
132132

0 commit comments

Comments
 (0)