Merge branch '3.4' into 4.1

* 3.4:
  fix the command output
  Fixed the logic of the custom password authenticator

Author: javiereguiluz

security/custom_password_authenticator.rst

@@ -68,29 +68,23 @@ the user::
                 }
             }
 
-            if ($isPasswordValid) {
-                $currentHour = date('G');
-                if ($currentHour < 14 || $currentHour > 16) {
-                    // CAUTION: this message will be returned to the client
-                    // (so don't put any un-trusted messages / error strings here)
-                    throw new CustomUserMessageAuthenticationException(
-                        'You can only log in between 2 and 4!',
-                        array(), // Message Data
-                        412 // HTTP 412 Precondition Failed
-                    );
-                }
-
-                return new UsernamePasswordToken(
-                    $user,
-                    $user->getPassword(),
-                    $providerKey,
-                    $user->getRoles()
+            $currentHour = date('G');
+            if ($currentHour < 14 || $currentHour > 16) {
+                // CAUTION: this message will be returned to the client
+                // (so don't put any un-trusted messages / error strings here)
+                throw new CustomUserMessageAuthenticationException(
+                    'You can only log in between 2 and 4!',
+                    array(), // Message Data
+                    412 // HTTP 412 Precondition Failed
                 );
             }
 
-            // CAUTION: this message will be returned to the client
-            // (so don't put any un-trusted messages / error strings here)
-            throw new CustomUserMessageAuthenticationException('Invalid username or password');
+            return new UsernamePasswordToken(
+                $user,
+                $user->getPassword(),
+                $providerKey,
+                $user->getRoles()
+            );
         }
 
         public function supportsToken(TokenInterface $token, $providerKey)

service_container.rst

@@ -50,16 +50,16 @@ What other services are available? Find out by running:
     $ php bin/console debug:autowiring
 
     # this is just a *small* sample of the output...
-    =============================================================== =====================================
-    Class/Interface Type                                            Alias Service ID
-    =============================================================== =====================================
-    ``Psr\Cache\CacheItemPoolInterface``                            alias for "cache.app.recorder"
-    ``Psr\Log\LoggerInterface``                                     alias for "monolog.logger"
-    ``Symfony\Component\EventDispatcher\EventDispatcherInterface``  alias for "debug.event_dispatcher"
-    ``Symfony\Component\HttpFoundation\RequestStack``               alias for "request_stack"
-    ``Symfony\Component\HttpFoundation\Session\SessionInterface``   alias for "session"
-    ``Symfony\Component\Routing\RouterInterface``                   alias for "router.default"
-    =============================================================== =====================================
+    ==========================================================  ==================================
+    Class/Interface Type                                        Alias Service ID
+    ==========================================================  ==================================
+    Psr\Cache\CacheItemPoolInterface                            alias for "cache.app.recorder"
+    Psr\Log\LoggerInterface                                     alias for "monolog.logger"
+    Symfony\Component\EventDispatcher\EventDispatcherInterface  alias for "debug.event_dispatcher"
+    Symfony\Component\HttpFoundation\RequestStack               alias for "request_stack"
+    Symfony\Component\HttpFoundation\Session\SessionInterface   alias for "session"
+    Symfony\Component\Routing\RouterInterface                   alias for "router.default"
+    ==========================================================  ==================================
 
 When you use these type-hints in your controller methods or inside your
 :ref:`own services <service-container-creating-service>`, Symfony will automatically