highwire / opensource-php-BetterDOMDocument

src/DOMList.php

Braces +4 added lines, -5 removed lines

@@ -24,11 +24,9 @@ 
   public function __get ($prop) {
     if ($prop == 'length') {
       return $this->length;
-    }
-    else if ($prop == 'dom') {
+    } else if ($prop == 'dom') {
       return $this->dom;
-    }
-    else {
+    } else {
       return null;
     }
   }
@@ -56,8 +54,9 @@ 
   public function item($index) {
     if (isset($this->array[$index])) {
       return $this->array[$index];
+    } else {
+      return FALSE;
     }
-    else return FALSE;
   }
   
   public function count() {

src/DOMDoc.php

Doc Comments +14 added lines, -7 removed lines

@@ -22,14 +22,14 @@ 
    *  $xml can either be an XML string, a DOMDocument, or a DOMElement. 
    *  You can also pass FALSE or NULL (or omit it) and load XML later using loadXML or loadHTML
    * 
-   * @param mixed $auto_register_namespaces 
+   * @param boolean $auto_register_namespaces 
    *  Auto-register namespaces. All namespaces in the root element will be registered for use in xpath queries.
    *  Namespaces that are not declared in the root element will not be auto-registered
    *  Defaults to TRUE (Meaning it will auto register all auxiliary namespaces but not the default namespace).
    *  Pass a prefix string to automatically register the default namespace.
    *  Pass FALSE to disable auto-namespace registeration
    * 
-   * @param bool $error_checking
+   * @param string|boolean $error_checking
    *  Can be 'strict', 'warning', or 'none. Defaults to 'strict'.
    *  'none' supresses all errors
    *  'warning' is the default behavior in DOMDocument
@@ -487,10 +487,10 @@ 
   /**
    * Given a pair of nodes, replace the first with the second
    * 
-   * @param mixed $node
+   * @param \DOMElement $node
    *  Node to be replaced. Can either be an xpath string or a DOMDocument (or even a DOMNode).
    * 
-   * @param mixed $replace
+   * @param \DOMElement $replace
    *  Replace $node with $replace. Replace can be an XML string, or a DOMNode
    * 
    * @return mixed
@@ -550,7 +550,7 @@ 
    *   $context can either be an xpath string, or a DOMElement. Ommiting it
    *   results in transforming the entire document
    * 
-   * @return a new DOMDoc
+   * @return DOMDoc new DOMDoc
    */
   public function tranform($xsl, $context = NULL) {
     if (!$context) {
@@ -632,7 +632,7 @@ 
    *     it will transform all elements with xlink:type = simple into a <a href> element. 
    *     Alternatively you may specify your own xpath for selecting which elements get transformed
    *     into <a href> tags. 
-   * @return HTML string
+   * @return string string
    */  
   public function asHTML($context = NULL, $options = array()) {
     $xslSimple = '
@@ -714,7 +714,7 @@ 
    *   $context can either be an xpath string, or a DOMElement. Ommiting it
    *   results in outputting the entire document
    * 
-   * @return XML string
+   * @return string string
    */  
   public function out($context = NULL) {
     $this->createContext($context, 'xpath');
@@ -749,6 +749,9 @@ 
     return $this->out();
   }
 
+  /**
+   * @param string|boolean $error_checking
+   */
   public function setErrorChecking($error_checking) {
     // Check up error-checking
     if ($error_checking == FALSE) {
@@ -778,6 +781,10 @@ 
     return boolval($success);
   }
 
+  /**
+   * @param string $source
+   * @param integer $options
+   */
   public function loadXML($source, $options = NULL) {
     $success = parent::loadXML($source, $options);
     $this->AutoRegisterNamespace(TRUE);

Braces +24 added lines, -48 removed lines

@@ -55,12 +55,10 @@ 
           $this->appendChild($this->importNode($xml->documentElement, true));
         }
       }
-    }
-    else if (is_string($xml) && !empty($xml)) {
+    } else if (is_string($xml) && !empty($xml)) {
       if ($this->error_checking == 'none') {
         @$this->loadXML($xml, LIBXML_COMPACT);
-      }
-      else if (!$this->loadXML($xml, LIBXML_COMPACT)) {
+      } else if (!$this->loadXML($xml, LIBXML_COMPACT)) {
         trigger_error('BetterDOMDocument\DOMDoc: Could not load: ' . htmlspecialchars($xml), E_USER_WARNING);
       }
     }
@@ -115,8 +113,7 @@ 
   public function lookupURL($prefix) {
     if (isset($this->ns[$prefix])) {
       return $this->ns[$prefix];
-    }
-    else {
+    } else {
       return FALSE;
     }
   }
@@ -150,15 +147,13 @@ 
 
     if ($context) {
       $result = $xob->query($xpath, $context);
-    }
-    else {
+    } else {
       $result = $xob->query($xpath);
     }
 
     if ($result) {
       return new DOMList($result, $this);
-    }
-    else {
+    } else {
       return FALSE;
     }
   }
@@ -182,8 +177,7 @@ 
     
     if (empty($result) || !count($result)) {
       return FALSE;
-    }
-    else {
+    } else {
       return $result->item(0);
     }
   }
@@ -262,13 +256,11 @@ 
       if ($context->hasChildNodes()) {
         if ($context->childNodes->length == 1 && $context->firstChild->nodeType == XML_TEXT_NODE) {
           $array['#text'] = $context->firstChild->nodeValue;
-        }
-        else {
+        } else {
           foreach ($context->childNodes as $childNode) {
             if ($childNode->nodeType == XML_ELEMENT_NODE) {
               $array[$childNode->nodeName][] = $this->getArray($raw, $childNode);
-            }
-            elseif ($childNode->nodeType == XML_CDATA_SECTION_NODE) {
+            } elseif ($childNode->nodeType == XML_CDATA_SECTION_NODE) {
               $array['#text'] = $childNode->textContent;
             }
           }
@@ -300,8 +292,7 @@ 
     $matches = array();
     if (preg_match($pattern, $this->saveXML($context), $matches)) {
       return $matches[1];
-    }
-    else {
+    } else {
       return '';
     }
   }
@@ -371,15 +362,13 @@ 
   
     if ($newnode->ownerDocument === $this) {
       $appendnode = $newnode;
-    }
-    else {
+    } else {
       if (is_a($newnode, 'BetterDOMDocument\DOMDoc')) {
         foreach ($newnode->ns as $prefix => $uri) {
           $this->registerNamespace($prefix, $uri);
         }
         $newnode = $newnode->documentElement;
-      }
-      else if (is_a($newnode, 'DOMDocument')) {
+      } else if (is_a($newnode, 'DOMDocument')) {
         $newnode = $newnode->documentElement;
       }
       $appendnode = $this->importNode($newnode, true);
@@ -463,20 +452,17 @@ 
     if ($context->nextSibling) { 
       // $context has an immediate sibling : insert newnode before this one 
       return $context->parentNode->insertBefore($newnode, $context->nextSibling); 
-    }
-    else { 
+    } else { 
       // $context has no sibling next to it : insert newnode as last child of it's parent 
       if ($newnode->ownerDocument === $this) {
         $appendnode = $newnode;
-      }
-      else {
+      } else {
         if (is_a($newnode, 'BetterDOMDocument\DOMDoc')) {
           foreach ($newnode->ns as $prefix => $uri) {
             $this->registerNamespace($prefix, $uri);
           }
           $newnode = $newnode->documentElement;
-        }
-        else if (is_a($newnode, 'DOMDocument')) {
+        } else if (is_a($newnode, 'DOMDocument')) {
           $newnode = $newnode->documentElement;
         }
         $appendnode = $this->importNode($newnode, true);
@@ -546,11 +532,9 @@ 
         foreach($node as $item) {
           $this->remove($item);
         }
-      }
-      else if (get_class($node) == 'DOMNodeList') {
+      } else if (get_class($node) == 'DOMNodeList') {
         $this->remove(new DOMList($node, $this));
-      }
-      else {
+      } else {
         $parent = $node->parentNode;
         $parent->removeChild($node);
       }
@@ -572,8 +556,7 @@ 
   public function tranform($xsl, $context = NULL) {
     if (!$context) {
       $doc = $this;
-    }
-    else {
+    } else {
       if (is_string($context)) {
         $context = $this->xpathSingle($context);
       }
@@ -624,8 +607,7 @@ 
 
       $transformed = $this->tranform($xsl, $node);
       return $this->replace($node, $transformed->documentElement);   
-    }
-    else {
+    } else {
       // @@TODO: Report the correct calling file and number
       throw new Exception("Changing the namespace of a " . get_class($node) . " is not supported");
     }
@@ -710,14 +692,12 @@ 
       // Add in xlink options
       if ($options['xlink'] === TRUE) {
         $options['xlink'] = "@xlink:type = 'simple'";
-      }
-      else if (empty($options['xlink'])) {
+      } else if (empty($options['xlink'])) {
         $options['xlink'] = "false()";
       }
       $xslOptions = str_replace("||xlink||", $options['xlink'], $xslOptions);
       $transformed = $this->tranform($xslOptions, $context);
-    }
-    else {
+    } else {
       $transformed = $this->tranform($xslSimple, $context);
     }
     
@@ -753,8 +733,7 @@ 
       // Find any of these elements that have no child nodes and are therefore candidates for self-closing, replace them with a self-closed version. 
       $pattern = '<(area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)(\b[^<]*)><\/\1>';
       return preg_replace('/' . $pattern . '/', '<$1$2/>', $output);
-    }
-    else {
+    } else {
       return $this->saveXML($context, LIBXML_NOEMPTYTAG);
     }
   }
@@ -770,8 +749,7 @@ 
     // Check up error-checking
     if ($error_checking == FALSE) {
       $this->error_checking = 'none';
-    }
-    else {
+    } else {
       $this->error_checking = $error_checking;
     }
     if ($this->error_checking != 'strict') {
@@ -812,8 +790,7 @@ 
         if ($namespace->prefix != 'xml' && $namespace->nodeValue != 'http://www.w3.org/XML/1998/namespace') {
           $this->registerNamespace($namespace->prefix, $namespace->nodeValue);
         }
-      }
-      else {
+      } else {
         $this->default_ns = $namespace->nodeValue;
         if (is_string($auto_register_namespaces)) {
           $this->registerNamespace($auto_register_namespaces, $namespace->nodeValue);
@@ -844,8 +821,7 @@ 
               $this->registerNamespace($tagname, $attr->value);
             } 
           }
-        }
-        else if (substr($attr->name,0,6) == 'xmlns:') {
+        } else if (substr($attr->name,0,6) == 'xmlns:') {
           $prefix = substr($attr->name,6);
           $this->registerNamespace($prefix, $attr->value); 
         }