Masterminds / html5-php

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