Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit a1e47f3f1943 · 2019-08-07T13:52:19.000+02:00
* 3.4:
  Fix inconsistent return points.
  Fix remaining tests
diff --git a/Loader/XmlFileLoader.php b/Loader/XmlFileLoader.php
@@ -337,7 +337,7 @@ private function parseConfigs(\DOMElement $node, $path)
     private function parseDefaultsConfig(\DOMElement $element, $path)
     {
         if ($this->isElementValueNull($element)) {
-            return;
+            return null;
         }
 
         // Check for existing element nodes in the default element. There can
@@ -374,7 +374,7 @@ private function parseDefaultsConfig(\DOMElement $element, $path)
     private function parseDefaultNode(\DOMElement $node, $path)
     {
         if ($this->isElementValueNull($node)) {
-            return;
+            return null;
         }
 
         switch ($node->localName) {

Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,7 @@ private function parseConfigs(\DOMElement $node, $path)`
`337`	`337`	`private function parseDefaultsConfig(\DOMElement $element, $path)`
`338`	`338`	`{`
`339`	`339`	`if ($this->isElementValueNull($element)) {`
`340`		`- return;`
	`340`	`+ return null;`
`341`	`341`	`}`
`342`	`342`
`343`	`343`	`// Check for existing element nodes in the default element. There can`
`@@ -374,7 +374,7 @@ private function parseDefaultsConfig(\DOMElement $element, $path)`
`374`	`374`	`private function parseDefaultNode(\DOMElement $node, $path)`
`375`	`375`	`{`
`376`	`376`	`if ($this->isElementValueNull($node)) {`
`377`		`- return;`
	`377`	`+ return null;`
`378`	`378`	`}`
`379`	`379`
`380`	`380`	`switch ($node->localName) {`