[DependencyInjection] fixed Extension conversion from XML to PHP when the same tag is used more than once

fabpot · fabpot · commit 392ab46952e1 · 2010-01-14T18:28:35.000+01:00
diff --git a/src/Symfony/Components/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Components/DependencyInjection/Loader/XmlFileLoader.php
@@ -382,7 +382,19 @@ static public function convertDomElementToArray(\DomElement $element)
       }
       elseif (!$node instanceof \DOMComment)
       {
-        $config[$node->localName] = static::convertDomElementToArray($node);
+        if (isset($config[$node->localName]))
+        {
+          if (!is_array($config[$node->localName]))
+          {
+            $config[$node->localName] = array($config[$node->localName]);
+          }
+          $config[$node->localName][] = static::convertDomElementToArray($node);
+        }
+        else
+        {
+          $config[$node->localName] = static::convertDomElementToArray($node);
+        }
+
         $empty = false;
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,19 @@ static public function convertDomElementToArray(\DomElement $element)`
`382`	`382`	`}`
`383`	`383`	`elseif (!$node instanceof \DOMComment)`
`384`	`384`	`{`
`385`		`- $config[$node->localName] = static::convertDomElementToArray($node);`
	`385`	`+ if (isset($config[$node->localName]))`
	`386`	`+ {`
	`387`	`+ if (!is_array($config[$node->localName]))`
	`388`	`+ {`
	`389`	`+ $config[$node->localName] = array($config[$node->localName]);`
	`390`	`+ }`
	`391`	`+ $config[$node->localName][] = static::convertDomElementToArray($node);`
	`392`	`+ }`
	`393`	`+ else`
	`394`	`+ {`
	`395`	`+ $config[$node->localName] = static::convertDomElementToArray($node);`
	`396`	`+ }`
	`397`	`+`
`386`	`398`	`$empty = false;`
`387`	`399`	`}`
`388`	`400`	`}`