Swap to XML_Util2

pear · Apr 20, 2012 · 2bfc467 · 2bfc467
1 parent 3c28640
commit 2bfc467
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/XUL/Document.php b/XUL/Document.php
@@ -26,9 +26,9 @@
  */
 
 /**
- * uses XML_Util to create document
+ * uses XML_Util2 to create document
  */
- require_once 'XML/Util.php';
+ require_once 'XML/Util2.php';
 
 /**
  * no filename given
@@ -270,7 +270,8 @@ function save( $filename = null )
     */
     function serialize()
     {
-        $doc = XML_Util::getXMLDeclaration('1.0', $this->_encoding) . "\n";
+        $util = new XML_Util2();
+        $doc = $util->getXMLDeclaration('1.0', $this->_encoding) . "\n";
 
         /**
          * add the DTD
@@ -281,7 +282,7 @@ function serialize()
             } else {
                 $root = '';
             }
-            $doc .= XML_Util::getDocTypeDeclaration( $root, $this->_dtd ) . "\n";
+            $doc .= $util->getDocTypeDeclaration( $root, $this->_dtd ) . "\n";
         }
 
         /**

diff --git a/XUL/Element.php b/XUL/Element.php
@@ -439,6 +439,7 @@ function toXML()
     */
     function serialize()
     {
+        $util = new XML_Util2();
         $content = '';
 
         if (empty($this->_ns)) {
@@ -451,7 +452,7 @@ function serialize()
             if ($this->cdata !== null) {
                 $content = $this->cdata;
                 if ($this->replaceEntities) {
-                    $content = XML_Util::replaceEntities($content);
+                    $content = $util->replaceEntities($content);
                 }
             }
         } else {
@@ -470,7 +471,7 @@ function serialize()
             $nsUri = null;
         }
 
-        return XML_Util::createTag(
+        return $util->createTag(
                                     $el,
                                     $this->attributes,
                                     $content,

diff --git a/package.xml b/package.xml
@@ -159,7 +159,7 @@ XML_XUL provides a API similar to DOM to create XUL applications. There is a PHP
     <min>1.4.0b1</min>
    </pearinstaller>
    <package>
-    <name>XML_Util</name>
+    <name>XML_Util2</name>
     <channel>pear.php.net</channel>
     <min>0.5.2</min>
    </package>