Skip to content

Commit ef99a52

Browse files
committed
Merge remote-tracking branch 'upstream/7.1' into 7.1
* upstream/7.1: Fix typo in dic_tags.rst use a release-indepent command to sign the symfony CLI fix the Runtime component introduction
2 parents 3cc9197 + e24067c commit ef99a52

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

components/runtime.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ The Runtime Component
22
=====================
33

44
The Runtime Component decouples the bootstrapping logic from any global state
5-
to make sure the application can run with runtimes like PHP-FPM, ReactPHP,
6-
Swoole, etc. without any changes.
5+
to make sure the application can run with runtimes like `PHP-PM`_, `ReactPHP`_,
6+
`Swoole`_, etc. without any changes.
77

88
Installation
99
------------
@@ -468,5 +468,7 @@ The end user will now be able to create front controller like::
468468
return new SomeCustomPsr15Application();
469469
};
470470

471+
.. _PHP-PM: https://github.com/php-pm/php-pm
472+
.. _Swoole: https://openswoole.com/
471473
.. _ReactPHP: https://reactphp.org/
472474
.. _`PSR-15`: https://www.php-fig.org/psr/psr-15/

reference/dic_tags.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ The ``warmUp()`` method must return an array with the files and classes to
509509
preload. Files must be absolute paths and classes must be fully-qualified class
510510
names. The only restriction is that files must be stored in the cache directory.
511511
If you don't need to preload anything, return an empty array. If read-only
512-
artefacts need to be created, you can store them in a different directory
512+
artifacts need to be created, you can store them in a different directory
513513
with the ``$buildDir`` parameter of the ``warmUp()`` method.
514514

515515
The ``isOptional()`` method should return true if it's possible to use the

setup/symfony_server.rst

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,7 @@ run the Symfony server in the background:
6565

6666
.. code-block:: terminal
6767
68-
# find the installed version of the Symfony binary
69-
$ symfony version
70-
71-
# change the path to the location of your Symfony binary and replace {version} too
72-
$ sudo codesign --force --deep --sign - /opt/homebrew/Cellar/symfony-cli/{version}/bin/symfony
68+
$ sudo codesign --force --deep --sign - $(whereis -q symfony)
7369
7470
Enabling PHP-FPM
7571
----------------

0 commit comments

Comments
 (0)