[DependencyInjection] Deprecate SimpleXMLElement

symfony · fabpot · Apr 2, 2014 · Oct 19, 2013 · Apr 2, 2014 · Apr 2, 2014
commit a3c60c8039d90a4a9da3325c90b2b16a20e3f53f
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 -----

 * added DecoratorServicePass and a way to override a service definition (Definition::setDecoratedService())
+* deprecated SimpleXMLElement class.

 2.4.0
 -----

diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -197,37 +197,20 @@ private function parseDefinition($id, \DOMElement $service, $file)
                    $parameters[$normalizedName] = XmlUtils::phpize($node->nodeValue);
                }
                // keep not normalized key for BC too
-                $parameters[$name] = SimpleXMLElement::phpize($value);
+                $parameters[$name] = XmlUtils::phpize($node->nodeValue);
            }

-//            $definition->addTag((string) $tag['name'], $parameters);
            $definition->addTag($tag->getAttribute('name'), $parameters);
        }

-        if (isset($service['decorates'])) {
-            $renameId = isset($service['decoration-inner-name']) ? (string) $service['decoration-inner-name'] : null;
-            $definition->setDecoratedService((string) $service['decorates'], $renameId);
+        if ($value = $service->getAttribute('decorates')) {
+            $renameId = $service->hasAttribute('decoration-inner-name') ? $service->getAttribute('decoration-inner-name') : null;
+            $definition->setDecoratedService($value, $renameId);
        }

        $this->container->setDefinition($id, $definition);
    }

-    /**
-     * Parses a XML file.
-     *
-     * @param string $file Path to a file
-     *
-     * @return SimpleXMLElement
-     *
-     * @throws InvalidArgumentException When loading of XML file returns error
-     */
-    protected function parseFile($file)
-    {
-        $dom = $this->parseFileToDOM($file);
-
-        return simplexml_import_dom($dom, 'Symfony\\Component\\DependencyInjection\\SimpleXMLElement');
-    }
-
    /**
     * Parses a XML file to a \DOMDocument
     *
@@ -237,7 +220,7 @@ protected function parseFile($file)
     *
     * @throws InvalidArgumentException When loading of XML file returns error
     */
-    protected function parseFileToDOM($file)
+    private function parseFileToDOM($file)
    {
        try {
            $dom = XmlUtils::loadFile($file, array($this, 'validateSchema'));

diff --git a/src/Symfony/Component/DependencyInjection/SimpleXMLElement.php b/src/Symfony/Component/DependencyInjection/SimpleXMLElement.php
@@ -18,6 +18,8 @@
 * SimpleXMLElement class.
 *
 * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @deprecated Deprecated since version 2.5, to be removed in 3.0.
 */
 class SimpleXMLElement extends \SimpleXMLElement
 {