Merge remote-tracking branch 'upstream/2.7' into 2.7

Author: javiereguiluz

_build/redirection_map

@@ -76,13 +76,20 @@
 /book/configuration /configuration
 /book/propel /propel/propel
 /book/performance /performance
-/cookbook/assetic/apply_to_option /assetic/apply_to_option
-/cookbook/assetic/asset_management /assetic/asset_management
-/cookbook/assetic/index /assetic
-/cookbook/assetic/jpeg_optimize /assetic/jpeg_optimize
-/cookbook/assetic/php /assetic/php
-/cookbook/assetic/uglifyjs /assetic/uglifyjs
-/cookbook/assetic/yuicompressor /assetic/yuicompressor
+/cookbook/assetic/apply_to_option /frontend/assetic/apply_to_option
+/cookbook/assetic/asset_management /frontend/assetic/asset_management
+/cookbook/assetic/index /frontend/assetic
+/cookbook/assetic/jpeg_optimize /frontend/assetic/jpeg_optimize
+/cookbook/assetic/php /frontend/assetic/php
+/cookbook/assetic/uglifyjs /frontend/assetic/uglifyjs
+/cookbook/assetic/yuicompressor /frontend/assetic/yuicompressor
+/assetic /frontend/assetic
+/assetic/apply_to_option /frontend/assetic/apply_to_option
+/assetic/asset_management /frontend/assetic/asset_management
+/assetic/jpeg_optimize /frontend/assetic/jpeg_optimize
+/assetic/php /frontend/assetic/php
+/assetic/uglifyjs /frontend/assetic/uglifyjs
+/assetic/yuicompressor /frontend/assetic/yuicompressor
 /cookbook/bundles/best_practices /bundles/best_practices
 /cookbook/bundles/configuration /bundles/configuration
 /cookbook/bundles/extension /bundles/extension
@@ -150,7 +157,8 @@
 /cookbook/event_dispatcher/event_listener /event_dispatcher
 /cookbook/event_dispatcher/index /event_dispatcher
 /cookbook/event_dispatcher/method_behavior /event_dispatcher/method_behavior
-/cookbook/expressions /expressions/expressions
+/cookbook/expressions /security/expressions
+/expressions /security/expressions
 /cookbook/form/create_custom_field_type /form/create_custom_field_type
 /cookbook/form/create_form_type_extension /form/create_form_type_extension
 /cookbook/form/data_transformers /form/data_transformers
@@ -181,10 +189,10 @@
 /cookbook/profiler/matchers /profiler/matchers
 /cookbook/profiler/profiling_data /profiler/profiling_data
 /cookbook/profiler/storage /profiler/storage
-/cookbook/psr7 /request/psr7
+/cookbook/psr7 /components/psr7
 /cookbook/request/index /request
-/cookbook/request/load_balancer_reverse_proxy /request/load_balancer_reverse_proxy
-/cookbook/request/mime_type /request/mime_type
+/cookbook/request/load_balancer_reverse_proxy /deployment/proxies
+/cookbook/request/mime_type /reference/configuration/framework#formats
 /cookbook/routing/conditions /routing/conditions
 /cookbook/routing/custom_route_loader /routing/custom_route_loader
 /cookbook/routing/debug /routing/debug
@@ -303,6 +311,7 @@
 /components/form/type_guesser /form/type_guesser
 /components/http_foundation/index /components/http_foundation
 /components/http_foundation/introduction /components/http_foundation
+/components/http_foundation/trusting_proxies /deployment/proxies
 /components/http_kernel/introduction /components/http_kernel
 /components/http_kernel/index /components/http_kernel
 /components/property_access/introduction /components/property_access
@@ -327,3 +336,4 @@
 /form /forms
 /testing/simulating_authentication /testing/http_authentication
 /validation/group_service_resolver /form/validation_group_service_resolver
+/request/load_balancer_reverse_proxy /deployment/proxies

_images/form/simple-form.png

@@ -49,7 +49,7 @@ tools like GruntJS.
     Use Assetic to compile, combine and minimize web assets, unless you're
     comfortable with frontend tools like GruntJS.
 
-:doc:`Assetic </assetic/asset_management>` is an asset manager capable
+:doc:`Assetic </frontend/assetic/asset_management>` is an asset manager capable
 of compiling assets developed with a lot of different frontend technologies
 like LESS, Sass and CoffeeScript. Combining all your assets with Assetic is a
 matter of wrapping all the assets with a single Twig tag:
@@ -87,8 +87,8 @@ Learn More about Assetic
 ------------------------
 
 Assetic can also minimize CSS and JavaScript assets
-:doc:`using UglifyCSS/UglifyJS </assetic/uglifyjs>` to speed up your
-websites. You can even :doc:`compress images </assetic/jpeg_optimize>`
+:doc:`using UglifyCSS/UglifyJS </frontend/assetic/uglifyjs>` to speed up your
+websites. You can even :doc:`compress images </frontend/assetic/jpeg_optimize>`
 with Assetic to reduce their size before serving them to the user. Check out
 the `official Assetic documentation`_ to learn more about all the available
 features.

