Merge pull request #64 from VincentLanglet/improveTwigSupport

🔧 Copy constant to have better twig version support

Author: VincentLanglet

TwigCS/Token/Token.php

@@ -2,28 +2,26 @@
 
 namespace TwigCS\Token;
 
-use Twig\Token as TwigToken;
-
 /**
  * Class Token
  */
 class Token
 {
     // From Twig\Token
-    const EOF_TYPE                 = TwigToken::EOF_TYPE;
-    const TEXT_TYPE                = TwigToken::TEXT_TYPE;
-    const BLOCK_START_TYPE         = TwigToken::BLOCK_START_TYPE;
-    const VAR_START_TYPE           = TwigToken::VAR_START_TYPE;
-    const BLOCK_END_TYPE           = TwigToken::BLOCK_END_TYPE;
-    const VAR_END_TYPE             = TwigToken::VAR_END_TYPE;
-    const NAME_TYPE                = TwigToken::NAME_TYPE;
-    const NUMBER_TYPE              = TwigToken::NUMBER_TYPE;
-    const STRING_TYPE              = TwigToken::STRING_TYPE;
-    const OPERATOR_TYPE            = TwigToken::OPERATOR_TYPE;
-    const PUNCTUATION_TYPE         = TwigToken::PUNCTUATION_TYPE;
-    const INTERPOLATION_START_TYPE = TwigToken::INTERPOLATION_START_TYPE;
-    const INTERPOLATION_END_TYPE   = TwigToken::INTERPOLATION_END_TYPE;
-    const ARROW_TYPE               = TwigToken::ARROW_TYPE;
+    const EOF_TYPE                 = -1;
+    const TEXT_TYPE                = 0;
+    const BLOCK_START_TYPE         = 1;
+    const VAR_START_TYPE           = 2;
+    const BLOCK_END_TYPE           = 3;
+    const VAR_END_TYPE             = 4;
+    const NAME_TYPE                = 5;
+    const NUMBER_TYPE              = 6;
+    const STRING_TYPE              = 7;
+    const OPERATOR_TYPE            = 8;
+    const PUNCTUATION_TYPE         = 9;
+    const INTERPOLATION_START_TYPE = 10;
+    const INTERPOLATION_END_TYPE   = 11;
+    const ARROW_TYPE               = 12;
     // New constants
     const WHITESPACE_TYPE          = 13;
     const TAB_TYPE                 = 14;

TwigCS/Token/Tokenizer.php

@@ -4,27 +4,26 @@
 
 use \Exception;
 use Twig\Environment;
-use Twig\Lexer;
 use Twig\Source;
 
 /**
  * An override of Twig's Lexer to add whitespace and new line detection.
  */
 class Tokenizer
 {
-    const STATE_DATA          = Lexer::STATE_DATA;
-    const STATE_BLOCK         = Lexer::STATE_BLOCK;
-    const STATE_VAR           = Lexer::STATE_VAR;
-    const STATE_STRING        = Lexer::STATE_STRING;
-    const STATE_INTERPOLATION = Lexer::STATE_INTERPOLATION;
+    const STATE_DATA          = 0;
+    const STATE_BLOCK         = 1;
+    const STATE_VAR           = 2;
+    const STATE_STRING        = 3;
+    const STATE_INTERPOLATION = 4;
     const STATE_COMMENT       = 5;
 
-    const REGEX_NAME            = Lexer::REGEX_NAME;
-    const REGEX_NUMBER          = Lexer::REGEX_NUMBER;
-    const REGEX_STRING          = Lexer::REGEX_STRING;
-    const REGEX_DQ_STRING_DELIM = Lexer::REGEX_DQ_STRING_DELIM;
-    const REGEX_DQ_STRING_PART  = Lexer::REGEX_DQ_STRING_PART;
-    const PUNCTUATION           = Lexer::PUNCTUATION;
+    const REGEX_NAME            = '/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/A';
+    const REGEX_NUMBER          = '/[0-9]+(?:\.[0-9]+)?/A';
+    const REGEX_STRING          = '/"([^#"\\\\]*(?:\\\\.[^#"\\\\]*)*)"|\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\'/As';
+    const REGEX_DQ_STRING_DELIM = '/"/A';
+    const REGEX_DQ_STRING_PART  = '/[^#"\\\\]*(?:(?:\\\\.|#(?!\{))[^#"\\\\]*)*/As';
+    const PUNCTUATION           = '()[]{}?:.,|';
 
     /**
      * @var array