refined previous commit

fabpot · fabpot · commit c896d71594fb · 2012-08-28T08:43:14.000+02:00
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');
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function testSetRootNodeName()`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`/**`
`57`		`- * @expectedException \InvalidArgumentException`
	`57`	`+ * @expectedException UnexpectedValueException`
`58`	`58`	`* @expectedExceptionMessage Document types are not allowed.`
`59`	`59`	`*/`
`60`	`60`	`public function testDocTypeIsNotAllowed()`
`@@ -255,8 +255,8 @@ public function testPreventsComplexExternalEntities()`
`255`	`255`	`} catch (\Exception $e) {`
`256`	`256`	`chdir($oldCwd);`
`257`	`257`
`258`		`- if (!$e instanceof \InvalidArgumentException) {`
`259`		`- $this->fail('Expected InvalidArgumentException');`
	`258`	`+ if (!$e instanceof UnexpectedValueException) {`
	`259`	`+ $this->fail('Expected UnexpectedValueException');`
`260`	`260`	`}`
`261`	`261`	`}`
`262`	`262`	`}`