Merge branch '3.3' into 3.4

* 3.3:
  fix web_profiler full default conf
  set allow_if_all_abstain to false
  Add missing allow_if_all_abstain parameter
  Explained how to build multiple configurations
  Fixed the import in the PHP Array Cache adapter article
  Update grammar mistake
  Mentioned how to override each children of a choice type
  Reworded and improved the routing/external_resources article
  Documented how to load routes from objects/services

Author: javiereguiluz

controller/service.rst

@@ -91,7 +91,7 @@ Alternatives to base Controller Methods
 When using a controller defined as a service, you can still extend any of the
 :ref:`normal base controller <the-base-controller-class-services>` classes and
 use their shortcuts. But, you don't need to! You can choose to extend *nothing*,
-and use dependency injection to access difference services.
+and use dependency injection to access different services.
 
 The base `Controller class source code`_ is a great way to see how to accomplish
 common tasks. For example, ``$this->render()`` is usually used to render a Twig

form/create_custom_field_type.rst

@@ -156,6 +156,14 @@ link for details), create a ``shipping_widget`` block to handle this:
             <?php echo $view['form']->renderBlock('choice_widget') ?>
         <?php endif ?>
 
+.. tip::
+
+    You can further customize the template used to render each children of the
+    choice type. The block to override in that case is named "block name" +
+    ``_entry`` + "element name" (``label``, ``errors`` or ``widget``) (e.g. to
+    customize the labels of the children of the Shipping widget you'd need to
+    define ``{% block shipping_entry_label %} ... {% endblock %}``).
+
 .. note::
 
     Make sure the correct widget prefix is used. In this example the name should

frontend/encore/advanced-config.rst

@@ -40,5 +40,48 @@ But be careful not to accidentally override any config from Encore:
     // BAD - this replaces any extensions added by Encore
     // config.resolve.extensions = ['json'];
 
+Defining Multiple Webpack Configurations
+----------------------------------------
+
+Webpack supports passing an `array of configurations`_, which are processed in
+parallel. Webpack Encore includes a ``reset()`` object allowing to reset the
+state of the current configuration to build a new one:
+
+.. code-block:: javascript
+
+    // define the first configuration
+    Encore
+        .setOutputPath('web/build/')
+        .setPublicPath('/build')
+        .addEntry('app', './assets/js/main.js')
+        .addStyleEntry('global', './assets/css/global.scss')
+        .enableSassLoader()
+        .autoProvidejQuery()
+        .enableSourceMaps(!Encore.isProduction())
+    ;
+
+    // build the first configuration
+    const firstConfig = Encore.getWebpackConfig();
+
+    // reset Encore to build the second config
+    Encore.reset();
+
+    // define the second configuration
+    Encore
+        .setOutputPath('web/build/')
+        .setPublicPath('/build')
+        .addEntry('mobile', './assets/js/mobile.js')
+        .addStyleEntry('mobile', './assets/css/mobile.less')
+        .enableLessLoader()
+        .enableSourceMaps(!Encore.isProduction())
+    ;
+
+    // build the second configuration
+    const secondConfig = Encore.getWebpackConfig();
+
+    // export the final configuration as an array of multiple configurations
+    module.exports = [firstConfig, secondConfig];
+
 .. _`configuration options`: https://webpack.js.org/configuration/
 .. _`Webpack's watchOptions`: https://webpack.js.org/configuration/watch/#watchoptions
+.. _`array of configurations`: https://github.com/webpack/docs/wiki/configuration#multiple-configurations

reference/configuration/web_profiler.rst

@@ -84,7 +84,7 @@ Full Default Configuration
         web_profiler:
             toolbar:              false
             intercept_redirects:  false
-            excluded_ajax_paths:  ^/bundles|^/_wdt
+            excluded_ajax_paths:  ^/(app(_[\\w]+)?\\.php/)?_wdt
 
             # DEPRECATED, it can be removed safely from your configuration
             position:             bottom
