Merge branch '4.1'

javiereguiluz · javiereguiluz · commit b90b51e3a674 · 2018-10-25T08:51:25.000+02:00
* 4.1:
  Fixed a build issue
  supports() must return a boolean
  Clarifying that .env can be used on production
  fix the event subscriber code example
diff --git a/deployment.rst b/deployment.rst
@@ -125,16 +125,27 @@ B) Configure your Environment Variables
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Most Symfony applications read their configuration from environment variables.
-While developing locally, you'll usually store these in a ``.env`` file. But on
-production, instead of creating this file, you should set *real* environment variables.
+While developing locally, you'll usually store these in a ``.env`` file. On production,
+you have two options:
 
-How you set environment variables, depends on your setup: they can be set at the
-command line, in your Nginx configuration, or via other methods provided by your
-hosting service.
+1. Create "real" environment variables. How you set environment variables, depends
+   on your setup: they can be set at the command line, in your Nginx configuration,
+   or via other methods provided by your hosting service.
 
-At the very least you need to define the ``APP_ENV=prod`` environment variable
-to run the application in ``prod`` mode, but depending on your application you
-may need to define other env vars too.
+2. Or, create a ``.env`` file just like your local development (see note below)
+
+There is no significant advantage to either of the two options: use whatever is
+most natural in your hosting environment.
+
+.. note::
+
+    If you use the ``.env`` file on production, you may need to move your
+    ``symfony/dotenv`` dependency from ``require-dev`` to ``require`` in ``composer.json``:
+
+    .. code-block:: terminal
+
+        $ composer remove symfony/dotenv
+        $ composer require symfony/dotenv
 
 C) Install/Update your Vendors
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/security/guard_authentication.rst b/security/guard_authentication.rst
@@ -475,7 +475,7 @@ are two possible fixes:
         public function supports(Request $request)
         {
     +         // if there is already an authenticated user (likely due to the session)
-    +         // then return null and skip authentication: there is no need.
+    +         // then return false and skip authentication: there is no need.
     +         if ($this->security->getUser()) {
     +             return false;
     +         }
diff --git a/serializer.rst b/serializer.rst
@@ -217,6 +217,7 @@ take a look at how this bundle works.
     :maxdepth: 1
 
     serializer/custom_encoders
+    serializer/custom_normalizer
 
 .. _`APCu`: https://github.com/krakjoe/apcu
 .. _`ApiPlatform`: https://github.com/api-platform/core
diff --git a/session/locale_sticky_session.rst b/session/locale_sticky_session.rst
@@ -171,50 +171,14 @@ event::
                 $this->session->set('_locale', $user->getLocale());
             }
         }
-    }
-
-Then register the listener:
-
-.. configuration-block::
-
-    .. code-block:: yaml
-
-        # config/services.yaml
-        services:
-            App\EventListener\UserLocaleListener:
-                tags:
-                    - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin, priority: 15 }
-
-    .. 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="App\EventListener\UserLocaleListener">
-                    <tag name="kernel.event_listener"
-                        event="security.interactive_login"
-                        method="onInteractiveLogin" priority=15 />
-                </service>
-            </services>
-        </container>
 
-    .. code-block:: php
-
-        // config/services.php
-        use AppBundle\EventListener\UserLocaleListener;
-        use Symfony\Component\DependencyInjection\Reference;
-
-        $container
-            ->register(UserLocaleListener::class)
-            ->addTag(
-                'kernel.event_listener',
-                array('event' => 'security.interactive_login', 'method' => 'onInteractiveLogin', 'priority' => 15)
+        public static function getSubscribedEvents()
+        {
+            return array(
+                SecurityEvents::INTERACTIVE_LOGIN => 'onInteractiveLogin',
             );
+        }
+    }
 
 .. caution::
 

Original file line number	Diff line number	Diff line change
`@@ -475,7 +475,7 @@ are two possible fixes:`
`475`	`475`	`public function supports(Request $request)`
`476`	`476`	`{`
`477`	`477`	`+ // if there is already an authenticated user (likely due to the session)`
`478`		`- + // then return null and skip authentication: there is no need.`
	`478`	`+ + // then return false and skip authentication: there is no need.`
`479`	`479`	`+ if ($this->security->getUser()) {`
`480`	`480`	`+ return false;`
`481`	`481`	`+ }`