Skip to content

Commit bbc9293

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: Chore: Fix typo in multiple files
2 parents 70926fd + 9901e18 commit bbc9293

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

components/console/helpers/progressbar.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ When executing longer-running commands, it may be helpful to show progress
55
information, which updates as your command runs:
66

77
.. image:: /_images/components/console/progressbar.gif
8-
:alt: Console output showing a progress bar advance to 100%, with the esimated time left, the memory usage and a special message that changes when the bar closes completion.
8+
:alt: Console output showing a progress bar advance to 100%, with the estimated time left, the memory usage and a special message that changes when the bar closes completion.
99

1010
.. note::
1111

configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -999,7 +999,7 @@ implements :class:`Symfony\\Component\\DependencyInjection\\EnvVarLoaderInterfac
999999
.. note::
10001000

10011001
If you're using the :ref:`default services.yaml configuration <service-container-services-load-example>`,
1002-
the autoconfiguration feature will enable and tag thise service automatically.
1002+
the autoconfiguration feature will enable and tag this service automatically.
10031003
Otherwise, you need to register and :doc:`tag your service </service_container/tags>`
10041004
with the ``container.env_var_loader`` tag.
10051005

reference/constraints/PasswordStrength.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PasswordStrength
22
================
33

44
Validates that the given password has reached the minimum strength required by
5-
the constraint. The strengh of the password is not evaluated with a set of
5+
the constraint. The strength of the password is not evaluated with a set of
66
predefined rules (include a number, use lowercase and uppercase characters,
77
etc.) but by measuring the entropy of the password based on its length and the
88
number of unique characters used.

security/access_control.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ Take the following ``access_control`` entries as an example:
153153
->requestMatcher('App\Security\RequestMatcher\MyRequestMatcher')
154154
;
155155
156-
// require ROLE_ADMIN for 'admin' route. You can use the shortcut route('xxx') mehtod,
156+
// require ROLE_ADMIN for 'admin' route. You can use the shortcut route('xxx') method,
157157
// instead of attributes(['_route' => 'xxx']) method
158158
$security->accessControl()
159159
->roles(['ROLE_ADMIN'])

service_container/autowiring.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -650,10 +650,10 @@ Generate Closures With Autowiring
650650
---------------------------------
651651

652652
A **service closure** is an anonymous function that returns a service. This type
653-
of instanciation is handy when you are dealing with lazy-loading. It is also
653+
of instantiation is handy when you are dealing with lazy-loading. It is also
654654
useful for non-shared service dependencies.
655655

656-
Automatically creating a closure encapsulating the service instanciation can be
656+
Automatically creating a closure encapsulating the service instantiation can be
657657
done with the
658658
:class:`Symfony\\Component\\DependencyInjection\\Attribute\\AutowireServiceClosure`
659659
attribute::

validation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ properties even if the child properties override those constraints**. Symfony
645645
will always merge the parent constraints for each property.
646646

647647
You can't change this behavior, but you can overcome it by defining the parent
648-
and the child contraints in different :doc:`validation groups </validation/groups>`
648+
and the child constraints in different :doc:`validation groups </validation/groups>`
649649
and then select the appropriate group when validating each object.
650650

651651
Debugging the Constraints

0 commit comments

Comments
 (0)