Merge branch '6.1' into 6.2

* 6.1:
  Use fourth argument of RoutingConfigurator instead of non-existent method
  Correcting bugs for provider and JSON login

Author: javiereguiluz

routing.rst

@@ -1427,9 +1427,14 @@ when importing the routes.
         use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
-            // use the optional fourth argument of import() to exclude some files
-            // or subdirectories when loading annotations
-            $routes->import('../../src/Controller/', 'annotation')
+            $routes->import(
+                    '../../src/Controller/',
+                    'annotation',
+                    false,
+                    // the optional fourth argument is used to exclude some files
+                    // or subdirectories when loading annotations
+                    '../../src/Controller/{DebugEmailController}.php'
+                )
                 // this is added to the beginning of all imported route URLs
                 ->prefix('/blog')
 
@@ -1442,9 +1447,6 @@ when importing the routes.
 
                 // these requirements are added to all imported routes
                 ->requirements(['_locale' => 'en|es|fr'])
-
-                // you can optionally exclude some files/subdirectories when loading annotations
-                ->exclude('../../src/Controller/{DebugEmailController}.php')
             ;
         };
 

security.rst

@@ -492,7 +492,8 @@ will be able to authenticate (e.g. login form, API token, etc).
                     security: false
                 main:
                     lazy: true
-                    provider: users_in_memory
+                    # provider that you set earlier inside providers
+                    provider: app_user_provider
 
                     # activate different ways to authenticate
                     # https://symfony.com/doc/current/security.html#firewalls-authentication