Explorar o código

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

Fabien Potencier %!s(int64=15) %!d(string=hai) anos
pai
achega
392ab46952

+ 13 - 1
src/Symfony/Components/DependencyInjection/Loader/XmlFileLoader.php

@@ -382,7 +382,19 @@ EOF
       }
       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;
       }
     }