From fc5a4a8abd16bcafeefec01bade6d115cd51d861 Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel Date: Sun, 30 Aug 2009 23:17:37 +0200 Subject: [PATCH] Further cleanup for Horde 4. Renamed XML classes to Xml. Some tests still failing though. --- framework/Kolab_Format/lib/Horde/Kolab/Format.php | 2 +- .../lib/Horde/Kolab/Format/{XML.php => Xml.php} | 29 +++++----- .../Horde/Kolab/Format/{XML => Xml}/Annotation.php | 2 +- .../Horde/Kolab/Format/{XML => Xml}/Contact.php | 2 +- .../Kolab/Format/{XML => Xml}/Distributionlist.php | 2 +- .../lib/Horde/Kolab/Format/{XML => Xml}/Event.php | 2 +- .../lib/Horde/Kolab/Format/{XML => Xml}/Hprefs.php | 2 +- .../lib/Horde/Kolab/Format/{XML => Xml}/Note.php | 2 +- .../lib/Horde/Kolab/Format/{XML => Xml}/Task.php | 2 +- framework/Kolab_Format/package.xml | 65 +++++++++++++--------- .../test/Horde/Kolab/Format/ContactTest.php | 18 +++--- .../test/Horde/Kolab/Format/EventTest.php | 7 +-- .../test/Horde/Kolab/Format/MimeAttrTest.php | 7 +-- .../test/Horde/Kolab/Format/PreferencesTest.php | 12 ++-- .../test/Horde/Kolab/Format/RecurrenceTest.php | 7 +-- .../test/Horde/Kolab/Format/XmlTest.php | 32 ++++------- 16 files changed, 90 insertions(+), 103 deletions(-) rename framework/Kolab_Format/lib/Horde/Kolab/Format/{XML.php => Xml.php} (98%) rename framework/Kolab_Format/lib/Horde/Kolab/Format/{XML => Xml}/Annotation.php (97%) rename framework/Kolab_Format/lib/Horde/Kolab/Format/{XML => Xml}/Contact.php (99%) rename framework/Kolab_Format/lib/Horde/Kolab/Format/{XML => Xml}/Distributionlist.php (97%) rename framework/Kolab_Format/lib/Horde/Kolab/Format/{XML => Xml}/Event.php (98%) rename framework/Kolab_Format/lib/Horde/Kolab/Format/{XML => Xml}/Hprefs.php (98%) rename framework/Kolab_Format/lib/Horde/Kolab/Format/{XML => Xml}/Note.php (97%) rename framework/Kolab_Format/lib/Horde/Kolab/Format/{XML => Xml}/Task.php (98%) diff --git a/framework/Kolab_Format/lib/Horde/Kolab/Format.php b/framework/Kolab_Format/lib/Horde/Kolab/Format.php index 37dc3f47b..06e422213 100644 --- a/framework/Kolab_Format/lib/Horde/Kolab/Format.php +++ b/framework/Kolab_Format/lib/Horde/Kolab/Format.php @@ -54,7 +54,7 @@ abstract class Horde_Kolab_Format static public function &factory($format_type = '', $object_type = '', $params = null) { - $class = 'Horde_Kolab_Format_' . $format_type; + $class = 'Horde_Kolab_Format_' . ucfirst(strtolower($format_type)); if (class_exists($class)) { $driver = call_user_func(array($class, 'factory'), $object_type, $params); diff --git a/framework/Kolab_Format/lib/Horde/Kolab/Format/XML.php b/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml.php similarity index 98% rename from framework/Kolab_Format/lib/Horde/Kolab/Format/XML.php rename to framework/Kolab_Format/lib/Horde/Kolab/Format/Xml.php index 269cb9b0d..9650af82e 100644 --- a/framework/Kolab_Format/lib/Horde/Kolab/Format/XML.php +++ b/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml.php @@ -31,7 +31,7 @@ * @link http://pear.horde.org/index.php?package=Kolab_Server * @since Horde 3.2 */ -class Horde_Kolab_Format_XML +class Horde_Kolab_Format_Xml { /** @@ -352,14 +352,14 @@ class Horde_Kolab_Format_XML } /** - * Attempts to return a concrete Horde_Kolab_Format_XML instance. + * Attempts to return a concrete Horde_Kolab_Format_Xml instance. * based on $object_type. * * @param string $object_type The object type that should be handled. * @param array $params Any additional parameters. * - * @return Horde_Kolab_Format_XML The newly created concrete - * Horde_Kolab_Format_XML instance. + * @return Horde_Kolab_Format_Xml The newly created concrete + * Horde_Kolab_Format_Xml instance. * * @throws Horde_Exception If the class for the object type could * not be loaded. @@ -367,7 +367,7 @@ class Horde_Kolab_Format_XML public function &factory($object_type = '', $params = null) { $object_type = ucfirst(str_replace('-', '', $object_type)); - $class = 'Horde_Kolab_Format_XML_' . $object_type; + $class = 'Horde_Kolab_Format_Xml_' . $object_type; if (class_exists($class)) { $driver = &new $class($params); @@ -443,18 +443,18 @@ class Horde_Kolab_Format_XML return false; } - if (!$this->_xmldoc->hasChildNodes()) { + if (!$this->_xmldoc->documentElement->hasChildNodes()) { throw new Horde_Exception(_("No or unreadable content in Kolab XML object")); } // fresh object data $object = array(); - $result = $this->_loadArray($this->_xmldoc->childNodes, $this->_fields_basic); + $result = $this->_loadArray($this->_xmldoc->documentElement->childNodes, $this->_fields_basic); $object = array_merge($object, $result); $this->_loadMultipleCategories($object); - $result = $this->_load($this->_xmldoc->childNodes); + $result = $this->_load($this->_xmldoc->documentElement->childNodes); $object = array_merge($object, $result); // uid is vital @@ -529,7 +529,8 @@ class Horde_Kolab_Format_XML $result = array(); foreach($children as $child) { if ($child->nodeType == XML_ELEMENT_NODE && $child->tagName == $name) { - $value = $this->_getXmlData(array($child), $name, + $child_a = array($child); + $value = $this->_getXmlData($child_a, $name, $params['array']); $result[] = $value; } @@ -653,10 +654,10 @@ class Horde_Kolab_Format_XML $this->_xmldoc->preserveWhiteSpace = false; $this->_xmldoc->formatOutput = true; $root = $this->_xmldoc->createElement($this->_root_name); - $root = $this->_xmldoc->appendChild($root); + $this->_xmldoc->appendChild($root); $root->setAttribute('version', $this->_root_version); } - return $this->_xmldoc; + return $root; } /** @@ -1205,14 +1206,14 @@ class Horde_Kolab_Format_XML } // Collect all child nodes - $children = $node->child_nodes(); + $children = $node->childNodes; $recurrence = $this->_loadArray($children, $this->_fields_recurrence); // Get the cycle type (must be present) - $recurrence['cycle'] = $node->get_attribute('cycle'); + $recurrence['cycle'] = $node->getAttribute('cycle'); // Get the sub type (may be present) - $recurrence['type'] = $node->get_attribute('type'); + $recurrence['type'] = $node->getAttribute('type'); // Exclusions. if (isset($recurrence['exclusion'])) { diff --git a/framework/Kolab_Format/lib/Horde/Kolab/Format/XML/Annotation.php b/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Annotation.php similarity index 97% rename from framework/Kolab_Format/lib/Horde/Kolab/Format/XML/Annotation.php rename to framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Annotation.php index 61a14b522..7604cffcf 100644 --- a/framework/Kolab_Format/lib/Horde/Kolab/Format/XML/Annotation.php +++ b/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Annotation.php @@ -26,7 +26,7 @@ * @link http://pear.horde.org/index.php?package=Kolab_Server * @since Horde 3.2 */ -class Horde_Kolab_Format_XML_Annotation extends Horde_Kolab_Format_XML +class Horde_Kolab_Format_Xml_Annotation extends Horde_Kolab_Format_Xml { /** * Specific data fields for the prefs object diff --git a/framework/Kolab_Format/lib/Horde/Kolab/Format/XML/Contact.php b/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Contact.php similarity index 99% rename from framework/Kolab_Format/lib/Horde/Kolab/Format/XML/Contact.php rename to framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Contact.php index 44f4783a7..ef66f2f58 100644 --- a/framework/Kolab_Format/lib/Horde/Kolab/Format/XML/Contact.php +++ b/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Contact.php @@ -28,7 +28,7 @@ * @link http://pear.horde.org/index.php?package=Kolab_Server * @since Horde 3.2 */ -class Horde_Kolab_Format_XML_Contact extends Horde_Kolab_Format_XML +class Horde_Kolab_Format_Xml_Contact extends Horde_Kolab_Format_Xml { /** * Specific data fields for the contact object diff --git a/framework/Kolab_Format/lib/Horde/Kolab/Format/XML/Distributionlist.php b/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Distributionlist.php similarity index 97% rename from framework/Kolab_Format/lib/Horde/Kolab/Format/XML/Distributionlist.php rename to framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Distributionlist.php index 0e784687e..e471953e1 100644 --- a/framework/Kolab_Format/lib/Horde/Kolab/Format/XML/Distributionlist.php +++ b/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Distributionlist.php @@ -28,7 +28,7 @@ * @link http://pear.horde.org/index.php?package=Kolab_Server * @since Horde 3.2 */ -class Horde_Kolab_Format_XML_Distributionlist extends Horde_Kolab_Format_XML +class Horde_Kolab_Format_Xml_Distributionlist extends Horde_Kolab_Format_Xml { /** * Specific data fields for the contact object diff --git a/framework/Kolab_Format/lib/Horde/Kolab/Format/XML/Event.php b/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Event.php similarity index 98% rename from framework/Kolab_Format/lib/Horde/Kolab/Format/XML/Event.php rename to framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Event.php index 63b5df70c..9544ae041 100644 --- a/framework/Kolab_Format/lib/Horde/Kolab/Format/XML/Event.php +++ b/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Event.php @@ -28,7 +28,7 @@ * @link http://pear.horde.org/index.php?package=Kolab_Server * @since Horde 3.2 */ -class Horde_Kolab_Format_XML_Event extends Horde_Kolab_Format_XML +class Horde_Kolab_Format_Xml_Event extends Horde_Kolab_Format_Xml { /** * Specific data fields for the contact object diff --git a/framework/Kolab_Format/lib/Horde/Kolab/Format/XML/Hprefs.php b/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Hprefs.php similarity index 98% rename from framework/Kolab_Format/lib/Horde/Kolab/Format/XML/Hprefs.php rename to framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Hprefs.php index 8f63c715f..b7a8eebc9 100644 --- a/framework/Kolab_Format/lib/Horde/Kolab/Format/XML/Hprefs.php +++ b/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Hprefs.php @@ -26,7 +26,7 @@ * @link http://pear.horde.org/index.php?package=Kolab_Server * @since Horde 3.2 */ -class Horde_Kolab_Format_XML_Hprefs extends Horde_Kolab_Format_XML +class Horde_Kolab_Format_Xml_Hprefs extends Horde_Kolab_Format_Xml { /** * Specific data fields for the prefs object diff --git a/framework/Kolab_Format/lib/Horde/Kolab/Format/XML/Note.php b/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Note.php similarity index 97% rename from framework/Kolab_Format/lib/Horde/Kolab/Format/XML/Note.php rename to framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Note.php index c15bb6420..bd12d2116 100644 --- a/framework/Kolab_Format/lib/Horde/Kolab/Format/XML/Note.php +++ b/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Note.php @@ -28,7 +28,7 @@ * @link http://pear.horde.org/index.php?package=Kolab_Server * @since Horde 3.2 */ -class Horde_Kolab_Format_XML_Note extends Horde_Kolab_Format_XML +class Horde_Kolab_Format_Xml_Note extends Horde_Kolab_Format_Xml { /** * Specific data fields for the note object diff --git a/framework/Kolab_Format/lib/Horde/Kolab/Format/XML/Task.php b/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Task.php similarity index 98% rename from framework/Kolab_Format/lib/Horde/Kolab/Format/XML/Task.php rename to framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Task.php index 48bb5bf95..5d37389f2 100644 --- a/framework/Kolab_Format/lib/Horde/Kolab/Format/XML/Task.php +++ b/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Task.php @@ -28,7 +28,7 @@ * @link http://pear.horde.org/index.php?package=Kolab_Server * @since Horde 3.2 */ -class Horde_Kolab_Format_XML_Task extends Horde_Kolab_Format_XML +class Horde_Kolab_Format_Xml_Task extends Horde_Kolab_Format_Xml { /** * Specific data fields for the note object diff --git a/framework/Kolab_Format/package.xml b/framework/Kolab_Format/package.xml index bd98fce45..df33af729 100644 --- a/framework/Kolab_Format/package.xml +++ b/framework/Kolab_Format/package.xml @@ -34,7 +34,7 @@ http://pear.php.net/dtd/package-2.0.xsd"> 2009-04-02 - 1.0.1 + 1.0.2 1.0.0 @@ -43,14 +43,8 @@ http://pear.php.net/dtd/package-2.0.xsd"> LGPL - * Handle parsing errors within the DOM XML extension correctly - kolab/issue3520 (calendar with certain entries does not display in web client) - https://www.intevation.de/roundup/kolab/issue3520 - kolab/issue3525 (free/busy regeneration aborts for unparsable events) - https://www.intevation.de/roundup/kolab/issue3525 - * Accept ISO-8859-1 encoding even if advertised as UTF-8 - kolab/issue3528 (Events with broken encoding should work) - https://www.intevation.de/roundup/kolab/issue3528 + * Converted to Horde4/PHP5 + * Removed Horde_DOM dependency. @@ -80,8 +74,8 @@ http://pear.php.net/dtd/package-2.0.xsd"> - - + + @@ -89,7 +83,7 @@ http://pear.php.net/dtd/package-2.0.xsd"> - + @@ -127,12 +121,7 @@ http://pear.php.net/dtd/package-2.0.xsd"> 1.4.0b1 - Horde_DOM - pear.horde.org - 0.1.0 - - - Horde_NLS + Nls pear.horde.org @@ -146,7 +135,7 @@ http://pear.php.net/dtd/package-2.0.xsd"> pear.horde.org - Horde_Date + Date pear.horde.org @@ -158,14 +147,14 @@ http://pear.php.net/dtd/package-2.0.xsd"> - - - - - - - - + + + + + + + + @@ -182,6 +171,28 @@ http://pear.php.net/dtd/package-2.0.xsd"> + 2009-04-02 + + 1.0.1 + 1.0.0 + + + stable + stable + + LGPL + + * Handle parsing errors within the DOM XML extension correctly + kolab/issue3520 (calendar with certain entries does not display in web client) + https://www.intevation.de/roundup/kolab/issue3520 + kolab/issue3525 (free/busy regeneration aborts for unparsable events) + https://www.intevation.de/roundup/kolab/issue3525 + * Accept ISO-8859-1 encoding even if advertised as UTF-8 + kolab/issue3528 (Events with broken encoding should work) + https://www.intevation.de/roundup/kolab/issue3528 + + + 2008-12-12 1.0.0 diff --git a/framework/Kolab_Format/test/Horde/Kolab/Format/ContactTest.php b/framework/Kolab_Format/test/Horde/Kolab/Format/ContactTest.php index 3648013bb..5cd856786 100644 --- a/framework/Kolab_Format/test/Horde/Kolab/Format/ContactTest.php +++ b/framework/Kolab_Format/test/Horde/Kolab/Format/ContactTest.php @@ -8,14 +8,10 @@ */ /** - * We need the unit test framework + * The Autoloader allows us to omit "require/include" statements. */ -require_once 'PHPUnit/Framework.php'; +require_once 'Horde/Autoloader.php'; -require_once 'Horde/Nls.php'; -require_once 'Horde/Kolab/Format.php'; -require_once 'Horde/Kolab/Format/XML.php'; -require_once 'Horde/Kolab/Format/XML/Contact.php'; class DummyRegistry { function get() @@ -24,7 +20,7 @@ class DummyRegistry { } } -class Horde_Kolab_Format_XML_contact_dummy extends Horde_Kolab_Format_XML_contact +class Horde_Kolab_Format_Xml_Contact_dummy extends Horde_Kolab_Format_Xml_Contact { function _saveCreationDate($parent_node, $name, $value, $missing) { @@ -77,7 +73,7 @@ class Horde_Kolab_Format_ContactTest extends PHPUnit_Framework_TestCase */ public function testSingleEmail() { - $contact = &new Horde_Kolab_Format_XML_contact_dummy(); + $contact = &new Horde_Kolab_Format_Xml_contact_dummy(); $object = array('uid' => '1', 'full-name' => 'User Name', 'email' => 'user@example.org'); @@ -91,7 +87,7 @@ class Horde_Kolab_Format_ContactTest extends PHPUnit_Framework_TestCase */ public function testPGP() { - $contact = &new Horde_Kolab_Format_XML_contact_dummy(); + $contact = &new Horde_Kolab_Format_Xml_contact_dummy(); $object = array('uid' => '1', 'full-name' => 'User Name', 'pgp-publickey' => 'PGP Test Key', @@ -108,7 +104,7 @@ class Horde_Kolab_Format_ContactTest extends PHPUnit_Framework_TestCase { global $prefs; - $contact = &new Horde_Kolab_Format_XML_contact(); + $contact = &new Horde_Kolab_Format_Xml_contact(); $xml = file_get_contents(dirname(__FILE__) . '/fixtures/contact_category.xml'); $object = $contact->load($xml); $this->assertContains('Test', $object['categories']); @@ -134,7 +130,7 @@ class Horde_Kolab_Format_ContactTest extends PHPUnit_Framework_TestCase /* Monkey patch to allw the value to be set. */ $prefs->_prefs['categories'] = array('v' => ''); - $contact = &new Horde_Kolab_Format_XML_contact(); + $contact = &new Horde_Kolab_Format_Xml_contact(); $xml = file_get_contents(dirname(__FILE__) . '/fixtures/contact_category.xml'); $object = $contact->load($xml); diff --git a/framework/Kolab_Format/test/Horde/Kolab/Format/EventTest.php b/framework/Kolab_Format/test/Horde/Kolab/Format/EventTest.php index a8fc5c4be..bec51f6b9 100644 --- a/framework/Kolab_Format/test/Horde/Kolab/Format/EventTest.php +++ b/framework/Kolab_Format/test/Horde/Kolab/Format/EventTest.php @@ -8,12 +8,9 @@ */ /** - * We need the unit test framework + * The Autoloader allows us to omit "require/include" statements. */ -require_once 'PHPUnit/Framework.php'; - -require_once 'Horde/Nls.php'; -require_once 'Horde/Kolab/Format.php'; +require_once 'Horde/Autoloader.php'; /** * Test event handling. diff --git a/framework/Kolab_Format/test/Horde/Kolab/Format/MimeAttrTest.php b/framework/Kolab_Format/test/Horde/Kolab/Format/MimeAttrTest.php index f2d5535b9..99733e396 100644 --- a/framework/Kolab_Format/test/Horde/Kolab/Format/MimeAttrTest.php +++ b/framework/Kolab_Format/test/Horde/Kolab/Format/MimeAttrTest.php @@ -15,12 +15,9 @@ */ /** - * We need the unit test framework + * The Autoloader allows us to omit "require/include" statements. */ -require_once 'PHPUnit/Framework.php'; - -require_once 'Horde/Nls.php'; -require_once 'Horde/Kolab/Format.php'; +require_once 'Horde/Autoloader.php'; /** * Test Kolab Format MIME attributes diff --git a/framework/Kolab_Format/test/Horde/Kolab/Format/PreferencesTest.php b/framework/Kolab_Format/test/Horde/Kolab/Format/PreferencesTest.php index fc50a53e3..b752810ec 100644 --- a/framework/Kolab_Format/test/Horde/Kolab/Format/PreferencesTest.php +++ b/framework/Kolab_Format/test/Horde/Kolab/Format/PreferencesTest.php @@ -8,17 +8,13 @@ */ /** - * We need the unit test framework + * The Autoloader allows us to omit "require/include" statements. */ -require_once 'PHPUnit/Framework.php'; +require_once 'Horde/Autoloader.php'; -require_once 'Horde/Nls.php'; -require_once 'Horde/Kolab/Format.php'; -require_once 'Horde/Kolab/Format/XML.php'; -require_once 'Horde/Kolab/Format/XML/Hprefs.php'; -class Horde_Kolab_Format_XML_hprefs_dummy extends Horde_Kolab_Format_XML_hprefs +class Horde_Kolab_Format_Xml_Hprefs_dummy extends Horde_Kolab_Format_Xml_Hprefs { function _saveCreationDate($parent_node, $name, $value, $missing) { @@ -71,7 +67,7 @@ class Horde_Kolab_Format_PreferencesTest extends PHPUnit_Framework_TestCase */ public function testConversionFromOld() { - $preferences = &new Horde_Kolab_Format_XML_hprefs_dummy(); + $preferences = &new Horde_Kolab_Format_Xml_hprefs_dummy(); $xml = file_get_contents(dirname(__FILE__) . '/fixtures/preferences_read_old.xml'); $object = $preferences->load($xml); diff --git a/framework/Kolab_Format/test/Horde/Kolab/Format/RecurrenceTest.php b/framework/Kolab_Format/test/Horde/Kolab/Format/RecurrenceTest.php index 0f81ba05a..cefd966b5 100644 --- a/framework/Kolab_Format/test/Horde/Kolab/Format/RecurrenceTest.php +++ b/framework/Kolab_Format/test/Horde/Kolab/Format/RecurrenceTest.php @@ -8,12 +8,9 @@ */ /** - * We need the unit test framework + * The Autoloader allows us to omit "require/include" statements. */ -require_once 'PHPUnit/Framework.php'; - -require_once 'Horde/Nls.php'; -require_once 'Horde/Kolab/Format.php'; +require_once 'Horde/Autoloader.php'; /** * Test recurrence handling diff --git a/framework/Kolab_Format/test/Horde/Kolab/Format/XmlTest.php b/framework/Kolab_Format/test/Horde/Kolab/Format/XmlTest.php index b5f23e74f..380c8aca2 100644 --- a/framework/Kolab_Format/test/Horde/Kolab/Format/XmlTest.php +++ b/framework/Kolab_Format/test/Horde/Kolab/Format/XmlTest.php @@ -8,13 +8,9 @@ */ /** - * We need the unit test framework + * The Autoloader allows us to omit "require/include" statements. */ -require_once 'PHPUnit/Framework.php'; - -require_once 'Horde/Nls.php'; -require_once 'Horde/Kolab/Format.php'; -require_once 'Horde/Kolab/Format/XML.php'; +require_once 'Horde/Autoloader.php'; /** * Test the XML format. @@ -71,8 +67,7 @@ class Horde_Kolab_Format_XmlTest extends PHPUnit_Framework_TestCase public function testAdd() { $xml = &new Horde_Kolab_Format_XML(); - $xml->_prepareSave(); - $root = $xml->_xmldoc; + $root = $xml->_prepareSave(); $base = $xml->_xmldoc->saveXML(); // A missing attribute should cause no change if it @@ -120,9 +115,8 @@ class Horde_Kolab_Format_XmlTest extends PHPUnit_Framework_TestCase */ public function testNodeOps() { - $dxml = new Horde_Kolab_Format_XML_dummy(); - $dxml->_prepareSave(); - $droot = $dxml->_xmldoc; + $dxml = new Horde_Kolab_Format_Xml_dummy(); + $droot = $dxml->_prepareSave(); // Test calculated nodes $dxml->_updateNode($droot, @@ -137,9 +131,8 @@ class Horde_Kolab_Format_XmlTest extends PHPUnit_Framework_TestCase 'save' => 'Value', 'type' => 0)); $this->assertEquals("\n\n empty2: , missing\n present1: present1\n\n", $dxml->_xmldoc->saveXML()); - $xml = &new Horde_Kolab_Format_XML(); - $xml->_prepareSave(); - $root = $xml->_xmldoc; + $xml = &new Horde_Kolab_Format_Xml(); + $root = $xml->_prepareSave(); $xml->_updateNode($root, array(), 'empty1', @@ -229,7 +222,7 @@ class Horde_Kolab_Format_XmlTest extends PHPUnit_Framework_TestCase public function testReleod() { // Save an object and reload it - $xml = new Horde_Kolab_Format_XML(); + $xml = new Horde_Kolab_Format_Xml(); $result = $xml->save(array('uid'=>'test', 'body' => 'body', 'dummy' => 'hello', @@ -251,9 +244,8 @@ class Horde_Kolab_Format_XmlTest extends PHPUnit_Framework_TestCase public function testComplex() { // Continue with complex values - $xml = new Horde_Kolab_Format_XML(); - $xml->_prepareSave(); - $root = $xml->_xmldoc; + $xml = new Horde_Kolab_Format_Xml(); + $root = $xml->_prepareSave(); // Test saving a composite value $xml->_updateNode($root, @@ -267,7 +259,7 @@ class Horde_Kolab_Format_XmlTest extends PHPUnit_Framework_TestCase 'attendee1', $xml->_fields_attendee); $this->assertEquals("\n\n \n test\n test@example.com\n \n \n \n test\n \n none\n true\n required\n \n \n \n test@example.com\n none\n true\n required\n \n\n", $xml->_xmldoc->saveXML()); - $children = $root->child_nodes(); + $children = $root->childNodes; // Load a composite value $data = $xml->_getXmlData($children, @@ -301,7 +293,7 @@ class Horde_Kolab_Format_XmlTest extends PHPUnit_Framework_TestCase * @author Gunnar Wrobel * @package Kolab_Format */ -class Horde_Kolab_Format_XML_dummy extends Horde_Kolab_Format_XML +class Horde_Kolab_Format_Xml_dummy extends Horde_Kolab_Format_Xml { function _saveValue($node, $name, $value, $missing) { -- 2.11.0