First round of style changes to php5 just to make it stop crashing.

diff --git a/php5/attribute-empty.php b/php5/attribute-empty.php
index d4611404f0503d755f5f2ed56c4f93b669a1bf87..38181415306b6f9e152445619c12cd6bc5d38dbb 100644 (file)
--- a/php5/attribute-empty.php
+++ b/php5/attribute-empty.php
@@ -8,5 +8,5 @@ $doc = XML_Template_process_file('../xml/clone.xml', array(
        'color' => 'blue',
        '#things' => array(NULL)
 ));
-print $doc->dump_mem();
+print $doc->saveXML();
 ?>

diff --git a/php5/attribute.php b/php5/attribute.php
index 626812ec9227cb5a7097db944e965940bcf6b7b3..df0f5f50f46d654b803d85d5cd81a6476ee30759 100644 (file)
--- a/php5/attribute.php
+++ b/php5/attribute.php
@@ -10,5 +10,5 @@ $doc = XML_Template_process_file('../xml/clone.xml', array(
                array( 'li' => 'Warm, woolen mittens',  'li/class' => 'even' )
        )
 ));
-print $doc->dump_mem();
+print $doc->saveXML();
 ?>

diff --git a/php5/attribute2.php b/php5/attribute2.php
index 186828f312af85194cf419379df64053f65fb6b9..f58b4adcb73192dc660b62c8205ff878f06012ab 100644 (file)
--- a/php5/attribute2.php
+++ b/php5/attribute2.php
@@ -10,5 +10,5 @@ $doc = XML_Template_process_file('../xml/clone.xml', array(
                array( 'li' => 'Warm, woolen mittens' ),
        ), array('odd', 'even'))
 ));
-print $doc->dump_mem();
+print $doc->saveXML();
 ?>

diff --git a/php5/attribute3.php b/php5/attribute3.php
index f4fa718e37aa1f48cfb19c32d8625680dd5bdb5a..0fbfba73b7a7c1f679a0f36e70f551a212d75773 100644 (file)
--- a/php5/attribute3.php
+++ b/php5/attribute3.php
@@ -11,5 +11,5 @@ $doc = XML_Template_process_file('../xml/clone.xml', array(
                array( 'li' => 'Warm, woolen mittens' ),
        ), array('odd', 'even'))
 ));
-print $doc->dump_mem();
+print $doc->saveXML();
 ?>

diff --git a/php5/attribute4.php b/php5/attribute4.php
index b2c39f99cb5d0213877ca56d503fb25358019d09..1251aa3af1cb35d3bc5fd40ef438541d9e915e9e 100644 (file)
--- a/php5/attribute4.php
+++ b/php5/attribute4.php
@@ -4,5 +4,5 @@ require('xml-template.php');
 $doc = XML_Template_process_file('../xml/attribute4.xml', array(
        '#foo/value' => 'bar',
 ));
-print $doc->dump_mem();
+print $doc->saveXML();
 ?>

diff --git a/php5/clone.php b/php5/clone.php
index 2bbd2665473f84878a5f5ee8f8a6a791123e1d20..28b4442becc64d1574105eea37018d8f493c1de1 100644 (file)
--- a/php5/clone.php
+++ b/php5/clone.php
@@ -10,5 +10,5 @@ $doc = XML_Template_process_file('../xml/clone.xml', array(
                array( 'li' => 'Warm, woolen mittens' ) 
        )
 ));
-print $doc->dump_mem();
+print $doc->saveXML();
 ?>

diff --git a/php5/include.php b/php5/include.php
index 8819ef72e1e6cdb0d6647c1799ef62942976e161..79b15c37325d06f1da40c3189f7d6ebef94291ef 100644 (file)
--- a/php5/include.php
+++ b/php5/include.php
@@ -9,5 +9,5 @@ $master = XML_Template_process_file('../xml/master.xml', array(
        'h1' => 'Nice heading here',
        'contents' => $doc
 ));
-print $master->dump_mem();
+print $master->saveXML();
 ?>

diff --git a/php5/namespace.php b/php5/namespace.php
index 35bb707ce2817035400d4cae977d9c929d331c64..023671182e7021e6a41fab2105275f3f852c478d 100644 (file)
--- a/php5/namespace.php
+++ b/php5/namespace.php
@@ -8,5 +8,5 @@ $doc = XML_Template_process_file('../xml/namespace.xml', array(
        'tagname' => 'foo',
        '#moretest' => 'bar'
 ));
-print $doc->dump_mem();
+print $doc->saveXML();
 ?>

