Merge branch '2.3' into 2.7

Conflicts:
	cookbook/doctrine/pdo_session_storage.rst
	cookbook/form/dynamic_form_modification.rst
	cookbook/profiler/matchers.rst
	cookbook/security/custom_authentication_provider.rst
	cookbook/security/securing_services.rst
	cookbook/service_container/scopes.rst

Author: wouterj

best_practices/i18n.rst

@@ -11,7 +11,7 @@ following ``translator`` configuration option and set your application locale:
     # app/config/config.yml
     framework:
         # ...
-        translator: { fallbacks: ["%locale%"] }
+        translator: { fallbacks: ['%locale%'] }
 
     # app/config/parameters.yml
     parameters:

best_practices/templates.rst

@@ -156,7 +156,7 @@ name is irrelevant because you never use it in your own code):
     services:
         app.twig.app_extension:
             class:     AppBundle\Twig\AppExtension
-            arguments: ["@markdown"]
+            arguments: ['@markdown']
             public:    false
             tags:
                 - { name: twig.extension }

book/service_container.rst

@@ -175,7 +175,7 @@ straightforward. Parameters make defining services more organized and flexible:
         services:
             my_mailer:
                 class:        Acme\HelloBundle\Mailer
-                arguments:    ["%my_mailer.transport%"]
+                arguments:    ['%my_mailer.transport%']
 
     .. code-block:: xml
 
@@ -311,7 +311,7 @@ directories don't exist, create them.
         services:
             my_mailer:
                 class:        Acme\HelloBundle\Mailer
-                arguments:    ["%my_mailer.transport%"]
+                arguments:    ['%my_mailer.transport%']
 
     .. code-block:: xml
 
@@ -572,7 +572,7 @@ the service container gives you a much more appealing option:
 
             newsletter_manager:
                 class:     Acme\HelloBundle\Newsletter\NewsletterManager
-                arguments: ["@my_mailer"]
+                arguments: ['@my_mailer']
 
     .. code-block:: xml
 
@@ -766,7 +766,7 @@ Injecting the dependency by the setter method just needs a change of syntax:
             newsletter_manager:
                 class:     Acme\HelloBundle\Newsletter\NewsletterManager
                 calls:
-                    - [setMailer, ["@my_mailer"]]
+                    - [setMailer, ['@my_mailer']]
 
     .. code-block:: xml
 
@@ -923,7 +923,7 @@ it exists and do nothing if it doesn't:
         services:
             newsletter_manager:
                 class:     Acme\HelloBundle\Newsletter\NewsletterManager
-                arguments: ["@?my_mailer"]
+                arguments: ['@?my_mailer']
 
     .. code-block:: xml
 
@@ -1033,7 +1033,7 @@ Configuring the service container is easy:
         services:
             newsletter_manager:
                 class:     Acme\HelloBundle\Newsletter\NewsletterManager
-                arguments: ["@mailer", "@templating"]
+                arguments: ['@mailer', '@templating']
 
     .. code-block:: xml
 

changelog.rst

@@ -13,6 +13,105 @@ documentation.
     Do you also want to participate in the Symfony Documentation? Take a look
     at the ":doc:`/contributing/documentation/overview`" article.
 
