Merge branch '6.4' into 7.1

nicolas-grekas · nicolas-grekas · commit 82765842fb59 · 2024-11-13T19:58:36.000+01:00
* 6.4:
  [HttpFoundation] Fix test
  [HttpFoundation] Revert risk change
  [Notifier] Fix GoIpTransport
  [HttpClient] Fix catching some invalid Location headers
diff --git a/Request.php b/Request.php
@@ -324,11 +324,9 @@ public static function create(string $uri, string $method = 'GET', array $parame
             if ('https' === $components['scheme']) {
                 $server['HTTPS'] = 'on';
                 $server['SERVER_PORT'] = 443;
-            } elseif ('http' === $components['scheme']) {
+            } else {
                 unset($server['HTTPS']);
                 $server['SERVER_PORT'] = 80;
-            } else {
-                throw new BadRequestException('Invalid URI: http(s) scheme expected.');
             }
         }
 
diff --git a/Tests/RequestTest.php b/Tests/RequestTest.php
@@ -311,7 +311,6 @@ public function testCreateWithRequestUri()
      *           [" foo"]
      *           ["foo "]
      *           ["//"]
-     *           ["foo:bar"]
      */
     public function testCreateWithBadRequestUri(string $uri)
     {

Original file line number	Diff line number	Diff line change
`@@ -324,11 +324,9 @@ public static function create(string $uri, string $method = 'GET', array $parame`
`324`	`324`	`if ('https' === $components['scheme']) {`
`325`	`325`	`$server['HTTPS'] = 'on';`
`326`	`326`	`$server['SERVER_PORT'] = 443;`
`327`		`- } elseif ('http' === $components['scheme']) {`
	`327`	`+ } else {`
`328`	`328`	`unset($server['HTTPS']);`
`329`	`329`	`$server['SERVER_PORT'] = 80;`
`330`		`- } else {`
`331`		`- throw new BadRequestException('Invalid URI: http(s) scheme expected.');`
`332`	`330`	`}`
`333`	`331`	`}`
`334`	`332`
Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,6 @@ public function testCreateWithRequestUri()`
`311`	`311`	`* [" foo"]`
`312`	`312`	`* ["foo "]`
`313`	`313`	`* ["//"]`
`314`		`- * ["foo:bar"]`
`315`	`314`	`*/`
`316`	`315`	`public function testCreateWithBadRequestUri(string $uri)`
`317`	`316`	`{`