Skip to content

Commit 3908807

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: Replace an URL by a URL feat(symfony-cli): add "symfony proxy:url" command usage Mark some Symfony CLI feature as experimental
2 parents 5625c79 + e8391c0 commit 3908807

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

components/dom_crawler.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ the whole form or specific field(s)::
635635
Resolving a URI
636636
~~~~~~~~~~~~~~~
637637

638-
The :class:`Symfony\\Component\\DomCrawler\\UriResolver` class takes an URI
638+
The :class:`Symfony\\Component\\DomCrawler\\UriResolver` class takes a URI
639639
(relative, absolute, fragment, etc.) and turns it into an absolute URI against
640640
another given base URI::
641641

reference/configuration/framework.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2265,7 +2265,7 @@ package:
22652265

22662266
.. note::
22672267

2268-
If an URL is set, the JSON manifest is downloaded on each request using the `http_client`_.
2268+
If a URL is set, the JSON manifest is downloaded on each request using the `http_client`_.
22692269

22702270
.. _reference-assets-strict-mode:
22712271

setup/symfony_server.rst

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,14 @@ domains work:
237237

238238
.. code-block:: terminal
239239
240-
$ https_proxy=http://127.0.0.1:7080 curl https://my-domain.wip
240+
# Example with curl
241+
$ https_proxy=$(symfony proxy:url) curl https://my-domain.wip
242+
243+
# Example with Blackfire and curl
244+
$ https_proxy=$(symfony proxy:url) blackfire curl https://my-domain.wip
245+
246+
# Example with Cypress
247+
$ https_proxy=$(symfony proxy:url) ./node_modules/bin/cypress open
241248
242249
.. note::
243250

@@ -280,6 +287,11 @@ server provides a ``run`` command to wrap them as follows:
280287
Configuring Workers
281288
-------------------
282289

290+
.. caution::
291+
292+
This feature is experimental and could change or be removed at any time
293+
without prior notice.
294+
283295
If you like some processes to start automatically, along with the webserver
284296
(``symfony server:start``), add a configuration file to your project:
285297

0 commit comments

Comments
 (0)