diff --git a/php5/namespace2.php b/php5/namespace2.php
index 6ff09fd07da50c651fdd5c25b0efe1a7e10feb93..57c2778de1697b38a8529b6fa60caa5320ec645a 100644 (file)
--- a/php5/namespace2.php
+++ b/php5/namespace2.php
@@ -5,5 +5,5 @@ $doc = XML_Template_process_file('../xml/namespace2.xml', array(
        'title' => 'Namespace tests',
        '#hello' => 'Replaced.',
 ));
-print $doc->dump_mem();
+print $doc->saveXML();
 ?>

diff --git a/php5/passthru.php b/php5/passthru.php
index 95dd1bebfe17512678a7b7c5aced2186cb31ad9e..49e1b61a7dbedf34fe93ee1c412586dd723739e6 100644 (file)
--- a/php5/passthru.php
+++ b/php5/passthru.php
@@ -2,5 +2,5 @@
 require('xml-template.php');
 
 $doc = XML_Template_process_file('../xml/passthru.xml', array()); 
-print $doc->dump_mem();
+print $doc->saveXML();
 ?>

diff --git a/php5/simple.php b/php5/simple.php
index 10e73f1e155d0ca4a7116c7e6e4d2c758caf792f..afcdc34f6a6830ee7ebdf053e021a7132804ebf8 100644 (file)
--- a/php5/simple.php
+++ b/php5/simple.php
@@ -5,5 +5,5 @@ $doc = XML_Template_process_file('../xml/simple.xml', array(
        'title' => 'A very basic example',
        '#hello' => 'Hello world!'
 ));
-print $doc->dump_mem();
+print $doc->saveXML();
 ?>

diff --git a/php5/structure.php b/php5/structure.php
index adb153e1109a8b42c3649b5420e835fdbe8830b1..ebf72354d61d1e2a703d55c8b2f7bdb81c6ceb1b 100644 (file)
--- a/php5/structure.php
+++ b/php5/structure.php
@@ -8,5 +8,5 @@ $doc = XML_Template_process_file('../xml/structure.xml', array(
                array( '#inner' => 'Three' ),
        )
 ));
-print $doc->dump_mem();
+print $doc->saveXML();
 ?>

diff --git a/php5/xml-template.php b/php5/xml-template.php
index 6fbf4bf8962c246740c619045985d176be34dae4..911a6417064b587945c609d0e62ecfd2f6706ebb 100644 (file)
--- a/php5/xml-template.php
+++ b/php5/xml-template.php
@@ -2,7 +2,8 @@
 
 function XML_Template_process_file($filename, $obj, $clean = 1)
 {
-       $doc = domxml_open_file($filename);
+       $doc = new DOMDocument;
+       $doc->load($filename);
        XML_Template_process($doc, $obj, $clean);
        return $doc;
 }
