silverstripe / silverstripe-html5

thirdparty/html5lib/HTML5/Data.php

Indentation +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
             // set up bits for UTF-8
             $x = ($code & 0x3F) | 0x80;
             if ($code < 0x800) {
-               $y = (($code & 0x7FF) >> 6) | 0xC0;
+                $y = (($code & 0x7FF) >> 6) | 0xC0;
             } else {
                 $y = (($code & 0xFC0) >> 6) | 0x80;
                 if($code < 0x10000) {

Braces +14 added lines, -5 removed lines

@@ -56,8 +56,11 @@ 
      * reference.
      */
     public static function getRealCodepoint($ref) {
-        if (!isset(self::$realCodepointTable[$ref])) return false;
-        else return self::$realCodepointTable[$ref];
+        if (!isset(self::$realCodepointTable[$ref])) {
+            return false;
+        } else {
+            return self::$realCodepointTable[$ref];
+        }
     }
 
     public static function getNamedCharacterReferences() {
@@ -103,9 +106,15 @@ 
         }
         // set up the actual character
         $ret = '';
-        if($w) $ret .= chr($w);
-        if($z) $ret .= chr($z);
-        if($y) $ret .= chr($y);
+        if($w) {
+            $ret .= chr($w);
+        }
+        if($z) {
+            $ret .= chr($z);
+        }
+        if($y) {
+            $ret .= chr($y);
+        }
         $ret .= chr($x);
 
         return $ret;

thirdparty/html5lib/HTML5/Tokenizer.php

Indentation +1 added lines, -1 removed lines

@@ -156,7 +156,7 @@
                             (
                                 $this->content_model === self::RCDATA ||
                                 $this->content_model === self::CDATA
-                             ) &&
+                                ) &&
                              !$escape
                         );
                     $gt_cond = 

Braces +26 added lines, -9 removed lines

@@ -86,8 +86,11 @@ 
      */
     public function __construct($data, $builder = null) {
         $this->stream = new HTML5_InputStream($data);
-        if (!$builder) $this->tree = new HTML5_TreeBuilder;
-        else $this->tree = $builder;
+        if (!$builder) {
+            $this->tree = new HTML5_TreeBuilder;
+        } else {
+            $this->tree = $builder;
+        }
         $this->content_model = self::PCDATA;
     }
 
@@ -135,7 +138,9 @@ 
                     /* Consume the next input character */
                     $char = $this->stream->char();
                     $lastFourChars .= $char;
-                    if (strlen($lastFourChars) > 4) $lastFourChars = substr($lastFourChars, -4);
+                    if (strlen($lastFourChars) > 4) {
+                        $lastFourChars = substr($lastFourChars, -4);
+                    }
 
                     // see below for meaning
                     $hyp_cond = 
@@ -248,7 +253,9 @@ 
                             'data' => $char . $chars
                         ));
                         $lastFourChars .= $chars;
-                        if (strlen($lastFourChars) > 4) $lastFourChars = substr($lastFourChars, -4);
+                        if (strlen($lastFourChars) > 4) {
+                            $lastFourChars = substr($lastFourChars, -4);
+                        }
 
                     } else {
                         /* Anything else
@@ -257,10 +264,18 @@ 
                         as a single character token. Stay in the data state. */
                         
                         $mask = '';
-                        if ($hyp_cond) $mask .= '-';
-                        if ($amp_cond) $mask .= '&';
-                        if ($lt_cond)  $mask .= '<';
-                        if ($gt_cond)  $mask .= '>';
+                        if ($hyp_cond) {
+                            $mask .= '-';
+                        }
+                        if ($amp_cond) {
+                            $mask .= '&';
+                        }
+                        if ($lt_cond) {
+                            $mask .= '<';
+                        }
+                        if ($gt_cond) {
+                            $mask .= '>';
+                        }
 
                         if ($mask === '') {
                             $chars = $this->stream->remainingChars();
@@ -274,7 +289,9 @@ 
                         ));
 
                         $lastFourChars .= $chars;
-                        if (strlen($lastFourChars) > 4) $lastFourChars = substr($lastFourChars, -4);
+                        if (strlen($lastFourChars) > 4) {
+                            $lastFourChars = substr($lastFourChars, -4);
+                        }
 
                         $state = 'data';
                     }

