Masterminds / html5-php

src/Html5/Parser/DOMTreeBuilder.php

Spacing +17 added lines, -17 removed lines

@@ -249,7 +249,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;
         }
@@ -270,7 +270,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');
         }
 
@@ -330,7 +330,7 @@ 
             array_unshift($this->nsStack, array(
                 '' => $this->nsRoots[$lname]
             ) + $this->nsStack[0]);
-            $pushes ++;
+            $pushes++;
         }
         $needsWorkaround = false;
         if (isset($this->options["xmlNamespaces"]) && $this->options["xmlNamespaces"]) {
@@ -341,12 +341,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++;
                 }
             }
         }
@@ -360,9 +360,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);
@@ -415,9 +415,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);
@@ -441,7 +441,7 @@ 
             $this->current->appendChild($ele);
 
             // XXX: Need to handle self-closing tags and unary tags.
-            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);
             }
         }
@@ -520,14 +520,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) {
@@ -561,9 +561,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)) {
                 $this->logger->debug(sprintf("Unexpected insert mode: %d", $this->insertMode));
-                $this->parseError("Unexpected text. Ignoring: " . $dataTmp);
+                $this->parseError("Unexpected text. Ignoring: ".$dataTmp);
             }
 
             return;
@@ -605,7 +605,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/Parser/Tokenizer.php

Spacing +18 added lines, -18 removed lines

@@ -184,7 +184,7 @@ 
         if (is_null($this->untilTag)) {
             return $this->text();
         }
-        $sequence = '</' . $this->untilTag . '>';
+        $sequence = '</'.$this->untilTag.'>';
         $txt = $this->readUntilSequence($sequence);
         $this->events->text($txt);
         $this->setTextMode(0);
@@ -199,12 +199,12 @@ 
         if (is_null($this->untilTag)) {
             return $this->text();
         }
-        $sequence = '</' . $this->untilTag;
+        $sequence = '</'.$this->untilTag;
         $txt = '';
         $tok = $this->scanner->current();
 
         $caseSensitive = !Elements::isHtml5Element($this->untilTag);
-        while ($tok !== false && ! ($tok == '<' && ($this->sequenceMatches($sequence, $caseSensitive)))) {
+        while ($tok !== false && !($tok == '<' && ($this->sequenceMatches($sequence, $caseSensitive)))) {
             if ($tok == '&') {
                 $txt .= $this->decodeCharacterReference();
                 $tok = $this->scanner->current();
@@ -328,7 +328,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;
@@ -358,7 +358,7 @@ 
     protected function tagName()
     {
         $tok = $this->scanner->current();
-        if (! ctype_alpha($tok)) {
+        if (!ctype_alpha($tok)) {
             return false;
         }
 
@@ -373,7 +373,7 @@ 
             do {
                 $this->scanner->whitespace();
                 $this->attribute($attributes);
-            } while (! $this->isTagEnd($selfClose));
+            } while (!$this->isTagEnd($selfClose));
         } catch (ParseError $e) {
             $selfClose = false;
         }
@@ -531,7 +531,7 @@ 
      */
     protected function quotedAttributeValue($quote)
     {
-        $stoplist = "\f" . $quote;
+        $stoplist = "\f".$quote;
         $val = '';
         $tok = $this->scanner->current();
         while (strspn($tok, $stoplist) == 0 && $tok !== false) {
@@ -597,7 +597,7 @@ 
         } while ($tok !== false && $tok != '>');
 
         $this->flushBuffer();
-        $this->events->comment($comment . $tok);
+        $this->events->comment($comment.$tok);
         $this->scanner->next();
 
         return true;
@@ -626,7 +626,7 @@ 
         if ($tok == "\0") {
             $tok = UTF8Utils::FFFD;
         }
-        while (! $this->isCommentEnd()) {
+        while (!$this->isCommentEnd()) {
             $comment .= $tok;
             $this->scanner->next();
             $tok = $this->scanner->current();
@@ -682,7 +682,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();
@@ -794,7 +794,7 @@ 
         $tok = $this->scanner->current();
         if ($tok == '"' || $tok == "'") {
             $this->scanner->next();
-            $ret = $this->scanner->charsUntil($tok . $stopchars);
+            $ret = $this->scanner->charsUntil($tok.$stopchars);
             if ($this->scanner->current() == $tok) {
                 $this->scanner->next();
             } else {
@@ -820,7 +820,7 @@ 
         $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);
         }
 
         $this->scanner->next();
@@ -828,13 +828,13 @@ 
         do {
             if ($tok === false) {
                 $this->parseError('Unexpected EOF inside CDATA.');
-                $this->bogusComment('<![CDATA[' . $cdata);
+                $this->bogusComment('<![CDATA['.$cdata);
                 return true;
             }
             $cdata .= $tok;
             $this->scanner->next();
             $tok = $this->scanner->current();
-        } while (! $this->sequenceMatches(']]>'));
+        } while (!$this->sequenceMatches(']]>'));
 
         // Consume ]]>
         $this->scanner->consume(3);
@@ -868,13 +868,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();
 
             $this->scanner->next();
@@ -1031,7 +1031,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 '&';
         }
@@ -1106,6 +1106,6 @@ 
         }
 
         $this->parseError("Expected &ENTITY;, got &ENTITY%s (no trailing ;) ", $tok);
-        return '&' . $entity;
+        return '&'.$entity;
     }
 }