Merge branch '4.4' into 5.1

derrabus · derrabus · commit 82a704969267 · 2020-10-28T22:31:18.000+01:00
diff --git a/Definition/ArrayNode.php b/Definition/ArrayNode.php
@@ -333,7 +333,7 @@ protected function normalizeValue($value)
      */
     protected function remapXml(array $value)
     {
-        foreach ($this->xmlRemappings as list($singular, $plural)) {
+        foreach ($this->xmlRemappings as [$singular, $plural]) {
             if (!isset($value[$singular])) {
                 continue;
             }
diff --git a/Definition/Dumper/XmlReferenceDumper.php b/Definition/Dumper/XmlReferenceDumper.php
@@ -53,7 +53,7 @@ private function writeNode(NodeInterface $node, int $depth = 0, bool $root = fal
             });
 
             if (\count($remapping)) {
-                list($singular) = current($remapping);
+                [$singular] = current($remapping);
                 $rootName = $singular;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,7 @@ protected function normalizeValue($value)`
`333`	`333`	`*/`
`334`	`334`	`protected function remapXml(array $value)`
`335`	`335`	`{`
`336`		`- foreach ($this->xmlRemappings as list($singular, $plural)) {`
	`336`	`+ foreach ($this->xmlRemappings as [$singular, $plural]) {`
`337`	`337`	`if (!isset($value[$singular])) {`
`338`	`338`	`continue;`
`339`	`339`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ private function writeNode(NodeInterface $node, int $depth = 0, bool $root = fal`
`53`	`53`	`});`
`54`	`54`
`55`	`55`	`if (\count($remapping)) {`
`56`		`- list($singular) = current($remapping);`
	`56`	`+ [$singular] = current($remapping);`
`57`	`57`	`$rootName = $singular;`
`58`	`58`	`}`
`59`	`59`	`}`