thirdparty/html5lib/HTML5/TreeBuilder.php

Indentation +62 added lines, -62 removed lines

@@ -232,76 +232,76 @@
             $public = is_null($token['public']) ? false : strtolower($token['public']);
             $system = is_null($token['system']) ? false : strtolower($token['system']);
             $publicStartsWithForQuirks = array(
-             "+//silmaril//dtd html pro v0r11 19970101//",
-             "-//advasoft ltd//dtd html 3.0 aswedit + extensions//",
-             "-//as//dtd html 3.0 aswedit + extensions//",
-             "-//ietf//dtd html 2.0 level 1//",
-             "-//ietf//dtd html 2.0 level 2//",
-             "-//ietf//dtd html 2.0 strict level 1//",
-             "-//ietf//dtd html 2.0 strict level 2//",
-             "-//ietf//dtd html 2.0 strict//",
-             "-//ietf//dtd html 2.0//",
-             "-//ietf//dtd html 2.1e//",
-             "-//ietf//dtd html 3.0//",
-             "-//ietf//dtd html 3.2 final//",
-             "-//ietf//dtd html 3.2//",
-             "-//ietf//dtd html 3//",
-             "-//ietf//dtd html level 0//",
-             "-//ietf//dtd html level 1//",
-             "-//ietf//dtd html level 2//",
-             "-//ietf//dtd html level 3//",
-             "-//ietf//dtd html strict level 0//",
-             "-//ietf//dtd html strict level 1//",
-             "-//ietf//dtd html strict level 2//",
-             "-//ietf//dtd html strict level 3//",
-             "-//ietf//dtd html strict//",
-             "-//ietf//dtd html//",
-             "-//metrius//dtd metrius presentational//",
-             "-//microsoft//dtd internet explorer 2.0 html strict//",
-             "-//microsoft//dtd internet explorer 2.0 html//",
-             "-//microsoft//dtd internet explorer 2.0 tables//",
-             "-//microsoft//dtd internet explorer 3.0 html strict//",
-             "-//microsoft//dtd internet explorer 3.0 html//",
-             "-//microsoft//dtd internet explorer 3.0 tables//",
-             "-//netscape comm. corp.//dtd html//",
-             "-//netscape comm. corp.//dtd strict html//",
-             "-//o'reilly and associates//dtd html 2.0//",
-             "-//o'reilly and associates//dtd html extended 1.0//",
-             "-//o'reilly and associates//dtd html extended relaxed 1.0//",
-             "-//spyglass//dtd html 2.0 extended//",
-             "-//sq//dtd html 2.0 hotmetal + extensions//",
-             "-//sun microsystems corp.//dtd hotjava html//",
-             "-//sun microsystems corp.//dtd hotjava strict html//",
-             "-//w3c//dtd html 3 1995-03-24//",
-             "-//w3c//dtd html 3.2 draft//",
-             "-//w3c//dtd html 3.2 final//",
-             "-//w3c//dtd html 3.2//",
-             "-//w3c//dtd html 3.2s draft//",
-             "-//w3c//dtd html 4.0 frameset//",
-             "-//w3c//dtd html 4.0 transitional//",
-             "-//w3c//dtd html experimental 19960712//",
-             "-//w3c//dtd html experimental 970421//",
-             "-//w3c//dtd w3 html//",
-             "-//w3o//dtd w3 html 3.0//",
-             "-//webtechs//dtd mozilla html 2.0//",
-             "-//webtechs//dtd mozilla html//",
+                "+//silmaril//dtd html pro v0r11 19970101//",
+                "-//advasoft ltd//dtd html 3.0 aswedit + extensions//",
+                "-//as//dtd html 3.0 aswedit + extensions//",
+                "-//ietf//dtd html 2.0 level 1//",
+                "-//ietf//dtd html 2.0 level 2//",
+                "-//ietf//dtd html 2.0 strict level 1//",
+                "-//ietf//dtd html 2.0 strict level 2//",
+                "-//ietf//dtd html 2.0 strict//",
+                "-//ietf//dtd html 2.0//",
+                "-//ietf//dtd html 2.1e//",
+                "-//ietf//dtd html 3.0//",
+                "-//ietf//dtd html 3.2 final//",
+                "-//ietf//dtd html 3.2//",
+                "-//ietf//dtd html 3//",
+                "-//ietf//dtd html level 0//",
+                "-//ietf//dtd html level 1//",
+                "-//ietf//dtd html level 2//",
+                "-//ietf//dtd html level 3//",
+                "-//ietf//dtd html strict level 0//",
+                "-//ietf//dtd html strict level 1//",
+                "-//ietf//dtd html strict level 2//",
+                "-//ietf//dtd html strict level 3//",
+                "-//ietf//dtd html strict//",
+                "-//ietf//dtd html//",
+                "-//metrius//dtd metrius presentational//",
+                "-//microsoft//dtd internet explorer 2.0 html strict//",
+                "-//microsoft//dtd internet explorer 2.0 html//",
+                "-//microsoft//dtd internet explorer 2.0 tables//",
+                "-//microsoft//dtd internet explorer 3.0 html strict//",
+                "-//microsoft//dtd internet explorer 3.0 html//",
+                "-//microsoft//dtd internet explorer 3.0 tables//",
+                "-//netscape comm. corp.//dtd html//",
+                "-//netscape comm. corp.//dtd strict html//",
+                "-//o'reilly and associates//dtd html 2.0//",
+                "-//o'reilly and associates//dtd html extended 1.0//",
+                "-//o'reilly and associates//dtd html extended relaxed 1.0//",
+                "-//spyglass//dtd html 2.0 extended//",
+                "-//sq//dtd html 2.0 hotmetal + extensions//",
+                "-//sun microsystems corp.//dtd hotjava html//",
+                "-//sun microsystems corp.//dtd hotjava strict html//",
+                "-//w3c//dtd html 3 1995-03-24//",
+                "-//w3c//dtd html 3.2 draft//",
+                "-//w3c//dtd html 3.2 final//",
+                "-//w3c//dtd html 3.2//",
+                "-//w3c//dtd html 3.2s draft//",
+                "-//w3c//dtd html 4.0 frameset//",
+                "-//w3c//dtd html 4.0 transitional//",
+                "-//w3c//dtd html experimental 19960712//",
+                "-//w3c//dtd html experimental 970421//",
+                "-//w3c//dtd w3 html//",
+                "-//w3o//dtd w3 html 3.0//",
+                "-//webtechs//dtd mozilla html 2.0//",
+                "-//webtechs//dtd mozilla html//",
             );
             $publicSetToForQuirks = array(
-             "-//w3o//dtd w3 html strict 3.0//",
-             "-/w3c/dtd html 4.0 transitional/en",
-             "html",
+                "-//w3o//dtd w3 html strict 3.0//",
+                "-/w3c/dtd html 4.0 transitional/en",
+                "html",
             );
             $publicStartsWithAndSystemForQuirks = array(
-             "-//w3c//dtd html 4.01 frameset//",
-             "-//w3c//dtd html 4.01 transitional//",
+                "-//w3c//dtd html 4.01 frameset//",
+                "-//w3c//dtd html 4.01 transitional//",
             );
             $publicStartsWithForLimitedQuirks = array(
-             "-//w3c//dtd xhtml 1.0 frameset//",
-             "-//w3c//dtd xhtml 1.0 transitional//",
+                "-//w3c//dtd xhtml 1.0 frameset//",
+                "-//w3c//dtd xhtml 1.0 transitional//",
             );
             $publicStartsWithAndSystemForLimitedQuirks = array(
-             "-//w3c//dtd html 4.01 frameset//",
-             "-//w3c//dtd html 4.01 transitional//",
+                "-//w3c//dtd html 4.01 frameset//",
+                "-//w3c//dtd html 4.01 transitional//",
             );
             // first, do easy checks
             if (

Braces +86 added lines, -37 removed lines

@@ -112,7 +112,9 @@ 
             $r = new ReflectionClass('HTML5_TreeBuilder');
             $consts = $r->getConstants();
             foreach ($consts as $const => $num) {
-                if (!is_int($num)) continue;
+                if (!is_int($num)) {
+                    continue;
+                }
                 $lookup[$num] = $const;
             }
         }
