Skip to content

Commit 9c264b5

Browse files
committed
Merge branch '2.7' into 2.8
Conflicts: cookbook/security/remember_me.rst
2 parents 2ad1ba5 + 99975aa commit 9c264b5

36 files changed

+201
-81
lines changed

best_practices/i18n.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ following ``translator`` configuration option and set your application locale:
1111
# app/config/config.yml
1212
framework:
1313
# ...
14-
translator: { fallbacks: ["%locale%"] }
14+
translator: { fallbacks: ['%locale%'] }
1515
1616
# app/config/parameters.yml
1717
parameters:

best_practices/templates.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ name is irrelevant because you never use it in your own code):
156156
services:
157157
app.twig.app_extension:
158158
class: AppBundle\Twig\AppExtension
159-
arguments: ["@markdown"]
159+
arguments: ['@markdown']
160160
public: false
161161
tags:
162162
- { name: twig.extension }

book/service_container.rst

+6-6
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ straightforward. Parameters make defining services more organized and flexible:
175175
services:
176176
my_mailer:
177177
class: Acme\HelloBundle\Mailer
178-
arguments: ["%my_mailer.transport%"]
178+
arguments: ['%my_mailer.transport%']
179179
180180
.. code-block:: xml
181181
@@ -311,7 +311,7 @@ directories don't exist, create them.
311311
services:
312312
my_mailer:
313313
class: Acme\HelloBundle\Mailer
314-
arguments: ["%my_mailer.transport%"]
314+
arguments: ['%my_mailer.transport%']
315315
316316
.. code-block:: xml
317317
@@ -572,7 +572,7 @@ the service container gives you a much more appealing option:
572572
573573
newsletter_manager:
574574
class: Acme\HelloBundle\Newsletter\NewsletterManager
575-
arguments: ["@my_mailer"]
575+
arguments: ['@my_mailer']
576576
577577
.. code-block:: xml
578578
@@ -766,7 +766,7 @@ Injecting the dependency by the setter method just needs a change of syntax:
766766
newsletter_manager:
767767
class: Acme\HelloBundle\Newsletter\NewsletterManager
768768
calls:
769-
- [setMailer, ["@my_mailer"]]
769+
- [setMailer, ['@my_mailer']]
770770
771771
.. code-block:: xml
772772
@@ -923,7 +923,7 @@ it exists and do nothing if it doesn't:
923923
services:
924924
newsletter_manager:
925925
class: Acme\HelloBundle\Newsletter\NewsletterManager
926-
arguments: ["@?my_mailer"]
926+
arguments: ['@?my_mailer']
927927
928928
.. code-block:: xml
929929
@@ -1033,7 +1033,7 @@ Configuring the service container is easy:
10331033
services:
10341034
newsletter_manager:
10351035
class: Acme\HelloBundle\Newsletter\NewsletterManager
1036-
arguments: ["@mailer", "@templating"]
1036+
arguments: ['@mailer', '@templating']
10371037
10381038
.. code-block:: xml
10391039

changelog.rst

+120
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,126 @@ documentation.
1313
Do you also want to participate in the Symfony Documentation? Take a look
1414
at the ":doc:`/contributing/documentation/overview`" article.
1515

