Skip to content

Commit aab5c94

Browse files
committed
Merge branch '2.8' into 3.3
2 parents ab9e665 + 51e7b68 commit aab5c94

File tree

5 files changed

+5
-6
lines changed

5 files changed

+5
-6
lines changed

configuration/micro_kernel_trait.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ that define your bundles, your services and your routes:
104104
``RouteCollectionBuilder`` has methods that make adding routes in PHP more
105105
fun. You can also load external routing files (shown below).
106106

107-
108107
Advanced Example: Twig, Annotations and the Web Debug Toolbar
109108
-------------------------------------------------------------
110109

form/form_customization.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ this folder.
211211
In this example, the customized fragment name is ``integer_widget`` because
212212
you want to override the HTML ``widget`` for all ``integer`` field types. If
213213
you need to customize ``textarea`` fields, you would customize ``textarea_widget``.
214-
214+
215215
The ``integer`` part comes from the class name: ``IntegerType`` becomes ``integer``,
216216
based on a standard.
217217

reference/forms/types/datetime.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ as a series of ``select`` boxes. When the placeholder value is a string,
8383
it will be used as the **blank value** of all select boxes::
8484

8585
use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
86-
86+
8787
$builder->add('startDateTime', DateTimeType::class, array(
8888
'placeholder' => 'Select a value',
8989
));
@@ -92,7 +92,7 @@ Alternatively, you can use an array that configures different placeholder
9292
values for the year, month, day, hour, minute and second fields::
9393

9494
use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
95-
95+
9696
$builder->add('startDateTime', DateTimeType::class, array(
9797
'placeholder' => array(
9898
'year' => 'Year', 'month' => 'Month', 'day' => 'Day',

security/custom_provider.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ When a user submits a username and password, the authentication layer asks
99
the configured user provider to return a user object for a given username.
1010
Symfony then checks whether the password of this user is correct and generates
1111
a security token so the user stays authenticated during the current session.
12-
Out of the box, Symfony has four user providers: ``memory``, ``entity``,
12+
Out of the box, Symfony has four user providers: ``memory``, ``entity``,
1313
``ldap`` and ``chain``. In this entry you'll see how you can create your
1414
own user provider, which could be useful if your users are accessed via a
1515
custom database, a file, or - as shown in this example - a web service.

security/guard_authentication.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ Each authenticator needs the following methods:
400400
You will still need to active ``remember_me`` under your firewall for it to work.
401401
Since this is a stateless API, you do not want to support "remember me"
402402
functionality in this example.
403-
403+
404404
**createAuthenticatedToken(UserInterface $user, string $providerKey)**
405405
If you are implementing the :class:`Symfony\\Component\\Security\\Guard\\GuardAuthenticatorInterface`
406406
instead of extending the :class:`Symfony\\Component\\Security\\Guard\\AbstractGuardAuthenticator`

0 commit comments

Comments
 (0)