@@ -159,8 +161,12 @@ 
     // Process tag tokens
     public function emitToken($token, $mode = null) {
         // XXX: ignore parse errors... why are we emitting them, again?
-        if ($token['type'] === HTML5_Tokenizer::PARSEERROR) return;
-        if ($mode === null) $mode = $this->mode;
+        if ($token['type'] === HTML5_Tokenizer::PARSEERROR) {
+            return;
+        }
+        if ($mode === null) {
+            $mode = $this->mode;
+        }
 
         /*
         $backtrace = debug_backtrace();
@@ -175,7 +181,9 @@ 
         if ($this->flag_frameset_ok) echo "  -> frameset ok\n";
         */
 
-        if ($this->ignore_lf_token) $this->ignore_lf_token--;
+        if ($this->ignore_lf_token) {
+            $this->ignore_lf_token--;
+        }
         $this->ignored = false;
         // indenting is a little wonky, this can be changed later on
         switch ($mode) {
@@ -212,8 +220,12 @@ 
              * appropriate. Associate the DocumentType node with the
              * Document object so that it is returned as the value of the
              * doctype attribute of the Document object. */
-            if (!isset($token['public'])) $token['public'] = null;
-            if (!isset($token['system'])) $token['system'] = null;
+            if (!isset($token['public'])) {
+                $token['public'] = null;
+            }
+            if (!isset($token['system'])) {
+                $token['system'] = null;
+            }
             // XDOM
             // Yes this is hacky. I'm kind of annoyed that I can't appendChild
             // a doctype to DOMDocument. Maybe I haven't chanted the right
@@ -318,14 +330,18 @@ 
                                 break;
                             }
                         }