+November, 2015
+--------------
+
+New Documentation
+~~~~~~~~~~~~~~~~~
+
+* `#5893 <https://github.com/symfony/symfony-docs/pull/5893>`_ Added a note about the use of _format query parameter (javiereguiluz)
+* `#5774 <https://github.com/symfony/symfony-docs/pull/5774>`_ Show a more real example in data collectors doc (WouterJ)
+* `#5735 <https://github.com/symfony/symfony-docs/pull/5735>`_ [Contributing][Code] do not distinguish regular classes and API classes (xabbuh)
+
+Fixed Documentation
+~~~~~~~~~~~~~~~~~~~
+
+* `#5903 <https://github.com/symfony/symfony-docs/pull/5903>`_ Update front controller (nurolopher)
+* `#5768 <https://github.com/symfony/symfony-docs/pull/5768>`_ Removed "http_basic" config from the login form cookbook (javiereguiluz)
+* `#5863 <https://github.com/symfony/symfony-docs/pull/5863>`_ Correct useAttributeAsKey usage (danrot)
+* `#5833 <https://github.com/symfony/symfony-docs/pull/5833>`_ Fixed whitelist delivery of swiftmailer (hiddewie)
+* `#5815 <https://github.com/symfony/symfony-docs/pull/5815>`_ fix constraint names (xabbuh)
+
+Minor Documentation Changes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* `#5931 <https://github.com/symfony/symfony-docs/pull/5931>`_ [#5875] Fixed link description, list of common media types (Douglas Naphas)
+* `#5911 <https://github.com/symfony/symfony-docs/pull/5911>`_ Wrap all strings containing @ in quotes in Yaml (WouterJ)
+* `#5889 <https://github.com/symfony/symfony-docs/pull/5889>`_ Always use "main" as the default firewall name (to match Symfony Standard Edition) (javiereguiluz)
+* `#5888 <https://github.com/symfony/symfony-docs/pull/5888>`_ Removed the use of ContainerAware class (javiereguiluz)
+* `#5625 <https://github.com/symfony/symfony-docs/pull/5625>`_ Tell about SYMFONY__TEMPLATING__HELPER__CODE__FILE_LINK_FORMAT (nicolas-grekas)
+* `#5828 <https://github.com/symfony/symfony-docs/pull/5828>`_ move the getEntityManager, only get it if needed (OskarStark)
+* `#5900 <https://github.com/symfony/symfony-docs/pull/5900>`_ Added new security advisories to the docs (fabpot)
+* `#5897 <https://github.com/symfony/symfony-docs/pull/5897>`_ Fixed some wrong line number references in doctrine.rst (DigNative)
+* `#5883 <https://github.com/symfony/symfony-docs/pull/5883>`_ Book: Update Service Container Documentation (zanderbaldwin)
+* `#5862 <https://github.com/symfony/symfony-docs/pull/5862>`_ Fixes done automatically by the docbot (WouterJ)
+* `#5851 <https://github.com/symfony/symfony-docs/pull/5851>`_ updated sentence (OskarStark)
+* `#5870 <https://github.com/symfony/symfony-docs/pull/5870>`_ Update securing_services.rst (aruku)
+* `#5859 <https://github.com/symfony/symfony-docs/pull/5859>`_ Use Twig highlighter instead of Jinja (WouterJ)
+* `#5866 <https://github.com/symfony/symfony-docs/pull/5866>`_ Fixed little typo with a twig example (artf)
+* `#5849 <https://github.com/symfony/symfony-docs/pull/5849>`_ Clarified ambiguous wording (ThomasLandauer)
+* `#5826 <https://github.com/symfony/symfony-docs/pull/5826>`_ "setup" is a noun or adjective, "set up" is the verb (carlos-granados)
+* `#5813 <https://github.com/symfony/symfony-docs/pull/5813>`_ use constants to choose generated URL type (xabbuh)
+* `#5808 <https://github.com/symfony/symfony-docs/pull/5808>`_ Reworded the explanation about flash messages (javiereguiluz)
+* `#5809 <https://github.com/symfony/symfony-docs/pull/5809>`_ Minor fix (javiereguiluz)
+* `#5805 <https://github.com/symfony/symfony-docs/pull/5805>`_ Mentioned the BETA and RC support for the Symfony Installer (javiereguiluz)
+* `#5781 <https://github.com/symfony/symfony-docs/pull/5781>`_ Added annotations example to Linking to Pages examples (carlos-granados)
+* `#5767 <https://github.com/symfony/symfony-docs/pull/5767>`_ [Cookbook][Security] clarify description of the getPosition() method (xabbuh)
+* `#5681 <https://github.com/symfony/symfony-docs/pull/5681>`_ Update storage.rst (jls2933)
+* `#5841 <https://github.com/symfony/symfony-docs/pull/5841>`_ [Cookbook][Psr7] fix zend-diactoros Packagist link (xabbuh)
+* `#5850 <https://github.com/symfony/symfony-docs/pull/5850>`_ Fixed typo (tobiassjosten)
+* `#5837 <https://github.com/symfony/symfony-docs/pull/5837>`_ Corrected link to ConEmu (dritter)
+
+
+October, 2015
+-------------
+
+New Documentation
+~~~~~~~~~~~~~~~~~
+
+* `#5345 <https://github.com/symfony/symfony-docs/pull/5345>`_ Adding information about empty files sent using BinaryFileResponse. (kherge)
+* `#5214 <https://github.com/symfony/symfony-docs/pull/5214>`_ [WIP] Reworking most of the registration form: (weaverryan)
+* `#5677 <https://github.com/symfony/symfony-docs/pull/5677>`_ replacing deprecated usage of True, False, Null validators in docs (Tim Stamp)
+* `#5314 <https://github.com/symfony/symfony-docs/pull/5314>`_ Documented the useAttributeAsKey() method (javiereguiluz)
+* `#5377 <https://github.com/symfony/symfony-docs/pull/5377>`_ Added a cookbook section about event subscribers (beni0888, javiereguiluz)
+* `#5592 <https://github.com/symfony/symfony-docs/pull/5592>`_ Updated the article about data collectors (javiereguiluz)
+
+Fixed Documentation
+~~~~~~~~~~~~~~~~~~~
+
+* `#5795 <https://github.com/symfony/symfony-docs/pull/5795>`_ Fix typo in UserType class (Dorozhko-Anton)
+* `#5758 <https://github.com/symfony/symfony-docs/pull/5758>`_ symlink issues with php-fpm (kendrick-k)
+
+Minor Documentation Changes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* `#5843 <https://github.com/symfony/symfony-docs/pull/5843>`_ Fixed the YAML syntax for service references (javiereguiluz)
+* `#5821 <https://github.com/symfony/symfony-docs/pull/5821>`_ Minor fixes in the HttpFoundation introduction article (javiereguiluz)
+* `#5796 <https://github.com/symfony/symfony-docs/pull/5796>`_ Fix for #5783 (BenjaminPaap)
+* `#5810 <https://github.com/symfony/symfony-docs/pull/5810>`_ Fixed a typo (javiereguiluz)
+* `#5784 <https://github.com/symfony/symfony-docs/pull/5784>`_ Add fe80::1 (j-d)
+* `#5799 <https://github.com/symfony/symfony-docs/pull/5799>`_ make file path consitent with other articles (OskarStark)
+* `#5794 <https://github.com/symfony/symfony-docs/pull/5794>`_ Minor tweaks for the registration form article (javiereguiluz)
+* `#5801 <https://github.com/symfony/symfony-docs/pull/5801>`_ namespace fix (OskarStark)
+* `#5787 <https://github.com/symfony/symfony-docs/pull/5787>`_ Definition Tweaks - see #5314 (weaverryan)
+* `#5777 <https://github.com/symfony/symfony-docs/pull/5777>`_ Update links (thewilkybarkid)
+* `#5775 <https://github.com/symfony/symfony-docs/pull/5775>`_ Misspelling (carlos-granados)
+* `#5664 <https://github.com/symfony/symfony-docs/pull/5664>`_ Info about implicit session start (ThomasLandauer)
+* `#5744 <https://github.com/symfony/symfony-docs/pull/5744>`_ translations have been removed from symfony.com (xabbuh)
+* `#5771 <https://github.com/symfony/symfony-docs/pull/5771>`_ Remove not existing response constant (amansilla)
+* `#5766 <https://github.com/symfony/symfony-docs/pull/5766>`_ Fixed two typos (ThomasLandauer)
+* `#5678 <https://github.com/symfony/symfony-docs/pull/5678>`_ Update HttpFoundation note after recent changes in routing component (senkal)
+* `#5643 <https://github.com/symfony/symfony-docs/pull/5643>`_ Document how to customize the prototype (daFish, WouterJ)
+* `#5750 <https://github.com/symfony/symfony-docs/pull/5750>`_ fix YAML syntax highlighting (xabbuh)
+* `#5749 <https://github.com/symfony/symfony-docs/pull/5749>`_ complete Swiftmailer XML examples (xabbuh)
+* `#5726 <https://github.com/symfony/symfony-docs/pull/5726>`_ Document the support of Mintty for colors (stof)
+* `#5708 <https://github.com/symfony/symfony-docs/pull/5708>`_ Added caution to call createView after handleRequest (WouterJ)
+* `#5640 <https://github.com/symfony/symfony-docs/pull/5640>`_ Update controller.rst clarifying automatic deletion for flash messages (miguelvilata)
+* `#5578 <https://github.com/symfony/symfony-docs/pull/5578>`_ Add supported branches in platform.sh section (WouterJ)
+* `#5468 <https://github.com/symfony/symfony-docs/pull/5468>`_ [Cookbook][Templating] Add note about cache warming namespaced twig templates (kbond)
+* `#5684 <https://github.com/symfony/symfony-docs/pull/5684>`_ Fix delivery_whitelist regex (gonzalovilaseca)
+
+
 September, 2015
 ---------------
 

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

@@ -10,7 +10,7 @@
 
             # app/config/config.yml
             imports:
-                - { resource: "%kernel.root_dir%/parameters.yml" }
+                - { resource: '%kernel.root_dir%/parameters.yml' }
 
         .. code-block:: xml
 

components/dependency_injection/configurators.rst

@@ -114,9 +114,9 @@ to create a configurator class to configure these instances::
         // ...
     }
 
