Masterminds / html5-php

src/HTML5/Elements.php

Spacing +1 added lines, -1 removed lines

@@ -485,7 +485,7 @@
      */
     public static function isA($name, $mask)
     {
-        if (! static::isElement($name)) {
+        if (!static::isElement($name)) {
             return false;
         }
 

src/HTML5/Parser/CharacterReference.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
      */
     public static function lookupDecimal($int)
     {
-        $entity = '&#' . $int . ';';
+        $entity = '&#'.$int.';';
         // UNTESTED: This may fail on some planes. Couldn't find full documentation
         // on the value of the mask array.
         return mb_decode_numericentity($entity, static::$numeric_mask, 'utf-8');

src/HTML5/Parser/StringInputStream.php

Spacing +1 added lines, -1 removed lines

@@ -188,7 +188,7 @@
      */
     public function next()
     {
-        $this->char ++;
+        $this->char++;
     }
 
     /**

src/HTML5/Parser/UTF8Utils.php

Spacing +2 added lines, -2 removed lines

@@ -144,7 +144,7 @@ 
         /*
          * All U+0000 null characters in the input must be replaced by U+FFFD REPLACEMENT CHARACTERs. Any occurrences of such characters is a parse error.
          */
-        for ($i = 0, $count = substr_count($data, "\0"); $i < $count; $i ++) {
+        for ($i = 0, $count = substr_count($data, "\0"); $i < $count; $i++) {
             $errors[] = 'null-character';
         }
 
@@ -166,7 +166,7 @@ 
       |
         [\xF0-\xF4][\x8F-\xBF]\xBF[\xBE\xBF] # U+nFFFE and U+nFFFF (1 <= n <= 10_{16})
       )/x', $data, $matches);
-        for ($i = 0; $i < $count; $i ++) {
+        for ($i = 0; $i < $count; $i++) {
             $errors[] = 'invalid-codepoint';
         }
 

src/HTML5/Parser/DOMTreeBuilder.php

Indentation +3 added lines, -3 removed lines

@@ -344,8 +344,8 @@ 
         }
 
         if ($this->onlyInline && Elements::isA($lname, Elements::BLOCK_TAG)) {
-        	$this->autoclose($this->onlyInline);
-        	$this->onlyInline = null;
+            $this->autoclose($this->onlyInline);
+            $this->onlyInline = null;
         }
 
         try {
@@ -375,7 +375,7 @@ 
         }
 
         if (Elements::isA($lname, Elements::BLOCK_ONLY_INLINE)) {
-        	$this->onlyInline = $lname;
+            $this->onlyInline = $lname;
         }
 
         // When we add some namespacess, we have to track them. Later, when "endElement" is invoked, we have to remove them.

Spacing +17 added lines, -17 removed lines

@@ -242,7 +242,7 @@ 
         $this->quirks = $quirks;
 
         if ($this->insertMode > static::IM_INITIAL) {
-            $this->parseError("Illegal placement of DOCTYPE tag. Ignoring: " . $name);
+            $this->parseError("Illegal placement of DOCTYPE tag. Ignoring: ".$name);
 
             return;
         }
@@ -263,7 +263,7 @@ 
         $lname = $this->normalizeTagName($name);
 
         // Make sure we have an html element.
-        if (! $this->doc->documentElement && $name !== 'html' && ! $this->frag) {
+        if (!$this->doc->documentElement && $name !== 'html' && !$this->frag) {
             $this->startTag('html');
         }
 
@@ -324,7 +324,7 @@ 
             array_unshift($this->nsStack, array(
                 '' => $this->nsRoots[$lname]
             ) + $this->nsStack[0]);
-            $pushes ++;
+            $pushes++;
         }
         $needsWorkaround = false;
         if (isset($this->options["xmlNamespaces"]) && $this->options["xmlNamespaces"]) {
@@ -335,12 +335,12 @@ 
                     array_unshift($this->nsStack, array(
                         '' => $aVal
                     ) + $this->nsStack[0]);
-                    $pushes ++;
+                    $pushes++;
                 } elseif ((($pos = strpos($aName, ':')) ? substr($aName, 0, $pos) : '') === 'xmlns') {
                     array_unshift($this->nsStack, array(
                         substr($aName, $pos + 1) => $aVal
                     ) + $this->nsStack[0]);
-                    $pushes ++;
+                    $pushes++;
                 }
             }
         }
@@ -354,9 +354,9 @@ 
             $prefix = ($pos = strpos($lname, ':')) ? substr($lname, 0, $pos) : '';
 
 
-            if ($needsWorkaround!==false) {
+            if ($needsWorkaround !== false) {
 
-                $xml = "<$lname xmlns=\"$needsWorkaround\" ".(strlen($prefix) && isset($this->nsStack[0][$prefix])?("xmlns:$prefix=\"".$this->nsStack[0][$prefix]."\""):"")."/>";
+                $xml = "<$lname xmlns=\"$needsWorkaround\" ".(strlen($prefix) && isset($this->nsStack[0][$prefix]) ? ("xmlns:$prefix=\"".$this->nsStack[0][$prefix]."\"") : "")."/>";
 
                 $frag = new \DOMDocument('1.0', 'UTF-8');
                 $frag->loadXML($xml);
@@ -409,9 +409,9 @@ 
             try {
                 $prefix = ($pos = strpos($aName, ':')) ? substr($aName, 0, $pos) : false;
 
-                if ($prefix==='xmlns') {
+                if ($prefix === 'xmlns') {
                     $ele->setAttributeNs(self::NAMESPACE_XMLNS, $aName, $aVal);
-                } elseif ($prefix!==false && isset($this->nsStack[0][$prefix])) {
+                } elseif ($prefix !== false && isset($this->nsStack[0][$prefix])) {
                     $ele->setAttributeNs($this->nsStack[0][$prefix], $aName, $aVal);
                 } else {
                     $ele->setAttribute($aName, $aVal);
@@ -434,7 +434,7 @@ 
         else {
             $this->current->appendChild($ele);
 
-            if (! Elements::isA($name, Elements::VOID_TAG)) {
+            if (!Elements::isA($name, Elements::VOID_TAG)) {
                 $this->current = $ele;
             }
 
@@ -456,7 +456,7 @@ 
         // but we have to remove the namespaces pushed to $nsStack.
         if ($pushes > 0 && Elements::isA($name, Elements::VOID_TAG)) {
             // remove the namespaced definded by current node
-            for ($i = 0; $i < $pushes; $i ++) {
+            for ($i = 0; $i < $pushes; $i++) {
                 array_shift($this->nsStack);
             }
         }
@@ -525,14 +525,14 @@ 
 
         // remove the namespaced definded by current node
         if (isset($this->pushes[$cid])) {
-            for ($i = 0; $i < $this->pushes[$cid][0]; $i ++) {
+            for ($i = 0; $i < $this->pushes[$cid][0]; $i++) {
                 array_shift($this->nsStack);
             }
             unset($this->pushes[$cid]);
         }
 
-        if (! $this->autoclose($lname)) {
-            $this->parseError('Could not find closing tag for ' . $lname);
+        if (!$this->autoclose($lname)) {
+            $this->parseError('Could not find closing tag for '.$lname);
         }
 
         // switch ($this->insertMode) {
@@ -566,9 +566,9 @@ 
             // practical as most documents contain these characters. Other text is not
             // expected here so recording a parse error is necessary.
             $dataTmp = trim($data, " \t\n\r\f");
-            if (! empty($dataTmp)) {
+            if (!empty($dataTmp)) {
                 // fprintf(STDOUT, "Unexpected insert mode: %d", $this->insertMode);
-                $this->parseError("Unexpected text. Ignoring: " . $dataTmp);
+                $this->parseError("Unexpected text. Ignoring: ".$dataTmp);
             }
 
             return;
@@ -610,7 +610,7 @@ 
         // it sees fit.
         if (isset($this->processor)) {
             $res = $this->processor->process($this->current, $name, $data);
-            if (! empty($res)) {
+            if (!empty($res)) {
                 $this->current = $res;
             }
 

src/HTML5/Serializer/OutputRules.php

Spacing +18 added lines, -18 removed lines

@@ -236,7 +236,7 @@ 
         }
 
         // If not unary, add a closing tag.
-        if (! Elements::isA($name, Elements::VOID_TAG)) {
+        if (!Elements::isA($name, Elements::VOID_TAG)) {
             $this->closeTag($ele);
         }
     }
@@ -288,11 +288,11 @@ 
      */
     protected function namespaceAttrs($ele)
     {
-        if (!$this->xpath || $this->xpath->document !== $ele->ownerDocument){
+        if (!$this->xpath || $this->xpath->document !== $ele->ownerDocument) {
             $this->xpath = new \DOMXPath($ele->ownerDocument);
         }
 
-        foreach( $this->xpath->query('namespace::*[not(.=../../namespace::*)]', $ele ) as $nsNode ) {
+        foreach ($this->xpath->query('namespace::*[not(.=../../namespace::*)]', $ele) as $nsNode) {
             if (!in_array($nsNode->nodeValue, $this->implicitNamespaces)) {
                 $this->wr(' ')->wr($nsNode->nodeName)->wr('="')->wr($nsNode->nodeValue)->wr('"');
             }
@@ -333,7 +333,7 @@ 
     protected function attrs($ele)
     {
         // FIXME: Needs support for xml, xmlns, xlink, and namespaced elements.
-        if (! $ele->hasAttributes()) {
+        if (!$ele->hasAttributes()) {
             return $this;
         }
 
@@ -371,35 +371,35 @@ 
     protected function nonBooleanAttribute(\DOMAttr $attr)
     {
         $ele = $attr->ownerElement;
-        foreach($this->nonBooleanAttributes as $rule){
+        foreach ($this->nonBooleanAttributes as $rule) {
 
-            if(isset($rule['nodeNamespace']) && $rule['nodeNamespace']!==$ele->namespaceURI){
+            if (isset($rule['nodeNamespace']) && $rule['nodeNamespace'] !== $ele->namespaceURI) {
                 continue;
             }
-            if(isset($rule['attNamespace']) && $rule['attNamespace']!==$attr->namespaceURI){
+            if (isset($rule['attNamespace']) && $rule['attNamespace'] !== $attr->namespaceURI) {
                 continue;
             }
-            if(isset($rule['nodeName']) && !is_array($rule['nodeName']) && $rule['nodeName']!==$ele->localName){
+            if (isset($rule['nodeName']) && !is_array($rule['nodeName']) && $rule['nodeName'] !== $ele->localName) {
                 continue;
             }
-            if(isset($rule['nodeName']) && is_array($rule['nodeName']) && !in_array($ele->localName, $rule['nodeName'], true)){
+            if (isset($rule['nodeName']) && is_array($rule['nodeName']) && !in_array($ele->localName, $rule['nodeName'], true)) {
                 continue;
             }
-            if(isset($rule['attrName']) && !is_array($rule['attrName']) && $rule['attrName']!==$attr->localName){
+            if (isset($rule['attrName']) && !is_array($rule['attrName']) && $rule['attrName'] !== $attr->localName) {
                 continue;
             }
-            if(isset($rule['attrName']) && is_array($rule['attrName']) && !in_array($attr->localName, $rule['attrName'], true)){
+            if (isset($rule['attrName']) && is_array($rule['attrName']) && !in_array($attr->localName, $rule['attrName'], true)) {
                 continue;
             }
-            if(isset($rule['xpath'])){
+            if (isset($rule['xpath'])) {
 
                 $xp = $this->getXPath($attr);
-                if(isset($rule['prefixes'])){
-                    foreach($rule['prefixes'] as $nsPrefix => $ns){
+                if (isset($rule['prefixes'])) {
+                    foreach ($rule['prefixes'] as $nsPrefix => $ns) {
                         $xp->registerNamespace($nsPrefix, $ns);
                     }
                 }
-                if(!$xp->evaluate($rule['xpath'], $attr)){
+                if (!$xp->evaluate($rule['xpath'], $attr)) {
                     continue;
                 }
             }
@@ -410,8 +410,8 @@ 
         return false;
     }
 
-    private function getXPath(\DOMNode $node){
-        if(!$this->xpath){
+    private function getXPath(\DOMNode $node) {
+        if (!$this->xpath) {
             $this->xpath = new \DOMXPath($node->ownerDocument);
         }
         return $this->xpath;
@@ -491,7 +491,7 @@ 
     {
 
         // Escape the text rather than convert to named character references.
-        if (! $this->encode) {
+        if (!$this->encode) {
             return $this->escape($text, $attribute);
         }
 

src/HTML5.php

Spacing +2 added lines, -2 removed lines

@@ -168,7 +168,7 @@ 
         $options = array_merge($this->getOptions(), $options);
         $events = new DOMTreeBuilder(false, $options);
         $scanner = new Scanner($input);
-        $parser = new Tokenizer($scanner, $events, !empty($options['xmlNamespaces']) ? Tokenizer::CONFORMANT_XML: Tokenizer::CONFORMANT_HTML);
+        $parser = new Tokenizer($scanner, $events, !empty($options['xmlNamespaces']) ? Tokenizer::CONFORMANT_XML : Tokenizer::CONFORMANT_HTML);
 
         $parser->parse();
         $this->errors = $events->getErrors();
@@ -187,7 +187,7 @@ 
         $options = array_merge($this->getOptions(), $options);
         $events = new DOMTreeBuilder(true, $options);
         $scanner = new Scanner($input);
-        $parser = new Tokenizer($scanner, $events, !empty($options['xmlNamespaces']) ? Tokenizer::CONFORMANT_XML: Tokenizer::CONFORMANT_HTML);
+        $parser = new Tokenizer($scanner, $events, !empty($options['xmlNamespaces']) ? Tokenizer::CONFORMANT_XML : Tokenizer::CONFORMANT_HTML);
 
         $parser->parse();
         $this->errors = $events->getErrors();

src/HTML5/Parser/Tokenizer.php

Spacing +19 added lines, -19 removed lines

@@ -243,7 +243,7 @@ 
             return $this->text($tok);
         }
 
-        $sequence = '</' . $this->untilTag . '>';
+        $sequence = '</'.$this->untilTag.'>';
         $txt = $this->readUntilSequence($sequence);
         $this->events->text($txt);
         $this->setTextMode(0);
@@ -264,11 +264,11 @@ 
             return $this->text($tok);
         }
 
-        $sequence = '</' . $this->untilTag;
+        $sequence = '</'.$this->untilTag;
         $txt = '';
 
         $caseSensitive = !Elements::isHtml5Element($this->untilTag);
-        while ($tok !== false && ! ($tok == '<' && ($this->scanner->sequenceMatches($sequence, $caseSensitive)))) {
+        while ($tok !== false && !($tok == '<' && ($this->scanner->sequenceMatches($sequence, $caseSensitive)))) {
             if ($tok == '&') {
                 $txt .= $this->decodeCharacterReference();
                 $tok = $this->scanner->current();
@@ -354,7 +354,7 @@ 
         // > -> parse error
         // EOF -> parse error
         // -> parse error
-        if (! ctype_alpha($tok)) {
+        if (!ctype_alpha($tok)) {
             $this->parseError("Expected tag name, got '%s'", $tok);
             if ($tok == "\0" || $tok === false) {
                 return false;
@@ -363,7 +363,7 @@ 
         }
 
         $name = $this->scanner->charsUntil("\n\f \t>");
-        $name = $this->mode === self::CONFORMANT_XML ? $name: strtolower($name);
+        $name = $this->mode === self::CONFORMANT_XML ? $name : strtolower($name);
         // Trash whitespace.
         $this->scanner->whitespace();
 
@@ -386,7 +386,7 @@ 
     protected function tagName()
     {
         $tok = $this->scanner->current();
-        if (! ctype_alpha($tok)) {
+        if (!ctype_alpha($tok)) {
             return false;
         }
 
@@ -402,7 +402,7 @@ 
             do {
                 $this->scanner->whitespace();
                 $this->attribute($attributes);
-            } while (! $this->isTagEnd($selfClose));
+            } while (!$this->isTagEnd($selfClose));
         } catch (ParseError $e) {
             $selfClose = false;
         }
@@ -569,7 +569,7 @@ 
      */
     protected function quotedAttributeValue($quote)
     {
-        $stoplist = "\f" . $quote;
+        $stoplist = "\f".$quote;
         $val = '';
 
         while (true) {
@@ -671,7 +671,7 @@ 
         if ($tok == "\0") {
             $tok = UTF8Utils::FFFD;
         }
-        while (! $this->isCommentEnd()) {
+        while (!$this->isCommentEnd()) {
             $comment .= $tok;
             $tok = $this->scanner->next();
         }
@@ -731,7 +731,7 @@ 
         $chars = $this->scanner->charsWhile("DOCTYPEdoctype");
         if (strcasecmp($chars, 'DOCTYPE')) {
             $this->parseError('Expected DOCTYPE, got %s', $chars);
-            return $this->bogusComment('<!' . $chars);
+            return $this->bogusComment('<!'.$chars);
         }
 
         $this->scanner->whitespace();
@@ -838,7 +838,7 @@ 
         $tok = $this->scanner->current();
         if ($tok == '"' || $tok == "'") {
             $this->scanner->consume();
-            $ret = $this->scanner->charsUntil($tok . $stopchars);
+            $ret = $this->scanner->charsUntil($tok.$stopchars);
             if ($this->scanner->current() == $tok) {
                 $this->scanner->consume();
             } else {
@@ -866,19 +866,19 @@ 
         $chars = $this->scanner->charsWhile('CDAT');
         if ($chars != 'CDATA' || $this->scanner->current() != '[') {
             $this->parseError('Expected [CDATA[, got %s', $chars);
-            return $this->bogusComment('<![' . $chars);
+            return $this->bogusComment('<!['.$chars);
         }
 
         $tok = $this->scanner->next();
         do {
             if ($tok === false) {
                 $this->parseError('Unexpected EOF inside CDATA.');
-                $this->bogusComment('<![CDATA[' . $cdata);
+                $this->bogusComment('<![CDATA['.$cdata);
                 return true;
             }
             $cdata .= $tok;
             $tok = $this->scanner->next();
-        } while (! $this->scanner->sequenceMatches(']]>'));
+        } while (!$this->scanner->sequenceMatches(']]>'));
 
         // Consume ]]>
         $this->scanner->consume(3);
@@ -913,13 +913,13 @@ 
         // If not a PI, send to bogusComment.
         if (strlen($procName) == 0 || $white == 0 || $this->scanner->current() == false) {
             $this->parseError("Expected processing instruction name, got $tok");
-            $this->bogusComment('<?' . $tok . $procName);
+            $this->bogusComment('<?'.$tok.$procName);
             return true;
         }
 
         $data = '';
         // As long as it's not the case that the next two chars are ? and >.
-        while (! ($this->scanner->current() == '?' && $this->scanner->peek() == '>')) {
+        while (!($this->scanner->current() == '?' && $this->scanner->peek() == '>')) {
             $data .= $this->scanner->current();
 
             $tok = $this->scanner->next();
@@ -989,7 +989,7 @@ 
      */
     protected function sequenceMatches($sequence, $caseSensitive = true)
     {
-        @trigger_error(__METHOD__ . ' method is deprecated since version 2.4 and will be removed in 3.0. Use Scanner::sequenceMatches() instead.', E_USER_DEPRECATED);
+        @trigger_error(__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0. Use Scanner::sequenceMatches() instead.', E_USER_DEPRECATED);
 
         return $this->scanner->sequenceMatches($sequence, $caseSensitive);
     }
@@ -1071,7 +1071,7 @@ 
 
         // These indicate not an entity. We return just
         // the &.
-        if (strspn($tok, static::WHITE . "&<") == 1) {
+        if (strspn($tok, static::WHITE."&<") == 1) {
             // $this->scanner->next();
             return '&';
         }
@@ -1148,6 +1148,6 @@ 
         }
 
         $this->parseError("Expected &ENTITY;, got &ENTITY%s (no trailing ;) ", $tok);
-        return '&' . $entity;
+        return '&'.$entity;
     }
 }

Braces +2 added lines, -6 removed lines

@@ -323,13 +323,9 @@
         if ($tok == '-' && $this->scanner->peek() == '-') {
             $this->scanner->consume(2);
             return $this->comment();
-        }
-
-        elseif ($tok == 'D' || $tok == 'd') { // Doctype
+        } elseif ($tok == 'D' || $tok == 'd') { // Doctype
             return $this->doctype();
-        }
-
-        elseif ($tok == '[') { // CDATA section
+        } elseif ($tok == '[') { // CDATA section
             return $this->cdataSection();
         }