-                        if (!is_null($this->quirks_mode)) break;
+                        if (!is_null($this->quirks_mode)) {
+                            break;
+                        }
                         foreach ($publicStartsWithAndSystemForLimitedQuirks as $x) {
                             if (strncmp($public, $x, strlen($x)) === 0) {
                                 $this->quirks_mode = self::LIMITED_QUIRKS_MODE;
                                 break;
                             }
                         }
-                        if (!is_null($this->quirks_mode)) break;
+                        if (!is_null($this->quirks_mode)) {
+                            break;
+                        }
                     }
                     foreach ($publicSetToForQuirks as $x) {
                         if ($public === $x) {
@@ -333,13 +349,17 @@ 
                             break;
                         }
                     }
-                    if (!is_null($this->quirks_mode)) break;
+                    if (!is_null($this->quirks_mode)) {
+                        break;
+                    }
                     foreach ($publicStartsWithForLimitedQuirks as $x) {
                         if (strncmp($public, $x, strlen($x)) === 0) {
                             $this->quirks_mode = self::LIMITED_QUIRKS_MODE;
                         }
                     }
-                    if (!is_null($this->quirks_mode)) break;
+                    if (!is_null($this->quirks_mode)) {
+                        break;
+                    }
                     if ($system === "http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd") {
                         $this->quirks_mode = self::QUIRKS_MODE;
                         break;
@@ -1031,11 +1051,15 @@ 
                             ));
                             if (in_array($a, $this->a_formatting)) {
                                 $a_i = array_search($a, $this->a_formatting, true);
-                                if($a_i !== false) array_splice($this->a_formatting, $a_i, 1);
+                                if($a_i !== false) {
+                                    array_splice($this->a_formatting, $a_i, 1);
+                                }
                             }
                             if (in_array($a, $this->stack)) {
                                 $a_i = array_search($a, $this->stack, true);
-                                if ($a_i !== false) array_splice($this->stack, $a_i, 1);
+                                if ($a_i !== false) {
+                                    array_splice($this->stack, $a_i, 1);
+                                }
                             }
                             break;
                         }
@@ -1274,7 +1298,9 @@ 
                         $attr = array();
                         foreach ($token['attr'] as $keypair) {
                             if ($keypair['name'] === 'name' || $keypair['name'] === 'action' ||
-                                $keypair['name'] === 'prompt') continue;
+                                $keypair['name'] === 'prompt') {
+                                continue;
+                            }
                             $attr[] = $keypair;
                         }
                         $attr[] = array('name' => 'name', 'value' => 'isindex');
@@ -1502,7 +1528,9 @@ 
                         'type' => HTML5_Tokenizer::ENDTAG
                     ));
 
