Merge branch '4.4' into 5.2

chalasr · chalasr · commit ba54b6e00709 · 2021-04-08T12:27:02.000+02:00
* 4.4:
  [PHPDoc] Fix some union type cases
diff --git a/Loader/XmlFileLoader.php b/Loader/XmlFileLoader.php
@@ -358,7 +358,7 @@ private function parseDefaultsConfig(\DOMElement $element, string $path)
     /**
      * Recursively parses the value of a "default" element.
      *
-     * @return array|bool|float|int|string The parsed value
+     * @return array|bool|float|int|string|null The parsed value
      *
      * @throws \InvalidArgumentException when the XML is invalid
      */

Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,7 @@ private function parseDefaultsConfig(\DOMElement $element, string $path)`
`358`	`358`	`/**`
`359`	`359`	`* Recursively parses the value of a "default" element.`
`360`	`360`	`*`
`361`		`- * @return array\|bool\|float\|int\|string The parsed value`
	`361`	`+ * @return array\|bool\|float\|int\|string\|null The parsed value`
`362`	`362`	`*`
`363`	`363`	`* @throws \InvalidArgumentException when the XML is invalid`
`364`	`364`	`*/`