Skip to content

Commit bca0db2

Browse files
Merge branch '4.3' into 4.4
* 4.3: Fix inconsistent return points. pass translation parameters to the trans filter [Mime] fixed wrong mimetype [ProxyManagerBridge] Polyfill for unmaintained version [HttpClient] Declare `$active` first to prevent weird issue Remove deprecated assertContains [HttpClient] fix tests SCA: dropped unused mocks, duplicate import and a function alias usage Added correct plural for box -> boxes [Config] fix test Fix remaining tests Improve fa (persian) translation
2 parents 1626d73 + a1e47f3 commit bca0db2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Loader/XmlFileLoader.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ private function parseConfigs(\DOMElement $node, string $path)
331331
private function parseDefaultsConfig(\DOMElement $element, string $path)
332332
{
333333
if ($this->isElementValueNull($element)) {
334-
return;
334+
return null;
335335
}
336336

337337
// Check for existing element nodes in the default element. There can
@@ -365,7 +365,7 @@ private function parseDefaultsConfig(\DOMElement $element, string $path)
365365
private function parseDefaultNode(\DOMElement $node, string $path)
366366
{
367367
if ($this->isElementValueNull($node)) {
368-
return;
368+
return null;
369369
}
370370

371371
switch ($node->localName) {

0 commit comments

Comments
 (0)