Merge branch '3.4' into 4.3

* 3.4:
  Move method and class
  Use the get method instead of using the array

Author: OskarStark

components/console/single_command_tool.rst

@@ -29,7 +29,7 @@ it is possible to remove this need by declaring a single command application::
         ->setDefaultCommand('echo', true) // Single command application
         ->run();
 
-The method :method:`Symfony\\Component\\Console\\Application::setDefaultCommand`
+The :method:`Symfony\\Component\\Console\\Application::setDefaultCommand` method
 accepts a boolean as second parameter. If true, the command ``echo`` will then
 always be used, without having to pass its name.
 

components/options_resolver.rst

@@ -285,7 +285,7 @@ been set::
         }
     }
 
-The method :method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::getMissingOptions`
+The :method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::getMissingOptions` method
 lets you access the names of all missing options.
 
 Type Validation

components/routing.rst

@@ -31,7 +31,7 @@ Routing System Setup
 A routing system has three parts:
 
 * A :class:`Symfony\\Component\\Routing\\RouteCollection`, which contains the
-  route definitions (instances of the class :class:`Symfony\\Component\\Routing\\Route`);
+  route definitions (instances of the :class:`Symfony\\Component\\Routing\\Route` class);
 * A :class:`Symfony\\Component\\Routing\\RequestContext`, which has information
   about the request;
 * A :class:`Symfony\\Component\\Routing\\Matcher\\UrlMatcher`, which performs

components/security/authentication.rst

@@ -100,10 +100,10 @@ Authentication Providers
 
 Each provider (since it implements
 :class:`Symfony\\Component\\Security\\Core\\Authentication\\Provider\\AuthenticationProviderInterface`)
-has a method :method:`Symfony\\Component\\Security\\Core\\Authentication\\Provider\\AuthenticationProviderInterface::supports`
+has a :method:`Symfony\\Component\\Security\\Core\\Authentication\\Provider\\AuthenticationProviderInterface::supports` method
 by which the ``AuthenticationProviderManager``
 can determine if it supports the given token. If this is the case, the
-manager then calls the provider's method :method:`Symfony\\Component\\Security\\Core\\Authentication\\Provider\\AuthenticationProviderInterface::authenticate`.
+manager then calls the provider's :method:`Symfony\\Component\\Security\\Core\\Authentication\\Provider\\AuthenticationProviderInterface::authenticate` method.
 This method should return an authenticated token or throw an
 :class:`Symfony\\Component\\Security\\Core\\Exception\\AuthenticationException`
 (or any other exception extending it).

controller/upload_file.rst

@@ -143,7 +143,7 @@ Finally, you need to update the code of the controller that handles the form::
 
             if ($form->isSubmitted() && $form->isValid()) {
                 /** @var UploadedFile $brochureFile */
-                $brochureFile = $form['brochure']->getData();
+                $brochureFile = $form->get('brochure')->getData();
 
                 // this condition is needed because the 'brochure' field is not required
                 // so the PDF file must be processed only when a file is uploaded

reference/constraints/File.rst

@@ -6,9 +6,9 @@ Validates that a value is a valid "file", which can be one of the following:
 * A string (or object with a ``__toString()`` method) path to an existing
   file;
 * A valid :class:`Symfony\\Component\\HttpFoundation\\File\\File` object
-  (including objects of class :class:`Symfony\\Component\\HttpFoundation\\File\\UploadedFile`).
+  (including objects of :class:`Symfony\\Component\\HttpFoundation\\File\\UploadedFile` class).
 
-This constraint is commonly used in forms with the :doc:`FileType </reference/forms/types/file>`
+This constraint is commonly used in forms with the :doc:`FileType <reference/forms/types/file>`
 form field.
 
 .. tip::

validation.rst

@@ -127,7 +127,7 @@ on the ``validator`` service (which implements :class:`Symfony\\Component\\Valid
 The job of the ``validator`` is to read the constraints (i.e. rules)
 of a class and verify if the data on the object satisfies those
 constraints. If validation fails, a non-empty list of errors
-(class :class:`Symfony\\Component\\Validator\\ConstraintViolationList`) is
+(:class:`Symfony\\Component\\Validator\\ConstraintViolationList` class) is
 returned. Take this simple example from inside a controller::
 
     // ...

workflow.rst

@@ -443,7 +443,7 @@ This means that each event has access to the following information:
 :method:`Symfony\\Component\\Workflow\\Event\\Event::getMetadata`
     Returns a metadata.
 
-For Guard Events, there is an extended class :class:`Symfony\\Component\\Workflow\\Event\\GuardEvent`.
+For Guard Events, there is an extended :class:`Symfony\\Component\\Workflow\\Event\\GuardEvent` class.
 This class has two more methods:
 
 :method:`Symfony\\Component\\Workflow\\Event\\GuardEvent::isBlocked`