-The ``EmailConfigurator``'s job is to inject the enabled filters into ``NewsletterManager``
+The ``EmailConfigurator``'s job is to inject the enabled formatters into ``NewsletterManager``
 and ``GreetingCardManager`` because they are not aware of where the enabled
-filters come from. In the other hand, the ``EmailFormatterManager`` holds
+formatters come from. On the other hand, the ``EmailFormatterManager`` holds
 the knowledge about the enabled formatters and how to load them, keeping
 the single responsibility principle.
 
@@ -139,20 +139,20 @@ The service config for the above classes would look something like this:
 
             email_configurator:
                 class:     EmailConfigurator
-                arguments: ["@email_formatter_manager"]
+                arguments: ['@email_formatter_manager']
                 # ...
 
             newsletter_manager:
                 class:     NewsletterManager
                 calls:
                     - [setMailer, ["@my_mailer"]]
-                configurator: ["@email_configurator", configure]
+                configurator: ['@email_configurator', configure]
 
             greeting_card_manager:
                 class:     GreetingCardManager
                 calls:
-                    - [setMailer, ["@my_mailer"]]
-                configurator: ["@email_configurator", configure]
+                    - [setMailer, ['@my_mailer']]
+                configurator: ['@email_configurator', configure]
 
     .. code-block:: xml
 