best_practices/web-assets.rst

@@ -115,23 +115,23 @@ files are going to be part of the repository.
 The following classes and files have specific emplacements (some are mandatory
 and others are just conventions followed by most developers):
 
-===============================  =============================  ================
-Type                             Directory                      Mandatory?
-===============================  =============================  ================
-Commands                         ``Command/``                   Yes
-Controllers                      ``Controller/``                No
-Service Container Extensions     ``DependencyInjection/``       Yes
-Event Listeners                  ``EventListener/``             No
-Model classes [1]                ``Model/``                     No
-Configuration                    ``Resources/config/``          No
-Web Resources (CSS, JS, images)  ``Resources/public/``          Yes
-Translation files                ``Resources/translations/``    Yes
-Templates                        ``Resources/views/``           Yes
-Unit and Functional Tests        ``Tests/``                     No
-===============================  =============================  ================
-
-[1] See :doc:`/doctrine/mapping_model_classes` for how to handle the
-mapping with a compiler pass.
+===================================================  ========================================
+Type                                                 Directory                               
+===================================================  ========================================
+Commands                                             ``Command/``                            
+Controllers                                          ``Controller/``                         
+Service Container Extensions                         ``DependencyInjection/``                
+Doctrine ORM entities (when not using annotations)   ``Entity/``
+Doctrine ODM documents (when not using annotations)  ``Document/``
+Event Listeners                                      ``EventListener/``                      
+Configuration                                        ``Resources/config/``                   
+Web Resources (CSS, JS, images)                      ``Resources/public/``                   
+Translation files                                    ``Resources/translations/``     
+Validation (when not using annotations)              ``Resources/config/validation/``
+Serialization (when not using annotations)           ``Resources/config/serialization/``
+Templates                                            ``Resources/views/``                    
+Unit and Functional Tests                            ``Tests/``                              
+===================================================  ========================================
 
 Classes
 -------

bundles/best_practices.rst

