Skip to content

Commit d4873ed

Browse files
committed
Merge branch '6.4' into 7.2
* 6.4: Tweaks and fixes Rename and refocus Symfony Local Web Server docs to Symfony CLI
2 parents c67b9cd + c836a4b commit d4873ed

File tree

15 files changed

+661
-576
lines changed

15 files changed

+661
-576
lines changed

‎_build/redirection_map

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,7 @@
435435
/setup/composer /setup
436436
/security/security_checker /setup
437437
/setup/built_in_web_server /setup/symfony_server
438+
/setup/symfony_server /setup/symfony_cli
438439
/service_container/parameters /configuration
439440
/routing/generate_url_javascript /routing
440441
/routing/slash_in_parameter /routing

‎configuration/micro_kernel_trait.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Next, create an ``index.php`` file that defines the kernel class and runs it:
101101
};
102102
103103
That's it! To test it, start the :doc:`Symfony Local Web Server
104-
</setup/symfony_server>`:
104+
</setup/symfony_cli>`:
105105

106106
.. code-block:: terminal
107107
@@ -466,7 +466,7 @@ this:
466466
└─ composer.lock
467467
468468
As before you can use the :doc:`Symfony Local Web Server
469-
</setup/symfony_server>`:
469+
</setup/symfony_cli>`:
470470

471471
.. code-block:: terminal
472472

‎console.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ completion (by default, by pressing the Tab key).
101101
.. tip::
102102

103103
If you are using the :doc:`Symfony local web server
104-
</setup/symfony_server>`, it is recommended to use the built-in completion
104+
</setup/symfony_cli>`, it is recommended to use the built-in completion
105105
script that will ensure the right PHP version and configuration are used when
106106
running the Console Completion. Run ``symfony completion --help`` for the
107107
installation instructions for your shell. The Symfony CLI will provide

‎contributing/code/reproducer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ 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_server>` provided by Symfony
68+
#. Install the :doc:`local web server </setup/symfony_cli>` provided by Symfony
6969
and use the ``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.

‎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_server>`:
157+
run the :doc:`Symfony Local Web Server </setup/symfony_cli>`:
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_server>` to test
104+
You can use the :doc:`Symfony Local Web Server </setup/symfony_cli>` 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ 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_server>` locally with HTTPS,
56+
If you're using the :doc:`Symfony web server </setup/symfony_cli>` locally with HTTPS,
5757
you'll need to also tell the dev-server to use HTTPS. To do this, you can reuse the Symfony web
5858
server SSL certificate:
5959

‎mailer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1806,7 +1806,7 @@ Enabling an Email Catcher
18061806
When developing locally, it is recommended to use an email catcher. If you have
18071807
enabled Docker support via Symfony recipes, an email catcher is automatically
18081808
configured. In addition, if you are using the :doc:`Symfony local web server
1809-
</setup/symfony_server>`, the mailer DSN is automatically exposed via the
1809+
</setup/symfony_cli>`, the mailer DSN is automatically exposed via the
18101810
:ref:`symfony binary Docker integration <symfony-server-docker>`.
18111811

18121812
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_server>`,
75+
If you use the :doc:`Symfony Local Web Server </setup/symfony_cli>`,
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_server>`,
83+
That's it! If you are using :doc:`the Symfony web server </setup/symfony_cli>`,
8484
try it out by going to: http://localhost:8000/lucky/number
8585

8686
.. tip::

‎quick_tour/the_big_picture.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ 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_server>` and run
45+
to :doc:`install the Symfony local web server </setup/symfony_cli>` and run
4646
it as follows:
4747

4848
.. code-block:: terminal

‎setup.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ 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_server>` provided by the
124+
using the :doc:`local web server </setup/symfony_cli>` provided by the
125125
``symfony`` binary. This local server provides among other things support for
126126
HTTP/2, concurrent requests, TLS/SSL and automatic generation of security
127127
certificates.

0 commit comments

Comments
 (0)