Skip to content

Commit b9a9936

Browse files
committed
Merge branch '6.0' into 6.1
* 6.0: Fix minor spelling and grammar issues in 5.4
2 parents bfd4212 + ce5aa8b commit b9a9936

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

components/security/authorization.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,24 +63,24 @@ Strategies
6363
The following strategies are bundled with the component:
6464

6565
``AffirmativeStrategy`` (default)
66-
grant access as soon as there is one voter granting access;
66+
grants access as soon as there is one voter granting access;
6767

6868
``ConsensusStrategy``
69-
grant access if there are more voters granting access than there are denying;
69+
grants access if there are more voters granting access than there are denying;
7070
if there is a draw between votes, the decision is made based on the
7171
``$allowIfEqualGrantedDeniedDecisions`` constructor parameter which defaults to ``true``.
7272

7373
``UnanimousStrategy``
74-
only grant access if none of the voters has denied access.
74+
only grants access if none of the voters has denied access.
7575

7676
``PriorityStrategy``
7777
grants or denies access by the first voter that does not abstain;
7878

7979
If all voters abstained from voting, the decision is based on the ``$allowIfAllAbstainDecisions``
80-
constructor parameter which is supported by all of the built-in strategies and defaults to ``false``.
80+
constructor parameter which is supported by all the built-in strategies and defaults to ``false``.
8181

8282
If none of the built-in strategies seem to fit, a custom strategy may be provided. The strategy will
83-
receive a stream of votes and may return as soon as it has seen enough votes to come to a conclusion.
83+
receive a stream of votes and may return as soon as it has seen enough votes to reach a conclusion.
8484

8585
::
8686

console/style.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ Content Methods
168168
:method:`Symfony\\Component\\Console\\Style\\SymfonyStyle::createTable`
169169
Creates an instance of :class:`Symfony\\Component\\Console\\Helper\\Table`
170170
styled according to the Symfony Style Guide, which allows you to use
171-
features such as appending rows dynamically.
171+
features such as dynamically appending rows.
172172

173173
:method:`Symfony\\Component\\Console\\Style\\SymfonyStyle::newLine`
174174
It displays a blank line in the command output. Although it may seem useful,

mailer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ OhMySMTP ohmysmtp+smtp://API_TOKEN@default n/a
172172

173173
.. caution::
174174

175-
If you want to use ``ses+smtp`` transport together with :doc:`Messenger </messenger>`
175+
If you want to use the ``ses+smtp`` transport together with :doc:`Messenger </messenger>`
176176
to :ref:`send messages in background <mailer-sending-messages-async>`,
177177
you need to add the ``ping_threshold`` parameter to your ``MAILER_DSN`` with
178178
a value lower than ``10``: ``ses+smtp://USERNAME:PASSWORD@default?ping_threshold=9``

messenger.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -697,9 +697,9 @@ PHP is designed to be stateless, there are no shared resources across different
697697
requests. In HTTP context PHP cleans everything after sending the response, so
698698
you can decide to not take care of services that may leak memory.
699699

700-
On the other hand, workers usually run in long-running CLI processes, which don't
701-
finish after processing a message. That's why you need to be careful about services
702-
state to not leak information and/or memory from one message to another message.
700+
On the other hand, workers usually sequentially process messages in long-running CLI processes, which don't
701+
finish after processing a single message. That's why you must be careful about service
702+
states to prevent information and/or memory leakage.
703703

704704
However, certain Symfony services, such as the Monolog
705705
:ref:`fingers crossed handler <logging-handler-fingers_crossed>`, leak by design.

serializer.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ properties and setters (``setXxx()``) to change properties:
147147
Serializer Context
148148
------------------
149149

150-
The serializer can define a context to control how the (de)serialization of
150+
The serializer can define a context to control the (de)serialization of
151151
resources. This context is passed to all normalizers. For example:
152152

153153
* :class:`Symfony\\Component\\Serializer\\Normalizer\\DateTimeNormalizer` uses
@@ -156,7 +156,7 @@ resources. This context is passed to all normalizers. For example:
156156
uses ``empty_iterable_as_object`` to represent empty objects as ``{}`` instead
157157
of ``[]`` in JSON.
158158

159-
You can pass the context like following::
159+
You can pass the context as follows::
160160

161161
$serializer->serialize($something, 'json', [
162162
DateTimeNormalizer::FORMAT_KEY => 'Y-m-d H:i:s',

testing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -917,8 +917,8 @@ Browser Assertions
917917
Asserts the given cookie in the test Client is set to the expected
918918
value.
919919
``assertThatForClient(Constraint $constraint, string $message = '')``
920-
Asserts the given Constraint in the Client. Useful to use your custom asserts
921-
in the same way of built-in asserts (i.e. without passing the Client as argument)::
920+
Asserts the given Constraint in the Client. Useful for using your custom asserts
921+
in the same way as built-in asserts (i.e. without passing the Client as argument)::
922922

923923
// add this method in some custom class imported in your tests
924924
protected static function assertMyOwnCustomAssert(): void

0 commit comments

Comments
 (0)