components/dependency_injection/introduction.rst

@@ -239,7 +239,7 @@ config files:
         services:
             mailer:
                 class:     Mailer
-                arguments: ["%mailer.transport%"]
+                arguments: ['%mailer.transport%']
             newsletter_manager:
                 class:     NewsletterManager
                 calls:

components/dependency_injection/parameters.rst

@@ -151,7 +151,7 @@ the parameter value in one place if needed.
 
         .. code-block:: yaml
 
-            arguments: ["http://symfony.com/?foo=%%s&bar=%%d"]
+            arguments: ['http://symfony.com/?foo=%%s&bar=%%d']
 
         .. code-block:: xml
 

components/dependency_injection/tags.rst

@@ -74,7 +74,7 @@ For example you may add the following transports as services:
             acme_mailer.transport.smtp:
                 class: \Swift_SmtpTransport
                 arguments:
-                    - "%mailer_host%"
+                    - '%mailer_host%'
                 tags:
                     -  { name: acme_mailer.transport }
             acme_mailer.transport.sendmail:
@@ -220,7 +220,7 @@ To answer this, change the service declaration:
             acme_mailer.transport.smtp:
                 class: \Swift_SmtpTransport
                 arguments:
-                    - "%mailer_host%"
+                    - '%mailer_host%'
                 tags:
                     -  { name: acme_mailer.transport, alias: foo }
             acme_mailer.transport.sendmail:

components/dependency_injection/types.rst

@@ -43,7 +43,7 @@ service container configuration:
                 # ...
             newsletter_manager:
                 class:     NewsletterManager
-                arguments: ["@my_mailer"]
+                arguments: ['@my_mailer']
 
     .. code-block:: xml
 

components/yaml/yaml_format.rst

@@ -216,10 +216,10 @@ YAML uses indentation with one or more spaces to describe nested collections:
 
 .. code-block:: yaml
 
-    "symfony 1.0":
+    'symfony 1.0':
       PHP:    5.0
       Propel: 1.2
-    "symfony 1.2":
+    'symfony 1.2':
       PHP:    5.2
       Propel: 1.3
 
@@ -279,8 +279,8 @@ You can mix and match styles to achieve a better readability:
 
 .. code-block:: yaml
 
-    "symfony 1.0": { PHP: 5.0, Propel: 1.2 }
-    "symfony 1.2": { PHP: 5.2, Propel: 1.3 }
+    'symfony 1.0': { PHP: 5.0, Propel: 1.2 }
+    'symfony 1.2': { PHP: 5.2, Propel: 1.3 }
 
 Comments
 --------

cookbook/controller/service.rst

