Updated reserved

Author: nilportugues

src/Tokenizer/Parser/Reserved.php

@@ -19,54 +19,43 @@
 final class Reserved
 {
     /**
-     * @param array  $matches
+     * @param array $matches
      * @param string $previous
      * @param string $string
-     * @param string $reservedTopLevel
-     * @param string $reservedNewLine
-     * @param string $boundaries
-     * @param string $reserved
+     * @param Tokenizer $tokenizer
      *
      * @return array
      */
-    public static function isReserved(
-        array &$matches,
-        $previous,
-        $string,
-        $reservedTopLevel,
-        $reservedNewLine,
-        $boundaries,
-        $reserved
-    ) {
+    public static function isReserved(array &$matches, $previous, $string, Tokenizer $tokenizer)
+    {
         $tokenData = [];
 
         if (Reserved::isReservedPrecededByDotCharacter($previous)) {
-
             Reserved::getReservedString(
                 $tokenData,
                 Tokenizer::TOKEN_TYPE_RESERVED_TOP_LEVEL,
                 $string,
                 $matches,
-                $reservedTopLevel,
-                $boundaries
+                $tokenizer->getRegexReservedTopLevel(),
+                $tokenizer->getRegexBoundaries()
             );
 
             Reserved::getReservedString(
                 $tokenData,
                 Tokenizer::TOKEN_TYPE_RESERVED_NEWLINE,
                 strtoupper($string),
                 $matches,
-                $reservedNewLine,
-                $boundaries
+                $tokenizer->getRegexReservedNewLine(),
+                $tokenizer->getRegexBoundaries()
             );
 
             Reserved::getReservedString(
                 $tokenData,
                 Tokenizer::TOKEN_TYPE_RESERVED,
                 $string,
                 $matches,
-                $reserved,
-                $boundaries
+                $tokenizer->getRegexReserved(),
+                $tokenizer->getRegexBoundaries()
             );
         }
 

src/Tokenizer/Tokenizer.php

@@ -228,15 +228,7 @@ protected function getNextToken($string, $previous = null)
             return Boundary::getBoundaryCharacter($matches);
         }
 
-        $isReserved = Reserved::isReserved(
-            $matches,
-            $previous,
-            $string,
-            $this->regexReservedTopLevel,
-            $this->regexReservedNewLine,
-            $this->regexBoundaries,
-            $this->regexReserved
-        );
+        $isReserved = Reserved::isReserved($matches, $previous, $string, $this);
 
         if (0 !== count($isReserved)) {
             return $isReserved;
@@ -260,4 +252,44 @@ protected function quoteRegex($string)
     {
         return preg_quote($string, '/');
     }
+
+    /**
+     * @return string
+     */
+    public function getRegexBoundaries()
+    {
+        return $this->regexBoundaries;
+    }
+
+    /**
+     * @return string
+     */
+    public function getRegexFunction()
+    {
+        return $this->regexFunction;
+    }
+
+    /**
+     * @return string
+     */
+    public function getRegexReserved()
+    {
+        return $this->regexReserved;
+    }
+
+    /**
+     * @return string
+     */
+    public function getRegexReservedNewLine()
+    {
+        return $this->regexReservedNewLine;
+    }
+
+    /**
+     * @return string
+     */
+    public function getRegexReservedTopLevel()
+    {
+        return $this->regexReservedTopLevel;
+    }
 }