16+
November, 2015
17+
--------------
18+
19+
New Documentation
20+
~~~~~~~~~~~~~~~~~
21+
22+
* `#5893 <https://github.com/symfony/symfony-docs/pull/5893>`_ Added a note about the use of _format query parameter (javiereguiluz)
23+
* `#5876 <https://github.com/symfony/symfony-docs/pull/5876>`_ Symfony 2.7 Form choice option update (aivus, althaus, weaverryan)
24+
* `#5861 <https://github.com/symfony/symfony-docs/pull/5861>`_ Updated Table Console helper for spanning cols and rows (hiddewie)
25+
* `#5816 <https://github.com/symfony/symfony-docs/pull/5816>`_ Merge branches (nicolas-grekas, snoek09, WouterJ, xabbuh)
26+
* `#5804 <https://github.com/symfony/symfony-docs/pull/5804>`_ Added documentation for dnsMessage option (BenjaminPaap)
27+
* `#5774 <https://github.com/symfony/symfony-docs/pull/5774>`_ Show a more real example in data collectors doc (WouterJ)
28+
* `#5735 <https://github.com/symfony/symfony-docs/pull/5735>`_ [Contributing][Code] do not distinguish regular classes and API classes (xabbuh)
29+
30+
Fixed Documentation
31+
~~~~~~~~~~~~~~~~~~~
32+
33+
* `#5903 <https://github.com/symfony/symfony-docs/pull/5903>`_ Update front controller (nurolopher)
34+
* `#5768 <https://github.com/symfony/symfony-docs/pull/5768>`_ Removed "http_basic" config from the login form cookbook (javiereguiluz)
35+
* `#5863 <https://github.com/symfony/symfony-docs/pull/5863>`_ Correct useAttributeAsKey usage (danrot)
36+
* `#5833 <https://github.com/symfony/symfony-docs/pull/5833>`_ Fixed whitelist delivery of swiftmailer (hiddewie)
37+
* `#5815 <https://github.com/symfony/symfony-docs/pull/5815>`_ fix constraint names (xabbuh)
38+
* `#5793 <https://github.com/symfony/symfony-docs/pull/5793>`_ Callback Validation Constraint: Remove reference to deprecated option (ceithir)
39+
40+
Minor Documentation Changes
41+
~~~~~~~~~~~~~~~~~~~~~~~~~~~
42+
43+
* `#5931 <https://github.com/symfony/symfony-docs/pull/5931>`_ [#5875] Fixed link description, list of common media types (Douglas Naphas)
44+
* `#5923 <https://github.com/symfony/symfony-docs/pull/5923>`_ Remove information about request service deps of core services (WouterJ)
45+
* `#5911 <https://github.com/symfony/symfony-docs/pull/5911>`_ Wrap all strings containing @ in quotes in Yaml (WouterJ)
46+
* `#5889 <https://github.com/symfony/symfony-docs/pull/5889>`_ Always use "main" as the default firewall name (to match Symfony Standard Edition) (javiereguiluz)
47+
* `#5888 <https://github.com/symfony/symfony-docs/pull/5888>`_ Removed the use of ContainerAware class (javiereguiluz)
48+
* `#5625 <https://github.com/symfony/symfony-docs/pull/5625>`_ Tell about SYMFONY__TEMPLATING__HELPER__CODE__FILE_LINK_FORMAT (nicolas-grekas)
49+
* `#5896 <https://github.com/symfony/symfony-docs/pull/5896>`_ [Book][Templating] Update absolute URL asset to match 2.7 (lemoinem)
50+
* `#5828 <https://github.com/symfony/symfony-docs/pull/5828>`_ move the getEntityManager, only get it if needed (OskarStark)
51+
* `#5900 <https://github.com/symfony/symfony-docs/pull/5900>`_ Added new security advisories to the docs (fabpot)
52+
* `#5897 <https://github.com/symfony/symfony-docs/pull/5897>`_ Fixed some wrong line number references in doctrine.rst (DigNative)
53+
* `#5895 <https://github.com/symfony/symfony-docs/pull/5895>`_ Update debug_formatter.rst (strannik-06)
54+
* `#5883 <https://github.com/symfony/symfony-docs/pull/5883>`_ Book: Update Service Container Documentation (zanderbaldwin)
55+
* `#5862 <https://github.com/symfony/symfony-docs/pull/5862>`_ Fixes done automatically by the docbot (WouterJ)
56+
* `#5851 <https://github.com/symfony/symfony-docs/pull/5851>`_ updated sentence (OskarStark)
57+
* `#5870 <https://github.com/symfony/symfony-docs/pull/5870>`_ Update securing_services.rst (aruku)
58+
* `#5859 <https://github.com/symfony/symfony-docs/pull/5859>`_ Use Twig highlighter instead of Jinja (WouterJ)
59+
* `#5866 <https://github.com/symfony/symfony-docs/pull/5866>`_ Fixed little typo with a twig example (artf)
60+
* `#5849 <https://github.com/symfony/symfony-docs/pull/5849>`_ Clarified ambiguous wording (ThomasLandauer)
61+
* `#5826 <https://github.com/symfony/symfony-docs/pull/5826>`_ "setup" is a noun or adjective, "set up" is the verb (carlos-granados)
62+
* `#5816 <https://github.com/symfony/symfony-docs/pull/5816>`_ Merge branches (nicolas-grekas, snoek09, WouterJ, xabbuh)
63+
* `#5813 <https://github.com/symfony/symfony-docs/pull/5813>`_ use constants to choose generated URL type (xabbuh)
64+
* `#5808 <https://github.com/symfony/symfony-docs/pull/5808>`_ Reworded the explanation about flash messages (javiereguiluz)
65+
* `#5809 <https://github.com/symfony/symfony-docs/pull/5809>`_ Minor fix (javiereguiluz)
66+
* `#5805 <https://github.com/symfony/symfony-docs/pull/5805>`_ Mentioned the BETA and RC support for the Symfony Installer (javiereguiluz)
67+
* `#5781 <https://github.com/symfony/symfony-docs/pull/5781>`_ Added annotations example to Linking to Pages examples (carlos-granados)
68+
* `#5780 <https://github.com/symfony/symfony-docs/pull/5780>`_ Clarify when we are talking about PHP and Twig (carlos-granados)
69+
* `#5767 <https://github.com/symfony/symfony-docs/pull/5767>`_ [Cookbook][Security] clarify description of the getPosition() method (xabbuh)
70+
* `#5731 <https://github.com/symfony/symfony-docs/pull/5731>`_ [Cookbook][Security] update versionadded directive to match the content (xabbuh)
71+
* `#5681 <https://github.com/symfony/symfony-docs/pull/5681>`_ Update storage.rst (jls2933)
72+
* `#5363 <https://github.com/symfony/symfony-docs/pull/5363>`_ Added description on how to enable the security:check command through… (bizmate)
73+
* `#5841 <https://github.com/symfony/symfony-docs/pull/5841>`_ [Cookbook][Psr7] fix zend-diactoros Packagist link (xabbuh)
74+
* `#5850 <https://github.com/symfony/symfony-docs/pull/5850>`_ Fixed typo (tobiassjosten)
75+
* `#5852 <https://github.com/symfony/symfony-docs/pull/5852>`_ Fix doc for 2.6+, `server:start` replace `...:run` (Kevinrob)
76+
* `#5837 <https://github.com/symfony/symfony-docs/pull/5837>`_ Corrected link to ConEmu (dritter)
77+
78+
79+
October, 2015
80+
-------------
81+
82+
New Documentation
83+
~~~~~~~~~~~~~~~~~
84+
85+
* `#5345 <https://github.com/symfony/symfony-docs/pull/5345>`_ Adding information about empty files sent using BinaryFileResponse. (kherge)
86+
* `#5214 <https://github.com/symfony/symfony-docs/pull/5214>`_ [WIP] Reworking most of the registration form: (weaverryan)
87+
* `#5677 <https://github.com/symfony/symfony-docs/pull/5677>`_ replacing deprecated usage of True, False, Null validators in docs (Tim Stamp)
88+
* `#5314 <https://github.com/symfony/symfony-docs/pull/5314>`_ Documented the useAttributeAsKey() method (javiereguiluz)
89+
* `#5377 <https://github.com/symfony/symfony-docs/pull/5377>`_ Added a cookbook section about event subscribers (beni0888, javiereguiluz)
90+
* `#5592 <https://github.com/symfony/symfony-docs/pull/5592>`_ Updated the article about data collectors (javiereguiluz)
91+
92+
Fixed Documentation
93+
~~~~~~~~~~~~~~~~~~~
94+
95+
* `#5795 <https://github.com/symfony/symfony-docs/pull/5795>`_ Fix typo in UserType class (Dorozhko-Anton)
96+
* `#5758 <https://github.com/symfony/symfony-docs/pull/5758>`_ symlink issues with php-fpm (kendrick-k)
97+
98+
Minor Documentation Changes
99+
~~~~~~~~~~~~~~~~~~~~~~~~~~~
100+
101+
* `#5843 <https://github.com/symfony/symfony-docs/pull/5843>`_ Fixed the YAML syntax for service references (javiereguiluz)
102+
* `#5797 <https://github.com/symfony/symfony-docs/pull/5797>`_ [Process] use ProcessFailedException instead of RuntimeException. (aitboudad)
103+
* `#5812 <https://github.com/symfony/symfony-docs/pull/5812>`_ Remove duplicate and confusing info about testing error pages (carlos-granados)
104+
* `#5821 <https://github.com/symfony/symfony-docs/pull/5821>`_ Minor fixes in the HttpFoundation introduction article (javiereguiluz)
105+
* `#5822 <https://github.com/symfony/symfony-docs/pull/5822>`_ Fixed a syntax issue (javiereguiluz)
106+
* `#5796 <https://github.com/symfony/symfony-docs/pull/5796>`_ Fix for #5783 (BenjaminPaap)
107+
* `#5810 <https://github.com/symfony/symfony-docs/pull/5810>`_ Fixed a typo (javiereguiluz)
108+
* `#5784 <https://github.com/symfony/symfony-docs/pull/5784>`_ Add fe80::1 (j-d)
109+
* `#5799 <https://github.com/symfony/symfony-docs/pull/5799>`_ make file path consitent with other articles (OskarStark)
110+
* `#5794 <https://github.com/symfony/symfony-docs/pull/5794>`_ Minor tweaks for the registration form article (javiereguiluz)
111+
* `#5801 <https://github.com/symfony/symfony-docs/pull/5801>`_ namespace fix (OskarStark)
112+
* `#5792 <https://github.com/symfony/symfony-docs/pull/5792>`_ [Cookbook][EventDispatcher] fix build (xabbuh)
113+
* `#5787 <https://github.com/symfony/symfony-docs/pull/5787>`_ Definition Tweaks - see #5314 (weaverryan)
114+
* `#5777 <https://github.com/symfony/symfony-docs/pull/5777>`_ Update links (thewilkybarkid)
115+
* `#5775 <https://github.com/symfony/symfony-docs/pull/5775>`_ Misspelling (carlos-granados)
116+
* `#5664 <https://github.com/symfony/symfony-docs/pull/5664>`_ Info about implicit session start (ThomasLandauer)
117+
* `#5744 <https://github.com/symfony/symfony-docs/pull/5744>`_ translations have been removed from symfony.com (xabbuh)
118+
* `#5771 <https://github.com/symfony/symfony-docs/pull/5771>`_ Remove not existing response constant (amansilla)
119+
* `#5766 <https://github.com/symfony/symfony-docs/pull/5766>`_ Fixed two typos (ThomasLandauer)
120+
* `#5733 <https://github.com/symfony/symfony-docs/pull/5733>`_ [Components][OptionsResolver] adding type hint to normalizer callback (xabbuh)
121+
* `#5678 <https://github.com/symfony/symfony-docs/pull/5678>`_ Update HttpFoundation note after recent changes in routing component (senkal)
122+
* `#5643 <https://github.com/symfony/symfony-docs/pull/5643>`_ Document how to customize the prototype (daFish, WouterJ)
123+
* `#5584 <https://github.com/symfony/symfony-docs/pull/5584>`_ Add DebugBundle config reference (WouterJ)
124+
* `#5753 <https://github.com/symfony/symfony-docs/pull/5753>`_ configureOptions(...) : protected => public (lucascherifi)
125+
* `#5750 <https://github.com/symfony/symfony-docs/pull/5750>`_ fix YAML syntax highlighting (xabbuh)
126+
* `#5749 <https://github.com/symfony/symfony-docs/pull/5749>`_ complete Swiftmailer XML examples (xabbuh)
127+
* `#5726 <https://github.com/symfony/symfony-docs/pull/5726>`_ Document the support of Mintty for colors (stof)
128+
* `#5708 <https://github.com/symfony/symfony-docs/pull/5708>`_ Added caution to call createView after handleRequest (WouterJ)
129+
* `#5640 <https://github.com/symfony/symfony-docs/pull/5640>`_ Update controller.rst clarifying automatic deletion for flash messages (miguelvilata)
130+
* `#5578 <https://github.com/symfony/symfony-docs/pull/5578>`_ Add supported branches in platform.sh section (WouterJ)
131+
* `#5468 <https://github.com/symfony/symfony-docs/pull/5468>`_ [Cookbook][Templating] Add note about cache warming namespaced twig templates (kbond)
132+
* `#5684 <https://github.com/symfony/symfony-docs/pull/5684>`_ Fix delivery_whitelist regex (gonzalovilaseca)
133+
* `#5742 <https://github.com/symfony/symfony-docs/pull/5742>`_ incorrect: severity is an array key here and not a constant (lbayerl)
134+
135+
16136
September, 2015
17137
---------------
18138

components/dependency_injection/_imports-parameters-note.rst.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
# app/config/config.yml
1212
imports:
13-
- { resource: "%kernel.root_dir%/parameters.yml" }
13+
- { resource: '%kernel.root_dir%/parameters.yml' }
1414

1515
.. code-block:: xml
1616

components/dependency_injection/configurators.rst

+6-6
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ to create a configurator class to configure these instances::
114114
// ...
115115
}
116116