@@ -206,7 +206,7 @@ argument:
         services:
             app.hello_controller:
                 class:     AppBundle\Controller\HelloController
-                arguments: ["@templating"]
+                arguments: ['@templating']
 
     .. code-block:: xml
 

cookbook/doctrine/mongodb_session_storage.rst

@@ -30,12 +30,12 @@ need to change/add some parameters in the main configuration file:
             mongo_client:
                 class: MongoClient
                 # if using a username and password
-                arguments: ["mongodb://%mongodb_username%:%mongodb_password%@%mongodb_host%:27017"]
+                arguments: ['mongodb://%mongodb_username%:%mongodb_password%@%mongodb_host%:27017']
                 # if not using a username and password
-                arguments: ["mongodb://%mongodb_host%:27017"]
+                arguments: ['mongodb://%mongodb_host%:27017']
             session.handler.mongo:
                 class: Symfony\Component\HttpFoundation\Session\Storage\Handler\MongoDbSessionHandler
-                arguments: ["@mongo_client", "%mongo.session.options%"]
+                arguments: ['@mongo_client', '%mongo.session.options%']
 
     .. code-block:: xml
 

cookbook/doctrine/pdo_session_storage.rst

@@ -34,7 +34,7 @@ To use it, you just need to change some parameters in the main configuration fil
                 class:     Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler
                 public:    false
                 arguments:
-                    - "mysql:dbname=mydatabase"
+                    - 'mysql:dbname=mydatabase'
                     - { db_username: myuser, db_password: mypassword }
 
     .. code-block:: xml
@@ -92,7 +92,7 @@ a second array argument to ``PdoSessionHandler``:
                 class:     Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler
                 public:    false
                 arguments:
-                    - "mysql:dbname=mydatabase"
+                    - 'mysql:dbname=mydatabase'
                     - { db_table: sessions, db_username: myuser, db_password: mypassword }
 
     .. code-block:: xml
@@ -164,8 +164,8 @@ of your project's data, you can use the connection settings from the
                 class:     Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler
                 public:    false
                 arguments:
-                    - "mysql:host=%database_host%;port=%database_port%;dbname=%database_name%"
-                    - { db_username: %database_user%, db_password: %database_password% }
+                    - 'mysql:host=%database_host%;port=%database_port%;dbname=%database_name%'
+                    - { db_username: '%database_user%', db_password: '%database_password%' }
 
     .. code-block:: xml
 

cookbook/event_dispatcher/before_after_filters.rst

@@ -157,7 +157,7 @@ your listener to be called just before any controller is executed.
         services:
             app.tokens.action_listener:
                 class: AppBundle\EventListener\TokenListener
-                arguments: ["%tokens%"]
+                arguments: ['%tokens%']
                 tags:
                     - { name: kernel.event_listener, event: kernel.controller, method: onKernelController }
 
@@ -252,7 +252,7 @@ event:
         services:
             app.tokens.action_listener:
                 class: AppBundle\EventListener\TokenListener
-                arguments: ["%tokens%"]
+                arguments: ['%tokens%']
                 tags:
                     - { name: kernel.event_listener, event: kernel.controller, method: onKernelController }
                     - { name: kernel.event_listener, event: kernel.response, method: onKernelResponse }

cookbook/form/create_custom_field_type.rst

@@ -309,7 +309,7 @@ the ``genders`` parameter value as the first argument to its to-be-created
             app.form.type.gender:
                 class: AppBundle\Form\Type\GenderType
                 arguments:
-                    - "%genders%"
+                    - '%genders%'
                 tags:
                     - { name: form.type, alias: gender }
 

cookbook/form/data_transformers.rst

@@ -383,7 +383,7 @@ it's recognized as a custom field type:
         services:
             app.type.issue_selector:
                 class: AppBundle\Form\IssueSelectorType
-                arguments: ["@doctrine.orm.entity_manager"]
+                arguments: ['@doctrine.orm.entity_manager']
                 tags:
                     - { name: form.type, alias: issue_selector }
 

cookbook/form/dynamic_form_modification.rst

@@ -386,7 +386,7 @@ it with :ref:`dic-tags-form-type`.
         services:
             app.form.friend_message:
                 class: AppBundle\Form\Type\FriendMessageFormType
-                arguments: ["@security.token_storage"]
+                arguments: ['@security.token_storage']
                 tags:
                     - { name: form.type, alias: friend_message }