Merge branch '5.2' into 5.x

chalasr · chalasr · commit f60c2e55bebe · 2021-04-08T12:31:48.000+02:00
* 5.2:
  [PHPDoc] Fix some union type cases
diff --git a/HeaderBag.php b/HeaderBag.php
@@ -230,7 +230,7 @@ public function hasCacheControlDirective(string $key)
     /**
      * Returns a Cache-Control directive value by name.
      *
-     * @return mixed|null The directive value if defined, null otherwise
+     * @return mixed The directive value if defined, null otherwise
      */
     public function getCacheControlDirective(string $key)
     {

Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ public function hasCacheControlDirective(string $key)`
`230`	`230`	`/**`
`231`	`231`	`* Returns a Cache-Control directive value by name.`
`232`	`232`	`*`
`233`		`- * @return mixed\|null The directive value if defined, null otherwise`
	`233`	`+ * @return mixed The directive value if defined, null otherwise`
`234`	`234`	`*/`
`235`	`235`	`public function getCacheControlDirective(string $key)`
`236`	`236`	`{`