Another fix for #41. It was still broken with attributes.

sabre-io · Mar 21, 2015 · d26621a · d26621a
1 parent dd4af2c
commit d26621a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/Element/XmlFragment.php b/lib/Element/XmlFragment.php
@@ -83,6 +83,7 @@ function xmlSerialize(Writer $writer) {
                     $writer->startElement(
                         $reader->getClark()
                     );
+                    $empty = $reader->isEmptyElement;
                     while ($reader->moveToNextAttribute()) {
                         switch($reader->namespaceURI) {
                             case '' :
@@ -96,7 +97,7 @@ function xmlSerialize(Writer $writer) {
                                 break;
                         }
                     }
-                    if ($reader->isEmptyElement) {
+                    if ($empty) {
                         $writer->endElement();
                     }
                     break;

diff --git a/tests/Sabre/XML/Element/XmlFragmentTest.php b/tests/Sabre/XML/Element/XmlFragmentTest.php
@@ -98,6 +98,11 @@ function xmlProvider() {
                 '<foo:element xmlns:foo="http://example.org/ns" xmlns="http://sabredav.org/ns"><child/></foo:element>',
                 '<x1:element xmlns:x1="http://example.org/ns"><child/></x1:element>',
             ],
+            [
+                '<foo:element xmlns:foo="http://example.org/ns"><child a="b"/></foo:element>',
+                '<foo:element xmlns:foo="http://example.org/ns" xmlns="http://sabredav.org/ns"><child a="b"/></foo:element>',
+                '<x1:element xmlns:x1="http://example.org/ns"><child a="b"/></x1:element>',
+            ],
         ];
 
     }