Merge branch '4.0'

javiereguiluz · javiereguiluz · commit 43fff9b643a7 · 2018-01-27T10:49:32.000+01:00
* 4.0: fix web_profiler full default conf set allow_if_all_abstain to false [#9132] some minor tweaks Mention that hassers are supported in GetSetMethodNormalizer Mention the website-skeleton in the getting started guide add an alias for the profiler service Fixed wrong variable name Fixed typos in monolog_console 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 Fix environment variable name Add a note about running Doctrine commands on Windows Update doctrine.rst Reworded and improved the routing/external_resources article Documented how to load routes from objects/services
diff --git a/configuration/environments.rst b/configuration/environments.rst
@@ -131,7 +131,7 @@ always run the application in the dev environment, independent of the
     argument to the ``Kernel`` constructor. This specifies if the application
     should run in "debug mode". Regardless of the environment, a Symfony
     application can be run with debug mode set to ``true`` or ``false``
-    (respectively ``1`` or ``0`` for the ``APP_ENV`` variable defined in
+    (respectively ``1`` or ``0`` for the ``APP_DEBUG`` variable defined in
     ``.env``). This affects many things in the application, such as displaying
     stacktraces on error pages or if cache files are dynamically rebuilt on
     each request.  Though not a requirement, debug mode is generally set to
diff --git a/controller/service.rst b/controller/service.rst
@@ -89,7 +89,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
diff --git a/doctrine.rst b/doctrine.rst
@@ -370,6 +370,9 @@ you can query the database directly:
 
     $ php bin/console doctrine:query:sql 'SELECT * FROM product'
 
+    # on Windows systems not using Powershell, run this command instead:
+    # php bin/console doctrine:query:sql "SELECT * FROM product"
+
 Take a look at the previous example in more detail:
 
 .. _doctrine-entity-manager:
diff --git a/form/create_custom_field_type.rst b/form/create_custom_field_type.rst
@@ -155,6 +155,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
diff --git a/frontend/encore/advanced-config.rst b/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
diff --git a/logging/monolog_console.rst b/logging/monolog_console.rst
@@ -35,6 +35,7 @@ current log level and the console verbosity.
 The example above could then be rewritten as::
 
     use Psr\Log\LoggerInterface;
+    use Symfony\Component\Console\Command\Command;
     use Symfony\Component\Console\Input\InputInterface;
     use Symfony\Component\Console\Output\OutputInterface;
     // ...
@@ -43,7 +44,7 @@ The example above could then be rewritten as::
     {
         private $logger;
 
-        public function __constructor(LoggerInterface $logger)
+        public function __construct(LoggerInterface $logger)
         {
             $this->logger = $logger;
         }
diff --git a/profiler/matchers.rst b/profiler/matchers.rst
@@ -29,3 +29,35 @@ class in your controllers to manage the profiler programmatically::
             // ...
         }
     }
+
+In order for the profiler to be injected into your controller you need to
+create an alias pointing to the existing ``profiler`` service:
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        # config/services.yaml
+        services:
+            Symfony\Component\HttpKernel\Profiler\Profiler: '@profiler'
+
+    .. code-block:: xml
+
+        <!-- config/services.xml -->
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+            <services>
+                <service id="Symfony\Component\HttpKernel\Profiler\Profiler" alias="profiler" />
+            </services>
+        </container>
+
+    .. code-block:: php
+
+        // config/services.php
+        use Symfony\Component\HttpKernel\Profiler\Profiler;
+
+        $container->setAlias(Profiler::class, 'profiler');
diff --git a/quick_tour/the_architecture.rst b/quick_tour/the_architecture.rst
@@ -298,7 +298,7 @@ Thanks to a new recipe installed by Flex, look at the ``.env`` file again:
     + DATABASE_URL=mysql://db_user:db_password@127.0.0.1:3306/db_name
     + ###< doctrine/doctrine-bundle ###
 
-The new ``DATBASE_URL`` environment variable was added *automatically* and is already
+The new ``DATABASE_URL`` environment variable was added *automatically* and is already
 referenced by the new ``doctrine.yaml`` configuration file. By combining environment
 variables and Flex, you're using industry best practices without any extra effort.
 
diff --git a/reference/configuration/web_profiler.rst b/reference/configuration/web_profiler.rst
@@ -62,7 +62,7 @@ Full Default Configuration
         web_profiler:
             toolbar:              false
             intercept_redirects:  false
-            excluded_ajax_paths:  ^/bundles|^/_wdt
+            excluded_ajax_paths:  ^/(app(_[\\w]+)?\\.php/)?_wdt
 
     .. code-block:: xml
 
@@ -79,6 +79,6 @@ Full Default Configuration
             <web-profiler:config
                 toolbar="false"
                 intercept-redirects="false"
-                excluded-ajax-paths="^/bundles|^/_wdt"
+                excluded-ajax-paths="^/(app(_[\\w]+)?\\.php/)?_wdt"
             />
         </container>
diff --git a/routing/custom_route_loader.rst b/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, YAML,
     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
 ------------------------
 
diff --git a/routing/external_resources.rst b/routing/external_resources.rst
@@ -4,19 +4,37 @@
 How to Include External Routing Resources
 =========================================
 
-All routes are loaded via a single configuration file - usually ``config/routes.yaml``
-(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 ``config/routes.yaml`` (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
 
         # config/routes.yaml
-        controllers:
-            resource: ../src/Controller/
-            type: annotation
+        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: '../src/Controller/'
+            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,7 +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">
 
-            <import resource="../src/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="../src/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
@@ -37,56 +65,26 @@ This can be done by "importing" directories into the routing configuration:
 
         $collection = new RouteCollection();
         $collection->addCollection(
+            // 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("../src/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. ``controllers``) 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 and all files in that directory are parsed and put into
-the routing.
-
-.. note::
-
-    You can also include other routing configuration files:
-
-    .. configuration-block::
-
-        .. code-block:: yaml
-
-            # config/routes.yaml
-            app:
-                resource: '@ThirdPartyBundle/Resources/config/routing.yaml'
-
-        .. code-block:: xml
-
-            <!-- config/routes.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="@ThirdPartyBundle/Resources/config/routing.xml" />
-            </routes>
-
-        .. code-block:: php
-
-            // config/routes.php
-            use Symfony\Component\Routing\RouteCollection;
-
-            $collection = new RouteCollection();
-            $collection->addCollection(
-                $loader->import("@ThirdPartyBundle/Resources/config/routing.php")
-            );
-
-            return $collection;
-
 Prefixing Imported Routes
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/security/voters.rst b/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,
             ),
         ));
diff --git a/serializer.rst b/serializer.rst
diff --git a/setup.rst b/setup.rst
diff --git a/setup/flex.rst b/setup/flex.rst

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ current log level and the console verbosity.`
`35`	`35`	`The example above could then be rewritten as::`
`36`	`36`
`37`	`37`	`use Psr\Log\LoggerInterface;`
	`38`	`+ use Symfony\Component\Console\Command\Command;`
`38`	`39`	`use Symfony\Component\Console\Input\InputInterface;`
`39`	`40`	`use Symfony\Component\Console\Output\OutputInterface;`
`40`	`41`	`// ...`
`@@ -43,7 +44,7 @@ The example above could then be rewritten as::`
`43`	`44`	`{`
`44`	`45`	`private $logger;`
`45`	`46`
`46`		`- public function __constructor(LoggerInterface $logger)`
	`47`	`+ public function __construct(LoggerInterface $logger)`
`47`	`48`	`{`
`48`	`49`	`$this->logger = $logger;`
`49`	`50`	`}`