Small refactors

Author: nilportugues

src/Tokenizer/Parser/UserDefined.php

@@ -55,17 +55,35 @@ protected static function getUserDefinedVariableString(&$string)
             Tokenizer::TOKEN_TYPE  => Tokenizer::TOKEN_TYPE_VARIABLE
         ];
 
+        self::setTokenValueStartingWithAtSymbolAndWrapped($returnData, $string);
+        self::setTokenValueStartingWithAtSymbol($returnData, $string);
+
+        return $returnData;
+    }
+
+    /**
+     * @param array $returnData
+     * @param string $string
+     */
+    protected static function setTokenValueStartingWithAtSymbolAndWrapped(array &$returnData, $string)
+    {
         if ($string[1] === '"' || $string[1] === '\'' || $string[1] === '`') {
             $returnData[Tokenizer::TOKEN_VALUE] = '@' . Quoted::wrapStringWithQuotes(substr($string, 1));
-            return $returnData;
         }
+    }
 
-        $matches = [];
-        preg_match('/^(@[a-zA-Z0-9\._\$]+)/', $string, $matches);
-        if ($matches) {
-            $returnData[Tokenizer::TOKEN_VALUE] = $matches[1];
+    /**
+     * @param array $returnData
+     * @param string $string
+     */
+    protected static function setTokenValueStartingWithAtSymbol(array &$returnData, $string)
+    {
+        if (null === $returnData[Tokenizer::TOKEN_VALUE]) {
+            $matches = [];
+            preg_match('/^(@[a-zA-Z0-9\._\$]+)/', $string, $matches);
+            if ($matches) {
+                $returnData[Tokenizer::TOKEN_VALUE] = $matches[1];
+            }
         }
-
-        return $returnData;
     }
 }

src/Tokenizer/Tokenizer.php

@@ -77,7 +77,6 @@ class Tokenizer
      */
     protected $tokenCache = [];
 
-
     /**
      * @var array
      */
@@ -115,6 +114,7 @@ protected function initRegex($variable)
      * Each token is an associative array with type and value.
      *
      * @param string $string
+     *
      * @return array
      */
     public function tokenize($string)
@@ -131,17 +131,11 @@ public function tokenize($string)
                     break;
                 }
 
-                $oldStringLength = $currentStringLength;
-
-                $cacheKey = $this->useTokenCache($string, $currentStringLength);
-                if (!empty($cacheKey) && isset($this->tokenCache[$cacheKey])) {
-                    $token = $this->getNextTokenFromCache($cacheKey);
-                } else {
-                    $token = $this->getNextTokenFromString($string, $token, $cacheKey);
-                }
-
+                $token = $this->getToken($string, $currentStringLength, $token);
                 $tokens[]    = $token;
                 $tokenLength = strlen($token[self::TOKEN_VALUE]);
+
+                $oldStringLength = $currentStringLength;
                 $currentStringLength -= $tokenLength;
 
                 $string = substr($string, $tokenLength);
@@ -198,25 +192,6 @@ protected function getNextTokenFromString($string, $token, $cacheKey)
         return $token;
     }
 
-    /**
-     * @param array $nextToken
-     *
-     * @return $this
-     */
-    public function setNextToken($nextToken)
-    {
-        $this->nextToken = $nextToken;
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getNextToken()
-    {
-        return $this->nextToken;
-    }
-
     /**
      * Return the next token and token type in a SQL string.
      * Quoted strings, comments, reserved words, whitespace, and punctuation are all their own tokens.
@@ -228,7 +203,7 @@ public function getNextToken()
      */
     protected function parseNextToken($string, $previous = null)
     {
-        $matches = [];
+        $matches         = [];
         $this->nextToken = [];
 
         WhiteSpace::isWhiteSpace($this, $string, $matches);
@@ -245,15 +220,22 @@ protected function parseNextToken($string, $previous = null)
     }
 
     /**
-     * Helper function for building regular expressions for reserved words and boundary characters
-     *
-     * @param string $string
+     * @return array
+     */
+    public function getNextToken()
+    {
+        return $this->nextToken;
+    }
+
+    /**
+     * @param array $nextToken
      *
-     * @return string
+     * @return $this
      */
-    protected function quoteRegex($string)
+    public function setNextToken($nextToken)
     {
-        return preg_quote($string, '/');
+        $this->nextToken = $nextToken;
+        return $this;
     }
 
     /**
@@ -295,4 +277,34 @@ public function getRegexReservedTopLevel()
     {
         return $this->regexReservedTopLevel;
     }
+
+    /**
+     * Helper function for building regular expressions for reserved words and boundary characters
+     *
+     * @param string $string
+     *
+     * @return string
+     */
+    protected function quoteRegex($string)
+    {
+        return preg_quote($string, '/');
+    }
+
+    /**
+     * @param $string
+     * @param $currentStringLength
+     * @param $token
+     *
+     * @return array|mixed
+     */
+    protected function getToken($string, $currentStringLength, $token)
+    {
+        $cacheKey = $this->useTokenCache($string, $currentStringLength);
+        if (!empty($cacheKey) && isset($this->tokenCache[$cacheKey])) {
+            $token = $this->getNextTokenFromCache($cacheKey);
+        } else {
+            $token = $this->getNextTokenFromString($string, $token, $cacheKey);
+        }
+        return $token;
+    }
 }