@@ -108,6 +108,6 @@ Full Default Configuration
                 toolbar="false"
                 verbose="true"
                 intercept-redirects="false"
-                excluded-ajax-paths="^/bundles|^/_wdt"
+                excluded-ajax-paths="^/(app(_[\\w]+)?\\.php/)?_wdt"
             />
         </container>

routing/custom_route_loader.rst

@@ -59,6 +59,57 @@ containing :class:`Symfony\\Component\\Routing\\Route` objects.
     when they are defined in one of the default formats (e.g. XML, YML,
     PHP file).
 
+Loading Routes with a Custom Service
+------------------------------------
+
+.. versionadded:: 2.8
+    The option to load routes using Symfony services was introduced in Symfony 2.8.
+
+Using a regular Symfony service is the simplest way to load routes in a
+customized way. It's much easier than creating a full custom route loader, so
+you should always consider this option first.
+
+To do so, define ``type: service`` as the type of the loaded routing resource
+and configure the service and method to call:
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        # app/config/routing.yml
+        admin_routes:
+            resource: 'admin_route_loader:loadRoutes'
+            type: service
+
+    .. code-block:: xml
+
+        <!-- app/config/routing.xml -->
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <routes xmlns="http://symfony.com/schema/routing"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://symfony.com/schema/routing
+                http://symfony.com/schema/routing/routing-1.0.xsd">
+
+            <import resource="admin_route_loader:loadRoutes" type="service"/>
+        </routes>
+
+    .. code-block:: php
+
+        // app/config/routing.php
+        use Symfony\Component\Routing\RouteCollection;
+
+        $collection = new RouteCollection();
+        $collection->addCollection(
+            $loader->import("admin_route_loader:loadRoutes", "service")
+        );
+
+        return $collection;
+
+In this example, the routes are loaded by calling the ``loadRoutes()`` method of
+the service whose ID is ``admin_route_loader``. Your service doesn't have to
+extend or implement any special class, but the called method must return a
+:class:`Symfony\\Component\\Routing\\RouteCollection` object.
+
 Creating a custom Loader
 ------------------------
 

routing/external_resources.rst

@@ -4,19 +4,37 @@
 How to Include External Routing Resources
 =========================================
 
-All routes are loaded via a single configuration file - usually ``app/config/routing.yml``
-(see :ref:`routing-creating-routes`). However, if you use routing annotations,
-you'll need to point the router to the controllers with the annotations.
-This can be done by "importing" directories into the routing configuration:
+Simple applications can define all their routes in a single configuration file -
+usually ``app/config/routing.yml`` (see :ref:`routing-creating-routes`).
+However, in most applications it's common to import routes definitions from
+different resources: PHP annotations in controller files, YAML or XML files
+stored in some directory, etc.
+
+This can be done by importing routing resources from the main routing file:
 
 .. configuration-block::
 
     .. code-block:: yaml
 
         # app/config/routing.yml
-        app:
+        app_file:
+            # loads routes from the given routing file stored in some bundle
+            resource: '@AcmeOtherBundle/Resources/config/routing.yml'
+
+        app_annotations:
+            # loads routes from the PHP annotations of the controllers found in that directory
             resource: '@AppBundle/Controller/'
-            type:     annotation # required to enable the Annotation reader for this resource
+            type:     annotation
+
+        app_directory:
+            # loads routes from the YAML or XML files found in that directory
+            resource: '../legacy/routing/'
+            type:     directory
+
+        app_bundle:
+            # loads routes from the YAML or XML files found in some bundle directory
+            resource: '@AppBundle/Resources/config/routing/public/'
+            type:     directory
 
     .. code-block:: xml
 
@@ -27,8 +45,17 @@ This can be done by "importing" directories into the routing configuration:
             xsi:schemaLocation="http://symfony.com/schema/routing
                 http://symfony.com/schema/routing/routing-1.0.xsd">
 