117-
The ``EmailConfigurator``'s job is to inject the enabled filters into ``NewsletterManager``
117+
The ``EmailConfigurator``'s job is to inject the enabled formatters into ``NewsletterManager``
118118
and ``GreetingCardManager`` because they are not aware of where the enabled
119-
filters come from. In the other hand, the ``EmailFormatterManager`` holds
119+
formatters come from. On the other hand, the ``EmailFormatterManager`` holds
120120
the knowledge about the enabled formatters and how to load them, keeping
121121
the single responsibility principle.
122122

@@ -139,20 +139,20 @@ The service config for the above classes would look something like this:
139139
140140
email_configurator:
141141
class: EmailConfigurator
142-
arguments: ["@email_formatter_manager"]
142+
arguments: ['@email_formatter_manager']
143143
# ...
144144
145145
newsletter_manager:
146146
class: NewsletterManager
147147
calls:
148148
- [setMailer, ["@my_mailer"]]
149-
configurator: ["@email_configurator", configure]
149+
configurator: ['@email_configurator', configure]
150150
151151
greeting_card_manager:
152152
class: GreetingCardManager
153153
calls:
154-
- [setMailer, ["@my_mailer"]]
155-
configurator: ["@email_configurator", configure]
154+
- [setMailer, ['@my_mailer']]
155+
configurator: ['@email_configurator', configure]
156156
157157
.. code-block:: xml
158158

