Changeset 2252

Timestamp:

06/23/09 19:56:35 (13 months ago)

Author:

mikey

Message:

fix defect #205: empty document fragments should be serialized as tag only

Location:

framework/trunk/src

Files:

• main/php/net/stubbles/xml/serializer/stubXMLSerializer.php (modified) (1 diff)
• test/php/net/stubbles/xml/serializer/stubXMLSerializerTestCase.php (modified) (2 diffs)

framework/trunk/src/main/php/net/stubbles/xml/serializer/stubXMLSerializer.php

@@ -177 +177 @@
                 if (null != $data['tagName']) {
                     $xmlWriter->writeStartElement($data['tagName']);
-                    if (true === $data['nl2br']) {
-                        $value = str_replace('&', '&', nl2br($value));
+                    if (empty($value) === false) {
+                        if (true === $data['nl2br']) {
+                            $value = str_replace('&', '&', nl2br($value));
+                        }
+                        
+                        $xmlWriter->writeXmlFragment($value);
                     }
                     
-                    $xmlWriter->writeXmlFragment($value);
                     $xmlWriter->writeEndElement();
-                } else {
+                } elseif (empty($value) === false) {
                     $xmlWriter->writeXmlFragment($value);
                 }

framework/trunk/src/test/php/net/stubbles/xml/serializer/stubXMLSerializerTestCase.php

@@ -192 +192 @@
      */
     public $xml3 = "foo\nb&ar\n\nbaz";
+}
+
+/**
+ * Simple Test class to test the XMLSerializer
+ *
+ * @XMLTag(tagName='test')
+ */
+class XMLSerializerFragmentTest2
+{
+    /**
+     * Property containing no XML
+     *
+     * @XMLFragment(tagName='noXml');
+     * @var string
+     */
+    public $noXml = 'bar';
+    /**
+     * Property containing no data
+     *
+     * @XMLFragment(tagName='noData');
+     * @var string
+     */
+    public $noData;
+    /**
+     * Property containing no data
+     *
+     * @XMLFragment(tagName=false);
+     * @var string
+     */
+    public $noData2;
 }
 
@@ -577 +607 @@
 
     /**
+     * Test serializing an object with an invalid xml fragment
+     *
+     * @test
+     */
+    public function objectInvalidFragmentProperty()
+    {
+        $writer = new stubDomXMLStreamWriter();
+        $obj    = new XMLSerializerFragmentTest2();
+        $this->serializer->serialize($obj, $writer);
+        $this->assertEquals('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . '<test><noXml>bar</noXml><noData/></test>', $writer->asXML());
+    }
+
+    /**
      * Test serializing an object with empty attributes
      *