-            <!-- the type is required to enable the annotation reader for this resource -->
-            <import resource="@AppBundle/Controller/" type="annotation"/>
+            <!-- loads routes from the given routing file stored in some bundle -->
+            <import resource="@AcmeOtherBundle/Resources/config/routing.yml" />
+
+            <!-- loads routes from the PHP annotations of the controllers found in that directory -->
+            <import resource="@AppBundle/Controller/" type="annotation" />
+
+            <!-- loads routes from the YAML or XML files found in that directory -->
+            <import resource="../legacy/routing/" type="directory" />
+
+            <!-- loads routes from the YAML or XML files found in some bundle directory -->
+            <import resource="@AppBundle/Resources/config/routing/public/" type="directory" />
         </routes>
 
     .. code-block:: php
@@ -38,60 +65,26 @@ This can be done by "importing" directories into the routing configuration:
 
         $collection = new RouteCollection();
         $collection->addCollection(
-            // second argument is the type, which is required to enable
-            // the annotation reader for this resource
+            // loads routes from the given routing file stored in some bundle
+            $loader->import("@AcmeOtherBundle/Resources/config/routing.yml")
+
+            // loads routes from the PHP annotations of the controllers found in that directory
             $loader->import("@AppBundle/Controller/", "annotation")
+
+            // loads routes from the YAML or XML files found in that directory
+            $loader->import("../legacy/routing/", "directory")
+
+            // loads routes from the YAML or XML files found in some bundle directory
+            $loader->import("@AppBundle/Resources/config/routing/public/", "directory")
         );
 
         return $collection;
 
 .. note::
 
-    When importing resources from YAML, the key (e.g. ``app``) is meaningless.
+    When importing resources from YAML, the key (e.g. ``app_file``) is meaningless.
     Just be sure that it's unique so no other lines override it.
 
-The ``resource`` key loads the given routing resource. In this example the
-resource is a directory, where the ``@AppBundle`` shortcut syntax resolves
-to the full path of the AppBundle. When pointing to a directory, all files
-in that directory are parsed and put into the routing.
-
-.. note::
-
-    You can also include other routing configuration files, this is often
-    used to import the routing of third party bundles:
-
-    .. configuration-block::
-
-        .. code-block:: yaml
-
-            # app/config/routing.yml
-            app:
-                resource: '@AcmeOtherBundle/Resources/config/routing.yml'
-
-        .. code-block:: xml
-
-            <!-- app/config/routing.xml -->
-            <?xml version="1.0" encoding="UTF-8" ?>
-            <routes xmlns="http://symfony.com/schema/routing"
-                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                xsi:schemaLocation="http://symfony.com/schema/routing
-                    http://symfony.com/schema/routing/routing-1.0.xsd">
-
-                <import resource="@AcmeOtherBundle/Resources/config/routing.xml" />
-            </routes>
-
-        .. code-block:: php
-
-            // app/config/routing.php
-            use Symfony\Component\Routing\RouteCollection;
-
-            $collection = new RouteCollection();
-            $collection->addCollection(
-                $loader->import("@AcmeOtherBundle/Resources/config/routing.php")
-            );
-
-            return $collection;
-
 Prefixing Imported Routes
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 

security/voters.rst

@@ -293,6 +293,7 @@ security configuration:
         security:
             access_decision_manager:
                 strategy: unanimous
+                allow_if_all_abstain: false
 
     .. code-block:: xml
 
@@ -306,7 +307,7 @@ security configuration:
         >
 
             <config>
-                <access-decision-manager strategy="unanimous" />
+                <access-decision-manager strategy="unanimous" allow-if-all-abstain="false"  />
             </config>
         </srv:container>
 
@@ -316,5 +317,6 @@ security configuration:
         $container->loadFromExtension('security', array(
             'access_decision_manager' => array(
                 'strategy' => 'unanimous',
+                'allow_if_all_abstain' => false,
             ),
         ));