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

Author: javiereguiluz

_build/redirection_map

@@ -77,13 +77,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
@@ -152,7 +159,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
@@ -183,10 +191,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
@@ -281,6 +289,7 @@
 /components/class_loader/index /components/class_loader
 /components/config/introduction /components/config
 /components/config/index /components/config
+/components/console/helpers/tablehelper /components/console/helpers/table
 /components/console/introduction /components/console
 /components/console/index /components/console
 /components/debug/class_loader /components/debug
@@ -311,7 +320,8 @@
 /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 /request/load_balancer_reverse_proxy
+/request/load_balancer_reverse_proxy /deployment/proxies
+/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
@@ -341,3 +351,4 @@
 /templating/templating_service /templates
 /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

@@ -1,5 +1,5 @@
 .. caution::
 
     Starting from Symfony 2.8, Assetic is no longer included by default in the
-    Symfony Standard Edition. Refer to :doc:`this article </assetic/asset_management>`
+    Symfony Standard Edition. Refer to :doc:`this article </frontend/assetic/asset_management>`
     to learn how to install and enable Assetic in your Symfony application.

assetic/_standard_edition_warning.rst.inc

@@ -51,7 +51,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:
@@ -89,8 +89,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

@@ -174,7 +174,7 @@ Or you may define a prototype for each node inside an array node::
     $rootNode
         ->children()
             ->arrayNode('connections')
-                ->prototype('array')
+                ->arrayPrototype()
                     ->children()
                         ->scalarNode('driver')->end()
                         ->scalarNode('host')->end()
@@ -186,6 +186,12 @@ Or you may define a prototype for each node inside an array node::
         ->end()
     ;
 
+.. versionadded:: 3.3
+    The ``arrayPrototype()`` method (and the related ``booleanPrototype()``
+    ``integerPrototype()``, ``floatPrototype()``, ``scalarPrototype()`` and
+    ``enumPrototype()``) was introduced in Symfony 3.3. In previous versions,
+    you needed to use ``prototype('array')``, ``prototype('boolean')``, etc.
+
 A prototype can be used to add a definition which may be repeated many times
 inside the current node. According to the prototype definition in the example
 above, it is possible to have multiple connection arrays (containing a ``driver``,
@@ -229,7 +235,7 @@ A basic prototyped array configuration can be defined as follows::
         ->fixXmlConfig('driver')
         ->children()
             ->arrayNode('drivers')
-                ->prototype('scalar')->end()
+                ->scalarPrototype()->end()
             ->end()
         ->end()
     ;
@@ -260,7 +266,7 @@ A more complex example would be to define a prototyped array with children::
         ->fixXmlConfig('connection')
         ->children()
             ->arrayNode('connections')
-                ->prototype('array')
+                ->arrayPrototype()
                     ->children()
                         ->scalarNode('table')->end()
                         ->scalarNode('user')->end()
@@ -334,7 +340,7 @@ In order to maintain the array keys use the ``useAttributeAsKey()`` method::
         ->children()
             ->arrayNode('connections')
                 ->useAttributeAsKey('name')
-                ->prototype('array')
+                ->arrayPrototype()
                     ->children()
                         ->scalarNode('table')->end()
                         ->scalarNode('user')->end()
@@ -549,7 +555,7 @@ tree with ``append()``::
             ->isRequired()
             ->requiresAtLeastOneElement()
             ->useAttributeAsKey('name')
-            ->prototype('array')
+            ->arrayPrototype
                 ->children()
                     ->scalarNode('value')->isRequired()->end()
                 ->end()
@@ -647,7 +653,7 @@ with ``fixXmlConfig()``::
         ->fixXmlConfig('extension')
         ->children()
             ->arrayNode('extensions')
-                ->prototype('scalar')->end()
+                ->scalarPrototype()->end()
             ->end()
         ->end()
     ;

components/config/definition.rst

@@ -14,7 +14,6 @@ The Console Helpers
     progresshelper
     questionhelper
     table
-    tablehelper
     debug_formatter
 
 The Console component comes with some useful helpers. These helpers contain

components/console/helpers/index.rst

@@ -169,6 +169,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);
@@ -188,6 +190,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);
@@ -244,6 +248,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
@@ -275,6 +281,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

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