components/dependency_injection/introduction.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ config files:
239239
services:
240240
mailer:
241241
class: Mailer
242-
arguments: ["%mailer.transport%"]
242+
arguments: ['%mailer.transport%']
243243
newsletter_manager:
244244
class: NewsletterManager
245245
calls:

components/dependency_injection/parameters.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ the parameter value in one place if needed.
151151

152152
.. code-block:: yaml
153153
154-
arguments: ["http://symfony.com/?foo=%%s&bar=%%d"]
154+
arguments: ['http://symfony.com/?foo=%%s&bar=%%d']
155155
156156
.. code-block:: xml
157157

components/dependency_injection/tags.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ For example you may add the following transports as services:
7474
acme_mailer.transport.smtp:
7575
class: \Swift_SmtpTransport
7676
arguments:
77-
- "%mailer_host%"
77+
- '%mailer_host%'
7878
tags:
7979
- { name: acme_mailer.transport }
8080
acme_mailer.transport.sendmail:
@@ -220,7 +220,7 @@ To answer this, change the service declaration:
220220
acme_mailer.transport.smtp:
221221
class: \Swift_SmtpTransport
222222
arguments:
223-
- "%mailer_host%"
223+
- '%mailer_host%'
224224
tags:
225225
- { name: acme_mailer.transport, alias: foo }
226226
acme_mailer.transport.sendmail:

