Skip to content

Commit 8ffd2f9

Browse files
committed
Merge branch '7.0' into 7.1
* 7.0: use a release-indepent command to sign the symfony CLI fix the Runtime component introduction Update runtime.rst [AssetMapper] Removing TODOs
2 parents 90bbe24 + 85d3de8 commit 8ffd2f9

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
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-PM, 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/

frontend/asset_mapper.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -958,10 +958,6 @@ rendered by the ``{{ importmap() }}`` Twig function:
958958
Page-Specific CSS & JavaScript
959959
------------------------------
960960

961-
---> TODO HEre
962-
---> need to add the entrypoint in the importmap.php file
963-
----> and should NOT call parent() in the javascript block
964-
965961
Sometimes you may choose to include CSS or JavaScript files only on certain
966962
pages. For JavaScript, an easy way is to load the file with a `dynamic import`_:
967963

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)