Merge branch '6.4' into 7.0

* 6.4:
  Update controller.rst
  Fix typo in bundles/extension.rst

Author: javiereguiluz

bundles/extension.rst

@@ -71,7 +71,7 @@ This is the traditional way of loading service definitions in bundles. For new
 bundles it's recommended to :ref:`load your services in the main bundle class <bundle-load-services-bundle-class>`,
 but the traditional way of creating an extension class still works.
 
-A depdendency injection extension is defined as a class that follows these
+A dependency injection extension is defined as a class that follows these
 conventions (later you'll learn how to skip them if needed):
 
 * It has to live in the ``DependencyInjection`` namespace of the bundle;

controller.rst

@@ -410,7 +410,7 @@ optional validation constraints::
 You can then use the :class:`Symfony\\Component\\HttpKernel\\Attribute\\MapQueryString`
 attribute in your controller::
 
-    use App\Model\UserDto;
+    use App\Model\UserDTO;
     use Symfony\Component\HttpFoundation\Response;
     use Symfony\Component\HttpKernel\Attribute\MapQueryString;
 
@@ -445,7 +445,7 @@ The default status code returned if the validation fails is 404.
 If you need a valid DTO even when the request query string is empty, set a
 default value for your controller arguments::
 
-    use App\Model\UserDto;
+    use App\Model\UserDTO;
     use Symfony\Component\HttpFoundation\Response;
     use Symfony\Component\HttpKernel\Attribute\MapQueryString;
 
@@ -479,7 +479,7 @@ In this case, it is also possible to directly map this payload to your DTO by
 using the :class:`Symfony\\Component\\HttpKernel\\Attribute\\MapRequestPayload`
 attribute::
 
-    use App\Model\UserDto;
+    use App\Model\UserDTO;
     use Symfony\Component\HttpFoundation\Response;
     use Symfony\Component\HttpKernel\Attribute\MapRequestPayload;