components/dependency_injection/types.rst

+1-1
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

components/yaml/yaml_format.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -216,10 +216,10 @@ YAML uses indentation with one or more spaces to describe nested collections:
216216

217217
.. code-block:: yaml
218218
219-
"symfony 1.0":
219+
'symfony 1.0':
220220
PHP: 5.0
221221
Propel: 1.2
222-
"symfony 1.2":
222+
'symfony 1.2':
223223
PHP: 5.2
224224
Propel: 1.3
225225
@@ -279,8 +279,8 @@ You can mix and match styles to achieve a better readability:
279279
280280
.. code-block:: yaml
281281
282-
"symfony 1.0": { PHP: 5.0, Propel: 1.2 }
283-
"symfony 1.2": { PHP: 5.2, Propel: 1.3 }
282+
'symfony 1.0': { PHP: 5.0, Propel: 1.2 }
283+
'symfony 1.2': { PHP: 5.2, Propel: 1.3 }
284284
285285
Comments
286286
--------

cookbook/controller/service.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ argument:
206206
services:
207207
app.hello_controller:
208208
class: AppBundle\Controller\HelloController
209-
arguments: ["@templating"]
209+
arguments: ['@templating']
210210
211211
.. code-block:: xml
212212

cookbook/doctrine/mongodb_session_storage.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ need to change/add some parameters in the main configuration file:
3030
mongo_client:
3131
class: MongoClient
3232
# if using a username and password
33-
arguments: ["mongodb://%mongodb_username%:%mongodb_password%@%mongodb_host%:27017"]
33+
arguments: ['mongodb://%mongodb_username%:%mongodb_password%@%mongodb_host%:27017']
3434
# if not using a username and password
35-
arguments: ["mongodb://%mongodb_host%:27017"]
35+
arguments: ['mongodb://%mongodb_host%:27017']
3636
session.handler.mongo:
3737
class: Symfony\Component\HttpFoundation\Session\Storage\Handler\MongoDbSessionHandler
38-
arguments: ["@mongo_client", "%mongo.session.options%"]
38+
arguments: ['@mongo_client', '%mongo.session.options%']
3939
4040
.. code-block:: xml
4141

0 commit comments

Comments
 (0)