Commit37e288e

committed

Merge branch '6.0' into 6.1

* 6.0: Replace an URL by a URL feat(symfony-cli): add "symfony proxy:url" command usage Mark some Symfony CLI feature as experimental

2 parents367bf3c +3908807 commit37e288eCopy full SHA for 37e288e

File tree

+15

-3

lines changed

+15

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -635,7 +635,7 @@ the whole form or specific field(s)::`
`635`	`635`	`Resolving a URI`
`636`	`636`	`~~~~~~~~~~~~~~~`
`637`	`637`
`638`		-The:class:`Symfony\\Component\\DomCrawler\\UriResolver` class takesan URI
	`638`	+The:class:`Symfony\\Component\\DomCrawler\\UriResolver` class takesa URI
`639`	`639`	`(relative, absolute, fragment, etc.) and turns it into an absolute URI against`
`640`	`640`	`another given base URI::`
`641`	`641`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2285,7 +2285,7 @@ package:`
`2285`	`2285`
`2286`	`2286`	`..note::`
`2287`	`2287`
`2288`		- Ifan URL is set, the JSON manifest is downloaded on each request using the `http_client`_.
	`2288`	+ Ifa URL is set, the JSON manifest is downloaded on each request using the `http_client`_.
`2289`	`2289`
`2290`	`2290`	`.. _reference-assets-strict-mode:`
`2291`	`2291`

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,14 @@ domains work:`
`237`	`237`
`238`	`238`	`..code-block::terminal`
`239`	`239`
`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`
`241`	`248`
`242`	`249`	`..note::`
`243`	`250`
@@ -280,6 +287,11 @@ server provides a ``run`` command to wrap them as follows:
`280`	`287`	`Configuring Workers`
`281`	`288`	`-------------------`
`282`	`289`
	`290`	`+..caution::`
	`291`	`+`
	`292`	`+ This feature is experimental and could change or be removed at any time`
	`293`	`+ without prior notice.`
	`294`	`+`
`283`	`295`	`If you like some processes to start automatically, along with the webserver`
`284`	`296`	(``symfony server:start``), add a configuration file to your project:
`285`	`297`

Comments

(0)