Changeset 552

Timestamp:

04/17/07 21:51:01 (1 year ago)

Author:

schst

Message:

Added support for @XmlFragment? annotation

Files:

• trunk/src/main/php/net/stubbles/xml/serializer/annotations/stubXMLFragmentAnnotation.php (added)
• trunk/src/main/php/net/stubbles/xml/serializer/stubXMLSerializer.php (modified) (3 diffs)
• trunk/src/test/php/net/stubbles/xml/stubXMLSerializerTestCase.php (modified) (2 diffs)

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

@@ -8 +8 @@
- */
-stubClassLoader::load('net.stubbles.xml.serializer.annotations.stubXMLTagAnnotation',
+                      'net.stubbles.xml.serializer.annotations.stubXMLFragmentAnnotation',
-                      'net.stubbles.xml.serializer.annotations.stubXMLAttributeAnnotation',
-                      'net.stubbles.xml.serializer.annotations.stubXMLIgnoreAnnotation',
@@ -152 +153 @@
-                continue;
-            }
+            if ($property->hasAnnotation('XMLFragment')) {
+                $xmlFragment = $property->getAnnotation('XMLFragment');
+                $tagName = $xmlFragment->getTagName();
+                if ($tagName != null) {
+                    $xmlWriter->writeStartElement($tagName);
+                    $xmlWriter->writeXmlFragment($propValue);
+                    $xmlWriter->writeEndElement();
+                } else {
+                    $xmlWriter->writeXmlFragment($propValue);
+                }
+                continue;
+            }
-            if ($property->hasAnnotation('XMLTag')) {
-                $xmlTag = $property->getAnnotation('XMLTag');
@@ -211 +224 @@
-                continue;
-            }
+            if ($method->hasAnnotation('XMLFragment')) {
+                $xmlFragment = $method->getAnnotation('XMLFragment');
+                $tagName = $xmlFragment->getTagName();
+                if ($tagName != null) {
+                    $xmlWriter->writeStartElement($tagName);
+                    $xmlWriter->writeXmlFragment($returnValue);
+                    $xmlWriter->writeEndElement();
+                } else {
+                    $xmlWriter->writeXmlFragment($returnValue);
+                }
+                continue;
+            }
-            if ($method->hasAnnotation('XMLTag')) {
-                $xmlTag = $method->getAnnotation('XMLTag');

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

@@ -122 +122 @@
-        return "bar";
-    }
+}
+
+/**
+ * Simple Test class to test the XMLSerializer
+ *
+ * @XMLTag(tagName='test')
+ */
+class XMLSerializerFragmentTest {
+    /**
+     * Property containing XML
+     *
+     * @XMLFragment(tagName='xml');
+     * @var string
+     */
+    public $xml = '<foo>bar</foo>';
-}
-
@@ -288 +303 @@
-
-    /**
+     * Test serializing an object with an xml fragment
+     */
+    public function testObjectFragmentProperty() {
+        $writer = new stubDomXMLStreamWriter();
+        $obj = new XMLSerializerFragmentTest();
+        $this->serializer->serialize($obj, $writer);
+        $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<test><xml><foo>bar</foo></xml></test>', $writer->asXML());
+    }
+
+    /**
-     * Test serializing an object with a method matcher
-     */