highwire / opensource-php-BetterDOMDocument

src/DOMList.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
   }
   
   // Provides read-only access to $length and $dom
-  public function __get ($prop) {
+  public function __get($prop) {
     if ($prop == 'length') {
       return $this->length;
     }

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);

Spacing +15 added lines, -15 removed lines

@@ -40,7 +40,7 @@ 
 
     $this->setErrorChecking($error_checking);
     
-    if(is_object($xml)){
+    if (is_object($xml)) {
       if (is_a($xml, 'DOMElement')) {
         $this->appendChild($this->importNode($xml, true));
       }
@@ -61,7 +61,7 @@ 
         @$this->loadXML($xml, LIBXML_COMPACT);
       }
       else if (!$this->loadXML($xml, LIBXML_COMPACT)) {
-        trigger_error('BetterDOMDocument\DOMDoc: Could not load: ' . htmlspecialchars($xml), E_USER_WARNING);
+        trigger_error('BetterDOMDocument\DOMDoc: Could not load: '.htmlspecialchars($xml), E_USER_WARNING);
       }
     }
 
@@ -326,7 +326,7 @@ 
         $prefix = $parts[0]; 
         if (isset($namespaces[$prefix])) {
           if (!strpos($root_match[0], "xmlns:$prefix")) {
-            $new_root .= " xmlns:$prefix='" . $namespaces[$prefix] . "'";             
+            $new_root .= " xmlns:$prefix='".$namespaces[$prefix]."'";             
           }
         }
       }
@@ -335,7 +335,7 @@ 
 
     $dom = new DOMDoc($xml, $this->auto_ns);
     if (!$dom->documentElement) {
-      trigger_error('BetterDomDocument\DOMDoc Error: Invalid XML: ' . $xml);
+      trigger_error('BetterDomDocument\DOMDoc Error: Invalid XML: '.$xml);
     }
     $element = $dom->documentElement;
     
@@ -456,7 +456,7 @@ 
     $this->createContext($newnode, 'xml');
     $this->createContext($context, 'xpath');
     
-    if (!$context){
+    if (!$context) {
       return FALSE;
     }
     
@@ -543,7 +543,7 @@ 
     
     if ($node) {
       if (is_array($node) || get_class($node) == 'BetterDOMDocument\DOMList') {
-        foreach($node as $item) {
+        foreach ($node as $item) {
           $this->remove($item);
         }
       }
@@ -615,7 +615,7 @@ 
       $xsl = '
         <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
           <xsl:template match="*">
-            <xsl:element name="' . $prefix . ':{local-name()}" namespace="' . $url . '">
+            <xsl:element name="' . $prefix.':{local-name()}" namespace="'.$url.'">
              <xsl:copy-of select="@*"/>
              <xsl:apply-templates/>
             </xsl:element>
@@ -627,7 +627,7 @@ 
     }
     else {
       // @@TODO: Report the correct calling file and number
-      throw new Exception("Changing the namespace of a " . get_class($node) . " is not supported");
+      throw new Exception("Changing the namespace of a ".get_class($node)." is not supported");
     }
   }
 
@@ -702,7 +702,7 @@ 
       foreach ($this->getNamespaces() as $prefix => $url) {
         $namespaces = '';
         if ($prefix != 'xsl' && $prefix != 'xlink') {
-          $namespaces .= 'xmlns:' . $prefix . '="' . $url. '" ';
+          $namespaces .= 'xmlns:'.$prefix.'="'.$url.'" ';
         }
         $xslOptions = str_replace("||namespaces||", $namespaces, $xslOptions);
       }
@@ -741,8 +741,8 @@ 
 
     // Copy namespace prefixes
     foreach ($this->ns as $prefix => $namespace) {
-      if (!$context->hasAttribute('xmlns:' . $prefix)) {
-        $context->setAttribute('xmlns:' . $prefix, $namespace);
+      if (!$context->hasAttribute('xmlns:'.$prefix)) {
+        $context->setAttribute('xmlns:'.$prefix, $namespace);
       }
     }
     
@@ -752,7 +752,7 @@ 
       // The types listed are html "void" elements. 
       // 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);
+      return preg_replace('/'.$pattern.'/', '<$1$2/>', $output);
     }
     else {
       return $this->saveXML($context, LIBXML_NOEMPTYTAG);
@@ -807,7 +807,7 @@ 
 
     // If it's an "XML" document, then get namespaces via xpath
     $xpath = new \DOMXPath($this);
-    foreach($xpath->query('namespace::*') as $namespace) {
+    foreach ($xpath->query('namespace::*') as $namespace) {
       if (!empty($namespace->prefix)) {
         if ($namespace->prefix != 'xml' && $namespace->nodeValue != 'http://www.w3.org/XML/1998/namespace') {
           $this->registerNamespace($namespace->prefix, $namespace->nodeValue);
@@ -845,8 +845,8 @@ 
             } 
           }
         }
-        else if (substr($attr->name,0,6) == 'xmlns:') {
-          $prefix = substr($attr->name,6);
+        else if (substr($attr->name, 0, 6) == 'xmlns:') {
+          $prefix = substr($attr->name, 6);
           $this->registerNamespace($prefix, $attr->value); 
         }
       }