refined previous commit

symfony · Aug 28, 2012 · c896d71 · c896d71
1 parent a2a6cdc
commit c896d71
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
@@ -54,15 +54,24 @@ public function encode($data, $format)
      */
     public function decode($data, $format)
     {
-        $this->assertNoCustomDocType($data);
         $internalErrors = libxml_use_internal_errors(true);
         $disableEntities = libxml_disable_entity_loader(true);
         libxml_clear_errors();
 
-        $xml = simplexml_load_string($data);
+        $dom = new \DOMDocument();
+        $dom->loadXML($data);
+
         libxml_use_internal_errors($internalErrors);
         libxml_disable_entity_loader($disableEntities);
 
+        foreach ($dom->childNodes as $child) {
+            if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) {
+                throw new UnexpectedValueException('Document types are not allowed.');
+            }
+        }
+
+        $xml = simplexml_import_dom($dom);
+
         if ($error = libxml_get_last_error()) {
             throw new UnexpectedValueException($error->message);
         }
@@ -291,17 +300,6 @@ private function buildXml($parentNode, $data)
         throw new UnexpectedValueException('An unexpected value could not be serialized: '.var_export($data, true));
     }
 
-    private function assertNoCustomDocType($data)
-    {
-        $dom = new \DOMDocument;
-        $dom->loadXML($data);
-        foreach ($dom->childNodes as $child) {
-            if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) {
-                throw new \InvalidArgumentException('Document types are not allowed.');
-            }
-        }
-    }
-
     /**
      * Selects the type of node to create and appends it to the parent.
      *

diff --git a/tests/Symfony/Tests/Component/Serializer/Encoder/XmlEncoderTest.php b/tests/Symfony/Tests/Component/Serializer/Encoder/XmlEncoderTest.php
@@ -54,7 +54,7 @@ public function testSetRootNodeName()
     }
 
     /**
-     * @expectedException \InvalidArgumentException
+     * @expectedException        UnexpectedValueException
      * @expectedExceptionMessage Document types are not allowed.
      */
     public function testDocTypeIsNotAllowed()
@@ -255,8 +255,8 @@ public function testPreventsComplexExternalEntities()
         } catch (\Exception $e) {
             chdir($oldCwd);
 
-            if (!$e instanceof \InvalidArgumentException) {
-                $this->fail('Expected InvalidArgumentException');
+            if (!$e instanceof UnexpectedValueException) {
+                $this->fail('Expected UnexpectedValueException');
             }
         }
     }