Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit 43739dbf5310 · 2019-08-11T11:51:46.000+02:00
* 4.3:
  [HttpFoundation] fix typo
diff --git a/src/Symfony/Component/HttpFoundation/HeaderUtils.php b/src/Symfony/Component/HttpFoundation/HeaderUtils.php
@@ -36,7 +36,6 @@ private function __construct()
      *     HeaderUtils::split("da, en-gb;q=0.8", ",;")
      *     // => ['da'], ['en-gb', 'q=0.8']]
      *
-     * @param string $header     HTTP header value
      * @param string $separators List of characters to split on, ordered by
      *                           precedence, e.g. ",", ";=", or ",;="
      *
diff --git a/src/Symfony/Component/HttpFoundation/RequestMatcher.php b/src/Symfony/Component/HttpFoundation/RequestMatcher.php
@@ -97,7 +97,7 @@ public function matchHost($regexp)
      *
      * @param int|null $port The port number to connect to
      */
-    public function matchPort(int $port = null)
+    public function matchPort(?int $port)
     {
         $this->port = $port;
     }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ private function __construct()`
`36`	`36`	`* HeaderUtils::split("da, en-gb;q=0.8", ",;")`
`37`	`37`	`* // => ['da'], ['en-gb', 'q=0.8']]`
`38`	`38`	`*`
`39`		`- * @param string $header HTTP header value`
`40`	`39`	`* @param string $separators List of characters to split on, ordered by`
`41`	`40`	`* precedence, e.g. ",", ";=", or ",;="`
`42`	`41`	`*`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public function matchHost($regexp)`
`97`	`97`	`*`
`98`	`98`	`* @param int\|null $port The port number to connect to`
`99`	`99`	`*/`
`100`		`- public function matchPort(int $port = null)`
	`100`	`+ public function matchPort(?int $port)`
`101`	`101`	`{`
`102`	`102`	`$this->port = $port;`
`103`	`103`	`}`