@@ -173,6 +173,8 @@ will be autocompleted as the user types::
     public function execute(InputInterface $input, OutputInterface $output)
     {
         // ...
+        $helper = $this->getHelper('question');
+        
         $bundles = array('AcmeDemoBundle', 'AcmeBlogBundle', 'AcmeStoreBundle');
         $question = new Question('Please enter the name of a bundle', 'FooBundle');
         $question->setAutocompleterValues($bundles);
@@ -192,6 +194,8 @@ convenient for passwords::
     public function execute(InputInterface $input, OutputInterface $output)
     {
         // ...
+        $helper = $this->getHelper('question');
+        
         $question = new Question('What is the database password?');
         $question->setHidden(true);
         $question->setHiddenFallback(false);
@@ -225,6 +229,8 @@ method::
     public function execute(InputInterface $input, OutputInterface $output)
     {
         // ...
+        $helper = $this->getHelper('question');
+        
         $question = new Question('Please enter the name of the bundle', 'AppBundle');
         $question->setNormalizer(function ($value) {
             // $value can be null here
@@ -256,6 +262,8 @@ method::
     public function execute(InputInterface $input, OutputInterface $output)
     {
         // ...
+        $helper = $this->getHelper('question');
+
         $question = new Question('Please enter the name of the bundle', 'AcmeDemoBundle');
         $question->setValidator(function ($answer) {
             if (!is_string($answer) || 'Bundle' !== substr($answer, -6)) {

components/console/helpers/questionhelper.rst

@@ -119,7 +119,6 @@ Learn More
     :maxdepth: 1
     :glob:
 
-    /expressions
     /components/expression_language/*
     /service_container/expression_language
     /reference/constraints/Expression

components/expression_language.rst

@@ -611,7 +611,6 @@ Learn More
     /components/http_foundation/*
     /controller
     /controller/*
-    /request/*
     /session/*
     /http_cache/*
 

components/http_foundation.rst

@@ -7,7 +7,7 @@ Trusting Proxies
 .. tip::
 
     If you're using the Symfony Framework, start by reading
-    :doc:`/request/load_balancer_reverse_proxy`.
+    :doc:`/deployment/proxies`.
 
 If you find yourself behind some sort of proxy - like a load balancer - then
 certain header information may be sent to you using special ``X-Forwarded-*``

components/http_foundation/trusting_proxies.rst

@@ -13,7 +13,7 @@ Installation
 
 You can install the component in 2 different ways:
 
-* :doc:`Install it via Composer </components/using_components>` (`symfony/psr-http-message-bridge on Packagist <https://packagist.org/packages/symfony/psr-http-message-bridge>`_);
+* :doc:`Install it via Composer </components/using_components>` (`symfony/psr-http-message-bridge on Packagist`_);
 * Use the official Git repository (https://github.com/symfony/psr-http-message-bridge).
 
 The bridge also needs a PSR-7 implementation to allow converting HttpFoundation
@@ -87,3 +87,4 @@ to a :class:`Symfony\\Component\\HttpFoundation\\Response` instance::
 
 .. _`PSR-7`: http://www.php-fig.org/psr/psr-7/
 .. _`Zend Diactoros`: https://github.com/zendframework/zend-diactoros
+.. _`symfony/psr-http-message-bridge on Packagist`: https://packagist.org/packages/symfony/psr-http-message-bridge

request/psr7.rst renamed to components/psr7.rst

@@ -181,7 +181,7 @@ Symfony's classes:
 Type of Change                                      Change Allowed
 ==================================================  ==============
 Remove entirely                                     No
-Make final                                          No
+Make final                                          No [6]_
 Make abstract                                       No
 Change name or namespace                            No
 Change parent class                                 Yes [4]_
@@ -194,8 +194,8 @@ Reduce visibility                                   No
 Move to parent class                                Yes
 **Protected Properties**
 Add protected property                              Yes
-Remove protected property                           No
-Reduce visibility                                   No
+Remove protected property                           No [7]_
+Reduce visibility                                   No [7]_
 Move to parent class                                Yes
 **Private Properties**
 Add private property                                Yes
@@ -204,7 +204,7 @@ Remove private property                             Yes
 Add constructor without mandatory arguments         Yes [1]_
 Remove constructor                                  No
 Reduce visibility of a public constructor           No
-Reduce visibility of a protected constructor        No
+Reduce visibility of a protected constructor        No [7]_
 Move to parent class                                Yes
 **Public Methods**
 Add public method                                   Yes
@@ -213,29 +213,29 @@ Change name                                         No
 Reduce visibility                                   No
 Move to parent class                                Yes
 Add argument without a default value                No
-Add argument with a default value                   No
+Add argument with a default value                   No [7]_ [8]_
 Remove argument                                     Yes [3]_
-Add default value to an argument                    No
+Add default value to an argument                    No [7]_ [8]_
 Remove default value of an argument                 No
-Add type hint to an argument                        No
-Remove type hint of an argument                     No
-Change argument type                                No
-Change return type                                  No
+Add type hint to an argument                        No [7]_ [8]_
+Remove type hint of an argument                     No [7]_ [8]_
+Change argument type                                No [7]_ [8]_
+Change return type                                  No [7]_ [8]_
 **Protected Methods**
 Add protected method                                Yes
-Remove protected method                             No
-Change name                                         No
-Reduce visibility                                   No
+Remove protected method                             No [7]_
+Change name                                         No [7]_
+Reduce visibility                                   No [7]_
 Move to parent class                                Yes
-Add argument without a default value                No
-Add argument with a default value                   No
+Add argument without a default value                No [7]_
+Add argument with a default value                   No [7]_ [8]_
 Remove argument                                     Yes [3]_
-Add default value to an argument                    No
-Remove default value of an argument                 No
-Add type hint to an argument                        No
-Remove type hint of an argument                     No
-Change argument type                                No
-Change return type                                  No
+Add default value to an argument                    No [7]_ [8]_
+Remove default value of an argument                 No [7]_
+Add type hint to an argument                        No [7]_ [8]_
+Remove type hint of an argument                     No [7]_ [8]_
+Change argument type                                No [7]_ [8]_
+Change return type                                  No [7]_ [8]_
 **Private Methods**
 Add private method                                  Yes
 Remove private method                               Yes
@@ -250,7 +250,7 @@ Remove type hint of an argument                     Yes
 Change argument type                                Yes
 Change return type                                  Yes
 **Static Methods**
-Turn non static into static                         No
+Turn non static into static                         No [7]_ [8]_
 Turn static into non static                         No
 **Constants**
 Add constant                                        Yes
@@ -277,6 +277,20 @@ Change value of a constant                          Yes [1]_ [5]_
        Additionally, if a constant will likely be used in objects that are
        serialized, the value of a constant should not be changed.
 
+.. [6] Allowed using the ``@final`` annotation.
+
+.. [7] Allowed if the class is final. Classes that received the ``@final``
+       annotation after their first release are considered final in their
+       next major version.
+       Changing an argument type is only possible with a parent type.
+       Changing a return type is only possible with a child type.
+
+.. [8] Allowed if the method is final. Methods that received the ``@final``
+       annotation after their first release are considered final in their
+       next major version.
+       Changing an argument type is only possible with a parent type.
+       Changing a return type is only possible with a child type.
+
 .. _Semantic Versioning: http://semver.org/
 .. _scalar type: http://php.net/manual/en/function.is-scalar.php
 .. _boolean values: http://php.net/manual/en/function.boolval.php