Merge branch '4.0'

* 4.0:
  Update json_login_setup.rst
  Fixed small typo mistake

Author: javiereguiluz

components/config/resources.rst

@@ -22,7 +22,7 @@ files. This can be done with the :class:`Symfony\\Component\\Config\\FileLocator
     $configDirectories = array(__DIR__.'/config');
 
     $fileLocator = new FileLocator($configDirectories);
-    $yamlUserFiles = $locator->locate('users.yaml', null, false);
+    $yamlUserFiles = $fileLocator->locate('users.yaml', null, false);
 
 The locator receives a collection of locations where it should look for
 files. The first argument of ``locate()`` is the name of the file to look

components/options_resolver.rst

@@ -326,7 +326,7 @@ correctly. To validate the types of the options, call
 
             // check all items in an array recursively for a type
             $resolver->setAllowedTypes('dates', 'DateTime[]');
-            $resolver->setAllowedtypes('ports', 'int[]');
+            $resolver->setAllowedTypes('ports', 'int[]');
         }
     }
 

security/json_login_setup.rst

@@ -69,6 +69,7 @@ path:
         // src/Controller/SecurityController.php
 
         // ...
+        use Symfony\Bundle\FrameworkBundle\Controller\Controller;
         use Symfony\Component\HttpFoundation\Request;
         use Symfony\Component\Routing\Annotation\Route;