Skip to content

Commit

Permalink
Merge branch '4.4' into 5.0
Browse files Browse the repository at this point in the history
* 4.4:
  minor
  Move method and class
  Use the get method instead of using the array
  • Loading branch information
OskarStark committed Jan 16, 2020
2 parents 4e09a0b + 56c7b40 commit 2780701
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions components/console/helpers/progressbar.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ you can also set the current progress by calling the

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

Expand Down
2 changes: 1 addition & 1 deletion components/console/single_command_tool.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion components/options_resolver.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion components/routing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions components/security/authentication.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion controller/upload_file.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions reference/constraints/File.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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::
Expand Down
2 changes: 1 addition & 1 deletion validation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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::

// ...
Expand Down
2 changes: 1 addition & 1 deletion workflow.rst
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,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`
Expand Down

0 comments on commit 2780701

Please sign in to comment.