@@ -10,39 +11,39 @@ function XML_Template_process_file($filename, $obj, $clean = 1)
 function XML_Template_process($node, $obj, $clean = 1)
 {
        if (is_a($obj, 'domnode')) {                          # overwrite
-               foreach ($node->child_nodes() as $child) {
-                       $node->remove_child($child);
+               foreach ($node->childNodes as $child) {
+                       $node->removeChild($child);
                }
 
                if (is_a($obj, 'domdocument')) {
                        $obj = $obj->document_element();
                }
 
-               $newobj = own_clone_node($obj, $node->owner_document());
+               $newobj = own_clone_node($obj, $node->ownerDocument);
                $node->append_child($newobj);
 
                XML_Template_process($newobj, array(), $clean);
        } else if (!is_array($obj)) {                         # overwrite
-               foreach ($node->child_nodes() as $child) {
-                       $node->remove_child($child);
+               foreach ($node->childNodes as $child) {
+                       $node->removeChild($child);
                }
-               $doc = $node->owner_document();
-               $node->add_child($doc->create_text_node($obj));
+               $doc = $node->ownerDocument;
+               $node->appendChild($doc->createTextNode($obj));
        } else if (is_associative_array($obj)) {              # substitute
-               foreach ($node->child_nodes() as $child) {
+               foreach ($node->childNodes as $child) {
                        $processed = false;
 
-                       if ($child->node_type() == XML_ELEMENT_NODE) {
+                       if ($child->nodeType == XML_ELEMENT_NODE) {
                                unset($id);
 
-                               $tag = $child->node_name();
-                               $attrs = $child->attributes();
+                               $tag = $child->nodeName;
+                               $attrs = $child->attributes;
                                if (isset($attrs)) {
-                                       foreach ($child->attributes() as $attr) {
-                                               if ($attr->namespace_uri() == 'http://template.sesse.net/' && $attr->name() == 'id') {
-                                                       $id = $attr->value();
+                                       foreach ($child->attributes as $attr) {
+                                               if ($attr->namespaceURI == 'http://template.sesse.net/' && $attr->name == 'id') {
+                                                       $id = $attr->value;
                                                        if ($clean) {
-                                                               $attr->unlink_node();
+                                                               # $attr->unlinkNode();
                                                        }
                                                }
                                        }
@@ -72,12 +73,12 @@ function XML_Template_process($node, $obj, $clean = 1)
                        }
                }
        } else {                                                # repeat
-               $doc = $node->owner_document();
-               $frag = $doc->create_element("temporary-fragment");    # ugh
+               $doc = $node->ownerDocument;
+               $frag = $doc->createElement("temporary-fragment");    # ugh
 
-               foreach ($node->child_nodes() as $child) {
+               foreach ($node->childNodes as $child) {
                        $frag->append_child($child);
-                       $node->remove_child($child);
+                       $node->removeChild($child);
                }
 
                foreach ($obj as $instance) {
@@ -85,7 +86,7 @@ function XML_Template_process($node, $obj, $clean = 1)
                                continue;
                        }
 
-                       $newnode = own_clone_node($frag, $frag->owner_document());
+                       $newnode = own_clone_node($frag, $frag->ownerDocument);
                        $node->append_child($newnode);
                        XML_Template_process($newnode, $instance, $clean);
                        if ($clean) {
@@ -95,14 +96,14 @@ function XML_Template_process($node, $obj, $clean = 1)
 
                # remove all the <fragment> tags
 
-               foreach ($node->child_nodes() as $child) {
-                       if ($child->name() != 'temporary-fragment') {
+               foreach ($node->childNodes as $child) {
+                       if ($child->name != 'temporary-fragment') {
                                continue;
                        }
-                       foreach ($child->child_nodes() as $child2) {
+                       foreach ($child->childNodes as $child2) {
                                $node->append_child($child2);
                        }
-                       $node->remove_child($child);
+                       $node->removeChild($child);
                }       
        }
 
@@ -113,20 +114,20 @@ function XML_Template_process($node, $obj, $clean = 1)
 
 function XML_Template_clean($node)
 {
-       if ($node->node_type() == XML_ELEMENT_NODE) {
-               if ($node->namespace_uri() != 'http://template.sesse.net/') {
+       if ($node->nodeType == XML_ELEMENT_NODE) {
+               if ($node->namespaceURI != 'http://template.sesse.net/') {
                        return;
                }
 
                # as this is a dummy node, we want to remove it and move everything further up
                # after we've done any required replacements
-               $doc = $node->owner_document();
+               $doc = $node->ownerDocument;
                $parent = $node->parent_node();
-               foreach ($node->child_nodes() as $child) {
-                       $node->remove_child($child);
+               foreach ($node->childNodes as $child) {
+                       $node->removeChild($child);
                        $node->insert_before($child, $node);
                }
-               $parent->remove_child($node);
+               $parent->removeChild($node);
        }
 }
 
@@ -150,26 +151,26 @@ function XML_Template_alternate($tag, $array, $elems)
 function own_clone_node($node, $doc)
 {
        // we only need these two
-       if ($node->node_type() == XML_ELEMENT_NODE) {
-               $nsuri = $node->namespace_uri();
+       if ($node->nodeType == XML_ELEMENT_NODE) {
+               $nsuri = $node->namespaceURI;
                if (isset($nsuri)) {
-                       $newnode = $doc->create_element_ns($node->namespace_uri(), $node->node_name(), $node->prefix());
+                       $newnode = $doc->createElementNS($node->namespaceURI, $node->nodeName, $node->prefix());
                } else {
-                       $newnode = $doc->create_element($node->node_name());
+                       $newnode = $doc->createElement($node->nodeName);
                }
                
-               $attrs = $node->attributes();
+               $attrs = $node->attributes;
                if (isset($attrs)) {
-                       foreach ($node->attributes() as $attr) {
-                               $attr2 = $doc->create_attribute($attr->name(), $attr->value());
-                               $nsuri = $attr->namespace_uri();
+                       foreach ($node->attributes as $attr) {
+                               $attr2 = $doc->createAttribute($attr->name, $attr->value);
+                               $nsuri = $attr->namespaceURI;
                                if (isset($nsuri)) {
-                                       $attr2->set_namespace($nsuri, $attr->prefix());
+                                       $attr2->set_namespace($nsuri, $attr->prefix);
                                }
                                $newnode->append_child($attr2);
                        }
                }
-               foreach ($node->child_nodes() as $child) {
+               foreach ($node->childNodes as $child) {
                        $newnode->append_child(own_clone_node($child, $doc));
                }
                return $newnode;