-                    if (!$this->ignored) $this->emitToken($token);
+                    if (!$this->ignored) {
+                        $this->emitToken($token);
+                    }
                 break;
 
                 case 'address': case 'article': case 'aside': case 'blockquote':
@@ -2100,7 +2128,9 @@ 
                 'type' => HTML5_Tokenizer::ENDTAG
             ));
 
-            if (!$this->ignored) $this->emitToken($token);
+            if (!$this->ignored) {
+                $this->emitToken($token);
+            }
 
         /* An end tag whose tag name is "table" */
         } elseif($token['type'] === HTML5_Tokenizer::ENDTAG &&
@@ -2262,7 +2292,9 @@ 
                 'type' => HTML5_Tokenizer::ENDTAG
             ));
 
-            if (!$this->ignored) $this->emitToken($token);
+            if (!$this->ignored) {
+                $this->emitToken($token);
+            }
 
         /* An end tag whose tag name is one of: "body", "col", "colgroup",
         "html", "tbody", "td", "tfoot", "th", "thead", "tr" */
@@ -2342,7 +2374,9 @@ 
                 'type' => HTML5_Tokenizer::ENDTAG
             ));
 
-            if (!$this->ignored) $this->emitToken($token);
+            if (!$this->ignored) {
+                $this->emitToken($token);
+            }
         }
     break;
 
@@ -2485,7 +2519,9 @@ 
                 'name' => 'tr',
                 'type' => HTML5_Tokenizer::ENDTAG
             ));
-            if (!$this->ignored) $this->emitToken($token);
+            if (!$this->ignored) {
+                $this->emitToken($token);
+            }
 
         /* An end tag whose tag name is one of: "tbody", "tfoot", "thead" */
         } elseif($token['type'] === HTML5_Tokenizer::ENDTAG &&
@@ -3176,11 +3212,15 @@ 
     }
 
     private function insertText($data) {
-        if ($data === '') return;
+        if ($data === '') {
+            return;
+        }
         if ($this->ignore_lf_token) {
             if ($data[0] === "\n") {
                 $data = substr($data, 1);
-                if ($data === false) return;
+                if ($data === false) {
+                    return;
+                }
             }
         }
         $text = $this->dom->createTextNode($data);
@@ -3362,19 +3402,19 @@ 
     }
 
     private function getElementCategory($node) {
-        if (!is_object($node)) debug_print_backtrace();
+        if (!is_object($node)) {
+            debug_print_backtrace();
+        }
         $name = $node->tagName;
-        if(in_array($name, $this->special))
-            return self::SPECIAL;
-
-        elseif(in_array($name, $this->scoping))
-            return self::SCOPING;
-
-        elseif(in_array($name, $this->formatting))
-            return self::FORMATTING;
-
-        else
-            return self::PHRASING;
+        if(in_array($name, $this->special)) {
+                    return self::SPECIAL;
+        } elseif(in_array($name, $this->scoping)) {
+                    return self::SCOPING;
+        } elseif(in_array($name, $this->formatting)) {
+                    return self::FORMATTING;
+        } else {
+                    return self::PHRASING;
+        }
     }
 
     private function clearStackToTableContext($elements) {
@@ -3540,10 +3580,14 @@ 
     }
 
     private function getAttr($token, $key) {
-        if (!isset($token['attr'])) return false;
+        if (!isset($token['attr'])) {
+            return false;
+        }
         $ret = false;
         foreach ($token['attr'] as $keypair) {
-            if ($keypair['name'] === $key) $ret = $keypair['value'];
+            if ($keypair['name'] === $key) {
+                $ret = $keypair['value'];
+            }
         }
         return $ret;
     }
@@ -3624,11 +3668,16 @@ 
      * For debugging, prints active formatting elements
      */
     private function printActiveFormattingElements() {
-        if (!$this->a_formatting) return;
+        if (!$this->a_formatting) {
+            return;
+        }
         $names = array();
         foreach ($this->a_formatting as $node) {
-            if ($node === self::MARKER) $names[] = 'MARKER';
-            else $names[] = $node->tagName;
+            if ($node === self::MARKER) {
+                $names[] = 'MARKER';
+            } else {
+                $names[] = $node->tagName;
+            }
         }
         echo "  -> active formatting [" . implode(', ', $names) . "]\n";
     }