Skip to content

Commit 9bf4386

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: Change "createAuthenticatedToken" to "createToken" Correct spelling & grammar in 5.3 Fix issue 16298 - duplicate link Update mercure.rst [mercure] Compatibility with the Docker integration and various improvements Remove unneeded JWT reference Update mercure.rst regarding JWT token secret
2 parents 85c438b + 7a71d09 commit 9bf4386

23 files changed

+152
-124
lines changed

cache.rst

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

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

components/browser_kit.rst

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

182182
If you're making a request to an application that has special rules about header
183183
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
@@ -705,7 +705,7 @@ The ``JsonResponse`` class sets the ``Content-Type`` header to
705705
.. caution::
706706

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

components/lock.rst

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

208-
Locks are automatically released when their Lock objects are destructed. This is
208+
Locks are automatically released when their Lock objects are destroyed. This is
209209
an implementation detail that will be important when sharing Locks between
210210
processes. In the example below, ``pcntl_fork()`` creates two processes and the
211211
Lock will be released automatically as soon as one process finishes::
@@ -494,7 +494,7 @@ locks::
494494
$store = new PostgreSqlStore($databaseConnectionOrDSN);
495495

496496
In opposite to the ``PdoStore``, the ``PostgreSqlStore`` does not need a table to
497-
store locks and does not expire.
497+
store locks and it does not expire.
498498

499499
.. _lock-store-redis:
500500

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
@@ -382,7 +382,7 @@ application outside of the global state in 6 steps:
382382
that knows how to "run" the application object.
383383
#. The ``RunnerInterface::run(object $application)`` is called and it returns the
384384
exit status code as `int`.
385-
#. The PHP engine is exited with this status code.
385+
#. The PHP engine is terminated with this status code.
386386

387387
When creating a new runtime, there are two things to consider: First, what arguments
388388
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
@@ -41,7 +41,7 @@ class, which in turn requires another class to manage the storage::
4141
The semaphore is created by calling the
4242
:method:`Symfony\\Component\\Semaphore\\SemaphoreFactory::createSemaphore`
4343
method. Its first argument is an arbitrary string that represents the locked
44-
resource. Its second argument is the maximum number of process allowed. Then, a
44+
resource. Its second argument is the maximum number of processes allowed. Then, a
4545
call to the :method:`Symfony\\Component\\Semaphore\\SemaphoreInterface::acquire`
4646
method will try to acquire the semaphore::
4747

@@ -50,7 +50,7 @@ method will try to acquire the semaphore::
5050

5151
if ($semaphore->acquire()) {
5252
// The resource "pdf-invoice-generation" is locked.
53-
// You can compute and generate invoice safely here.
53+
// Here you can safely compute and generate the invoice.
5454

5555
$semaphore->release();
5656
}

components/string.rst

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

35-
* `Code points`_: they are the atomic unit of information. A string is a series
35+
* `Code points`_: they are the atomic units of information. A string is a series
3636
of code points. Each code point is a number whose meaning is given by the
3737
`Unicode`_ standard. For example, the English letter ``A`` is the ``U+0041``
3838
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
@@ -305,7 +305,7 @@ type, which converts to/from ULID objects automatically::
305305
// ...
306306
}
307307

308-
There's also a Doctrine generator to help autogenerate ULID values for the
308+
There's also a Doctrine generator to help auto-generate ULID values for the
309309
entity primary keys::
310310

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

components/var_dumper.rst

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

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

259259
Using the VarDumper Component in your PHPUnit Test Suite
260260
--------------------------------------------------------

0 commit comments

Comments
 (0)