Merge branch '5.2' into 5.x

chalasr · chalasr · commit 98d89dffec68 · 2021-04-08T12:31:48.000+02:00
* 5.2:
  [PHPDoc] Fix some union type cases
diff --git a/Loader/XmlFileLoader.php b/Loader/XmlFileLoader.php
@@ -368,7 +368,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
`@@ -368,7 +368,7 @@ private function parseDefaultsConfig(\DOMElement $element, string $path)`
`368`	`368`	`/**`
`369`	`369`	`* Recursively parses the value of a "default" element.`
`370`	`370`	`*`
`371`		`- * @return array\|bool\|float\|int\|string The parsed value`
	`371`	`+ * @return array\|bool\|float\|int\|string\|null The parsed value`
`372`	`372`	`*`
`373`	`373`	`* @throws \InvalidArgumentException when the XML is invalid`
`374`	`374`	`*/`