Skip to content

Commit 3a495d6

Browse files
committed
Merge branch '7.4' into 8.0
* 7.4: Update all references to Symfony CLI and web server
2 parents e50600e + 120a8cf commit 3a495d6

File tree

13 files changed

+24
-26
lines changed

13 files changed

+24
-26
lines changed

configuration/micro_kernel_trait.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,7 @@ Next, create an ``index.php`` file that defines the kernel class and runs it:
100100
return new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);
101101
};
102102
103-
That's it! To test it, start the :doc:`Symfony Local Web Server
104-
</setup/symfony_cli>`:
103+
That's it! To test it, start the :ref:`Symfony local web server <symfony-cli-server>`:
105104

106105
.. code-block:: terminal
107106
@@ -466,8 +465,7 @@ this:
466465
├─ composer.json
467466
└─ composer.lock
468467
469-
As before you can use the :doc:`Symfony Local Web Server
470-
</setup/symfony_cli>`:
468+
As before you can use the :ref:`Symfony local web server <symfony-cli-server>`:
471469

472470
.. code-block:: terminal
473471

console.rst

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,8 @@ completion (by default, by pressing the Tab key).
100100
101101
.. tip::
102102

103-
If you are using the :doc:`Symfony local web server
104-
</setup/symfony_cli>`, it is recommended to use the built-in completion
105-
script that will ensure the right PHP version and configuration are used when
106-
running the Console Completion. Run ``symfony completion --help`` for the
107-
installation instructions for your shell. The Symfony CLI will provide
108-
completion for the ``console`` and ``composer`` commands.
103+
If you are using the :doc:`Symfony CLI </setup/symfony_cli>` tool, follow
104+
:ref:`these instructions <symfony-cli-autocompletion>` to enable autocompletion.
109105

110106
.. _console_creating-command:
111107

contributing/code/reproducer.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ to a route definition. Then, after creating your project:
6565
of controllers, actions, etc. as in your original application.
6666
#. Create a small controller and add your routing definition that shows the bug.
6767
#. Don't create or modify any other file.
68-
#. Install the :doc:`local web server </setup/symfony_cli>` provided by Symfony
69-
and use the ``symfony server:start`` command to browse to the new route and
68+
#. Install the :doc:`Symfony CLI </setup/symfony_cli>` tool and use the
69+
``symfony server:start`` command to browse to the new route and
7070
see if the bug appears or not.
7171
#. If you can see the bug, you're done and you can already share the code with us.
7272
#. If you can't see the bug, you must keep making small changes. For example, if

create_framework/front_controller.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ Now, configure your web server root directory to point to ``web/`` and all
154154
other files will no longer be accessible from the client.
155155

156156
To test your changes in a browser (``http://localhost:4321/hello?name=Fabien``),
157-
run the :doc:`Symfony Local Web Server </setup/symfony_cli>`:
157+
run the :ref:`Symfony local web server <symfony-cli-server>`:
158158

159159
.. code-block:: terminal
160160

create_framework/introduction.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ start with the simplest web application we can think of in PHP::
101101

102102
printf('Hello %s', $name);
103103

104-
You can use the :doc:`Symfony Local Web Server </setup/symfony_cli>` to test
104+
You can use the :ref:`Symfony local web server <symfony-cli-server>` to test
105105
this great application in a browser
106106
(``http://localhost:8000/index.php?name=Fabien``):
107107

frontend/encore/dev-server.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ method in your ``webpack.config.js`` file:
5353
Enabling HTTPS using the Symfony Web Server
5454
-------------------------------------------
5555

56-
If you're using the :doc:`Symfony web server </setup/symfony_cli>` locally with HTTPS,
57-
you'll need to also tell the dev-server to use HTTPS. To do this, you can reuse the Symfony web
58-
server SSL certificate:
56+
If you're using the :ref:`Symfony local web server <symfony-cli-server>` locally
57+
with HTTPS, you'll need to also tell the dev-server to use HTTPS. To do this,
58+
you can reuse the Symfony web server SSL certificate:
5959

6060
.. code-block:: diff
6161

mailer.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1991,8 +1991,8 @@ Enabling an Email Catcher
19911991

19921992
When developing locally, it is recommended to use an email catcher. If you have
19931993
enabled Docker support via Symfony recipes, an email catcher is automatically
1994-
configured. In addition, if you are using the :doc:`Symfony local web server
1995-
</setup/symfony_cli>`, the mailer DSN is automatically exposed via the
1994+
configured. In addition, if you are using the :doc:`Symfony CLI </setup/symfony_cli>`
1995+
tool, the mailer DSN is automatically exposed via the
19961996
:ref:`symfony binary Docker integration <symfony-server-docker>`.
19971997

19981998
Sending Test Emails

mercure.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Thanks to :doc:`the Docker integration of Symfony </setup/docker>`,
7272
:ref:`Flex <symfony-flex>` proposes to install a Mercure hub for development.
7373
Run ``docker-compose up`` to start the hub if you have chosen this option.
7474

75-
If you use the :doc:`Symfony Local Web Server </setup/symfony_cli>`,
75+
If you use the :ref:`Symfony local web server <symfony-cli-server>`,
7676
you must start it with the ``--no-tls`` option to prevent mixed content and
7777
invalid TLS certificate issues:
7878

page_creation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ metadata to code):
8080
}
8181
}
8282
83-
That's it! If you are using :doc:`the Symfony web server </setup/symfony_cli>`,
83+
That's it! If you are using :ref:`the Symfony web server <symfony-cli-server>`,
8484
try it out by going to: http://localhost:8000/lucky/number
8585

8686
.. tip::

quick_tour/the_big_picture.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ Symfony application:
4242
Can we already load the project in a browser? Yes! You can set up
4343
:doc:`Nginx or Apache </setup/web_server_configuration>` and configure their
4444
document root to be the ``public/`` directory. But, for development, it's better
45-
to :doc:`install the Symfony local web server </setup/symfony_cli>` and run
46-
it as follows:
45+
to install the :doc:`Symfony CLI </setup/symfony_cli>` tool and run its
46+
:ref:`local web server <symfony-cli-server>` as follows:
4747

4848
.. code-block:: terminal
4949

setup.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ development.
121121
.. _symfony-binary-web-server:
122122

123123
However for local development, the most convenient way of running Symfony is by
124-
using the :doc:`local web server </setup/symfony_cli>` provided by the
125-
``symfony`` binary. This local server provides among other things support for
124+
using the :ref:`local web server <symfony-cli-server>` provided by the
125+
Symfony CLI tool. This local server provides among other things support for
126126
HTTP/2, concurrent requests, TLS/SSL and automatic generation of security
127127
certificates.
128128

setup/symfony_cli.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ The Symfony CLI is available as a standalone executable that supports Linux,
2121
macOS, and Windows. Download and install it following the instructions on
2222
`symfony.com/download`_.
2323

24+
.. _symfony-cli-autocompletion:
25+
2426
Shell Autocompletion
2527
~~~~~~~~~~~~~~~~~~~~
2628

@@ -75,6 +77,8 @@ projects quickly:
7577
Pass the ``--cloud`` option to initialize a Symfony Cloud project at the same
7678
time the Symfony project is created.
7779

80+
.. _symfony-cli-server:
81+
7882
Running the Local Web Server
7983
----------------------------
8084

setup/web_server_configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Configuring a Web Server
22
========================
33

44
The preferred way to develop your Symfony application is to use
5-
:doc:`Symfony Local Web Server </setup/symfony_cli>`.
5+
:ref:`Symfony local web server <symfony-cli-server>`.
66

77
However, when running the application in the production environment, you'll need
88
to use a fully-featured web server. This article describes how to use Symfony

0 commit comments

Comments
 (0)