Merge pull request #154 from stof/optimize_token_comparison

Optimize the token comparison
Masterminds · Nov 26, 2018 · 3ed3bdc · 3ed3bdc
2 parents e43f08e + 89e1a7a
commit 3ed3bdc
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/HTML5/Parser/Tokenizer.php b/src/HTML5/Parser/Tokenizer.php
@@ -47,8 +47,6 @@ class Tokenizer
     const CONFORMANT_HTML = 'html';
     protected $mode = self::CONFORMANT_HTML;
 
-    const WHITE = "\t\n\f ";
-
     /**
      * Create a new tokenizer.
      *
@@ -159,7 +157,7 @@ protected function consumeData()
                     break;
 
                 default:
-                    if (!strspn($tok, '<&')) {
+                    if ('<' !== $tok && '&' !== $tok) {
                         // NULL character
                         if ("\00" === $tok) {
                             $this->parseError('Received null character.');
@@ -193,7 +191,7 @@ protected function characterData()
             case Elements::TEXT_RCDATA:
                 return $this->rcdata($tok);
             default:
-                if (strspn($tok, '<&')) {
+                if ('<' === $tok || '&' === $tok) {
                     return false;
                 }
 
@@ -1092,7 +1090,7 @@ protected function decodeCharacterReference($inAttribute = false)
 
         // These indicate not an entity. We return just
         // the &.
-        if (1 === strspn($tok, static::WHITE . '&<')) {
+        if ("\t" === $tok || "\n" === $tok || "\f" === $tok || ' ' === $tok || '&' === $tok || '<' === $tok) {
             // $this->scanner->next();
             return '&';
         }