Skip to content

Commit 2780701

Browse files
committed
Merge branch '4.4' into 5.0
* 4.4: minor Move method and class Use the get method instead of using the array
2 parents 4e09a0b + 56c7b40 commit 2780701

File tree

9 files changed

+13
-13
lines changed

9 files changed

+13
-13
lines changed

components/console/helpers/progressbar.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ you can also set the current progress by calling the
5050

5151
If your platform doesn't support ANSI codes, updates to the progress
5252
bar are added as new lines. To prevent the output from being flooded,
53-
use the method :method:`Symfony\\Component\\Console\\Helper\\ProgressBar::minSecondsBetweenRedraws`
54-
to limit the number of redraws and the method
55-
:method:`Symfony\\Component\\Console\\Helper\\ProgressBar::setRedrawFrequency`
53+
use the :method:`Symfony\\Component\\Console\\Helper\\ProgressBar::minSecondsBetweenRedraws`
54+
method to limit the number of redraws and the
55+
:method:`Symfony\\Component\\Console\\Helper\\ProgressBar::setRedrawFrequency` method
5656
to redraw every N iterations. By default, redraw frequency is
5757
**100ms** or **10%** of your ``max``.
5858

components/console/single_command_tool.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ it is possible to remove this need by declaring a single command application::
2929
->setDefaultCommand('echo', true) // Single command application
3030
->run();
3131

32-
The method :method:`Symfony\\Component\\Console\\Application::setDefaultCommand`
32+
The :method:`Symfony\\Component\\Console\\Application::setDefaultCommand` method
3333
accepts a boolean as second parameter. If true, the command ``echo`` will then
3434
always be used, without having to pass its name.
3535

components/options_resolver.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ been set::
285285
}
286286
}
287287

288-
The method :method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::getMissingOptions`
288+
The :method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::getMissingOptions` method
289289
lets you access the names of all missing options.
290290

291291
Type Validation

components/routing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Routing System Setup
3131
A routing system has three parts:
3232

3333
* A :class:`Symfony\\Component\\Routing\\RouteCollection`, which contains the
34-
route definitions (instances of the class :class:`Symfony\\Component\\Routing\\Route`);
34+
route definitions (instances of the :class:`Symfony\\Component\\Routing\\Route` class);
3535
* A :class:`Symfony\\Component\\Routing\\RequestContext`, which has information
3636
about the request;
3737
* A :class:`Symfony\\Component\\Routing\\Matcher\\UrlMatcher`, which performs

components/security/authentication.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ Authentication Providers
100100

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

controller/upload_file.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ Finally, you need to update the code of the controller that handles the form::
143143

144144
if ($form->isSubmitted() && $form->isValid()) {
145145
/** @var UploadedFile $brochureFile */
146-
$brochureFile = $form['brochure']->getData();
146+
$brochureFile = $form->get('brochure')->getData();
147147

148148
// this condition is needed because the 'brochure' field is not required
149149
// so the PDF file must be processed only when a file is uploaded

reference/constraints/File.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ Validates that a value is a valid "file", which can be one of the following:
66
* A string (or object with a ``__toString()`` method) path to an existing
77
file;
88
* A valid :class:`Symfony\\Component\\HttpFoundation\\File\\File` object
9-
(including objects of class :class:`Symfony\\Component\\HttpFoundation\\File\\UploadedFile`).
9+
(including objects of :class:`Symfony\\Component\\HttpFoundation\\File\\UploadedFile` class).
1010

11-
This constraint is commonly used in forms with the :doc:`FileType </reference/forms/types/file>`
11+
This constraint is commonly used in forms with the :doc:`FileType <reference/forms/types/file>`
1212
form field.
1313

1414
.. tip::

validation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ on the ``validator`` service (which implements :class:`Symfony\\Component\\Valid
127127
The job of the ``validator`` is to read the constraints (i.e. rules)
128128
of a class and verify if the data on the object satisfies those
129129
constraints. If validation fails, a non-empty list of errors
130-
(class :class:`Symfony\\Component\\Validator\\ConstraintViolationList`) is
130+
(:class:`Symfony\\Component\\Validator\\ConstraintViolationList` class) is
131131
returned. Take this simple example from inside a controller::
132132

133133
// ...

workflow.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ This means that each event has access to the following information:
438438
:method:`Symfony\\Component\\Workflow\\Event\\Event::getMetadata`
439439
Returns a metadata.
440440

441-
For Guard Events, there is an extended class :class:`Symfony\\Component\\Workflow\\Event\\GuardEvent`.
441+
For Guard Events, there is an extended :class:`Symfony\\Component\\Workflow\\Event\\GuardEvent` class.
442442
This class has two more methods:
443443

444444
:method:`Symfony\\Component\\Workflow\\Event\\GuardEvent::isBlocked`

0 commit comments

Comments
 (0)