Skip to content

Commit ce5a329

Browse files
committed
Merge branch '5.3' into 5.4
* 5.3: Correct spelling & grammar in 5.3 Fix issue 16298 - duplicate link [mercure] Compatibility with the Docker integration and various improvements Remove unneeded JWT reference Update mercure.rst regarding JWT token secret
2 parents 56b9ffd + 764d67c commit ce5a329

23 files changed

+151
-123
lines changed

cache.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -810,5 +810,5 @@ Then, register the ``SodiumMarshaller`` service using this key:
810810

811811
When configuring multiple keys, the first key will be used for reading and
812812
writing, and the additional key(s) will only be used for reading. Once all
813-
cache items encrypted with the old key have expired, you can remove
814-
``OLD_CACHE_DECRYPTION_KEY`` completely.
813+
cache items encrypted with the old key have expired, you can completely remove
814+
``OLD_CACHE_DECRYPTION_KEY``.

components/browser_kit.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ Custom Header Handling
185185
The optional HTTP headers passed to the ``request()`` method follows the FastCGI
186186
request format (uppercase, underscores instead of dashes and prefixed with ``HTTP_``).
187187
Before saving those headers to the request, they are lower-cased, with ``HTTP_``
188-
stripped, and underscores turned to dashes.
188+
stripped, and underscores converted into dashes.
189189

190190
If you're making a request to an application that has special rules about header
191191
capitalization or punctuation, override the ``getHeaders()`` method, which must

components/console.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,4 @@ Learn more
6363

6464
/console
6565
/components/console/*
66-
/components/console/helpers/index
6766
/console/*

components/http_foundation.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ can be accessed via several public properties:
8181
(``$request->headers->get('User-Agent')``).
8282

8383
Each property is a :class:`Symfony\\Component\\HttpFoundation\\ParameterBag`
84-
instance (or a sub-class of), which is a data holder class:
84+
instance (or a subclass of), which is a data holder class:
8585

8686
* ``request``: :class:`Symfony\\Component\\HttpFoundation\\ParameterBag` or
8787
:class:`Symfony\\Component\\HttpFoundation\\InputBag` if the data is
@@ -726,7 +726,7 @@ The ``JsonResponse`` class sets the ``Content-Type`` header to
726726
.. caution::
727727

728728
To avoid XSSI `JSON Hijacking`_, you should pass an associative array
729-
as the outer-most array to ``JsonResponse`` and not an indexed array so
729+
as the outermost array to ``JsonResponse`` and not an indexed array so
730730
that the final result is an object (e.g. ``{"object": "not inside an array"}``)
731731
instead of an array (e.g. ``[{"object": "inside an array"}]``). Read
732732
the `OWASP guidelines`_ for more information.

components/lock.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ as seconds) and ``isExpired()`` (which returns a boolean).
210210
Automatically Releasing The Lock
211211
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
212212

213-
Locks are automatically released when their Lock objects are destructed. This is
213+
Locks are automatically released when their Lock objects are destroyed. This is
214214
an implementation detail that will be important when sharing Locks between
215215
processes. In the example below, ``pcntl_fork()`` creates two processes and the
216216
Lock will be released automatically as soon as one process finishes::
@@ -508,7 +508,7 @@ locks::
508508
$store = new PostgreSqlStore($databaseConnectionOrDSN);
509509

510510
In opposite to the ``PdoStore``, the ``PostgreSqlStore`` does not need a table to
511-
store locks and does not expire.
511+
store locks and it does not expire.
512512

513513
.. versionadded:: 5.2
514514

components/messenger.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ middleware stack. The component comes with a set of middleware that you can use.
7777
When using the message bus with Symfony's FrameworkBundle, the following middleware
7878
are configured for you:
7979

80-
#. :class:`Symfony\\Component\\Messenger\\Middleware\\SendMessageMiddleware` (enables asynchronous processing, logs the processing of your messages if you pass a logger)
80+
#. :class:`Symfony\\Component\\Messenger\\Middleware\\SendMessageMiddleware` (enables asynchronous processing, logs the processing of your messages if you provide a logger)
8181
#. :class:`Symfony\\Component\\Messenger\\Middleware\\HandleMessageMiddleware` (calls the registered handler(s))
8282

8383
Example::

components/phpunit_bridge.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ Baseline Deprecations
295295
If your application has some deprecations that you can't fix for some reasons,
296296
you can tell Symfony to ignore them. The trick is to create a file with the
297297
allowed deprecations and define it as the "deprecation baseline". Deprecations
298-
inside that file are ignore but the rest of deprecations are still reported.
298+
inside that file are ignored but the rest of deprecations are still reported.
299299

300300
First, generate the file with the allowed deprecations (run the same command
301301
whenever you want to update the existing file):

components/runtime.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ application outside of the global state in 6 steps:
396396
that knows how to "run" the application object.
397397
#. The ``RunnerInterface::run(object $application)`` is called and it returns the
398398
exit status code as `int`.
399-
#. The PHP engine is exited with this status code.
399+
#. The PHP engine is terminated with this status code.
400400

401401
When creating a new runtime, there are two things to consider: First, what arguments
402402
will the end user use? Second, what will the user's application look like?

components/semaphore.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class, which in turn requires another class to manage the storage::
4545
The semaphore is created by calling the
4646
:method:`Symfony\\Component\\Semaphore\\SemaphoreFactory::createSemaphore`
4747
method. Its first argument is an arbitrary string that represents the locked
48-
resource. Its second argument is the maximum number of process allowed. Then, a
48+
resource. Its second argument is the maximum number of processes allowed. Then, a
4949
call to the :method:`Symfony\\Component\\Semaphore\\SemaphoreInterface::acquire`
5050
method will try to acquire the semaphore::
5151

@@ -54,7 +54,7 @@ method will try to acquire the semaphore::
5454

5555
if ($semaphore->acquire()) {
5656
// The resource "pdf-invoice-generation" is locked.
57-
// You can compute and generate invoice safely here.
57+
// Here you can safely compute and generate the invoice.
5858

5959
$semaphore->release();
6060
}

components/string.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ However, other languages require thousands of symbols to display their contents.
3636
They need complex encoding standards such as `Unicode`_ and concepts like
3737
"character" no longer make sense. Instead, you have to deal with these terms:
3838

39-
* `Code points`_: they are the atomic unit of information. A string is a series
39+
* `Code points`_: they are the atomic units of information. A string is a series
4040
of code points. Each code point is a number whose meaning is given by the
4141
`Unicode`_ standard. For example, the English letter ``A`` is the ``U+0041``
4242
code point and the Japanese *kana* ```` is the ``U+306E`` code point.

components/uid.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ type, which converts to/from ULID objects automatically::
342342
// ...
343343
}
344344

345-
There's also a Doctrine generator to help autogenerate ULID values for the
345+
There's also a Doctrine generator to help auto-generate ULID values for the
346346
entity primary keys::
347347

348348
use Symfony\Bridge\Doctrine\IdGenerator\UlidGenerator;

components/var_dumper.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ option. Read more about this and other options in
258258
finished, press ``Esc.`` to hide the box again.
259259

260260
If you want to use your browser search input, press ``Ctrl. + F`` or
261-
``Cmd. + F`` again while having focus on VarDumper's search input.
261+
``Cmd. + F`` again while focusing on VarDumper's search input.
262262

263263
Using the VarDumper Component in your PHPUnit Test Suite
264264
--------------------------------------------------------

0 commit comments

Comments
 (0)