Separation of concerns for Tokenizer

Author: nilportugues

src/Formatter.php

@@ -13,8 +13,8 @@
 use NilPortugues\SqlQueryFormatter\Helper\Indent;
 use NilPortugues\SqlQueryFormatter\Helper\NewLine;
 use NilPortugues\SqlQueryFormatter\Helper\Parentheses;
-use NilPortugues\SqlQueryFormatter\Helper\Tokenizer;
 use NilPortugues\SqlQueryFormatter\Helper\WhiteSpace;
+use NilPortugues\SqlQueryFormatter\Tokenizer\Tokenizer;
 
 /**
  * Lightweight Formatter heavily based on https://github.com/jdorn/sql-formatter.
@@ -84,8 +84,9 @@ public function format($sql)
         foreach ($tokens as $i => $token) {
             $queryValue = $token[Tokenizer::TOKEN_VALUE];
 
-            $this->indentation->increaseSpecialIndent($this);
-            $this->indentation->increaseBlockIndent($this);
+            $this->indentation
+                ->increaseSpecialIndent()
+                ->increaseBlockIndent();
 
             $addedNewline = $this->newLine->addNewLineBreak($tab);
 

src/Helper/Comment.php

@@ -11,6 +11,7 @@
 namespace NilPortugues\SqlQueryFormatter\Helper;
 
 use NilPortugues\SqlQueryFormatter\Formatter;
+use NilPortugues\SqlQueryFormatter\Tokenizer\Tokenizer;
 
 /**
  * Class Comment

src/Helper/Indent.php

@@ -46,6 +46,8 @@ class Indent
 
     /**
      * Increase the Special Indent if increaseSpecialIndent is true after the current iteration.
+     *
+     * @return $this
      */
     public function increaseSpecialIndent()
     {
@@ -54,10 +56,13 @@ public function increaseSpecialIndent()
             $this->increaseSpecialIndent = false;
             array_unshift($this->indentTypes, 'special');
         }
+        return $this;
     }
 
     /**
      * Increase the Block Indent if increaseBlockIndent is true after the current iteration.
+     *
+     * @return $this
      */
     public function increaseBlockIndent()
     {
@@ -66,26 +71,32 @@ public function increaseBlockIndent()
             $this->increaseBlockIndent = false;
             array_unshift($this->indentTypes, 'block');
         }
+        return $this;
     }
 
     /**
      * Closing parentheses decrease the block indent level.
+     *
+     * @param Formatter $formatter
+     *
+     * @return $this
      */
     public function decreaseIndentLevelUntilIndentTypeIsSpecial(Formatter $formatter)
     {
         $formatter->setFormattedSql(rtrim($formatter->getFormattedSql(), ' '));
         $this->indentLvl--;
 
         while ($j = array_shift($this->indentTypes)) {
-            if ($j === 'special') {
-                $this->indentLvl--;
-            } else {
+            if ('special' !== $j) {
                 break;
             }
+            $this->indentLvl--;
         }
+        return $this;
     }
 
     /**
+     * @return $this
      */
     public function decreaseSpecialIndentIfCurrentIndentTypeIsSpecial()
     {
@@ -95,6 +106,7 @@ public function decreaseSpecialIndentIfCurrentIndentTypeIsSpecial()
             $this->indentLvl--;
             array_shift($this->indentTypes);
         }
+        return $this;
     }
 
     /**

src/Helper/NewLine.php

@@ -11,6 +11,7 @@
 namespace NilPortugues\SqlQueryFormatter\Helper;
 
 use NilPortugues\SqlQueryFormatter\Formatter;
+use NilPortugues\SqlQueryFormatter\Tokenizer\Tokenizer;
 
 /**
  * Class NewLine
@@ -148,8 +149,8 @@ public function writeNewLineBecauseOfComma()
         $this->newline = true;
 
         if (true === $this->formatter->getClauseLimit()) {
-            $this->newline     = false;
-            $this->clauseLimit = false;
+            $this->newline = false;
+            $this->formatter->setClauseLimit(false);
         }
     }
 
@@ -174,6 +175,14 @@ public function writeNewLineBeforeReservedWord($addedNewline, $tab)
         }
     }
 
+    /**
+     * @return boolean
+     */
+    public function getNewline()
+    {
+        return $this->newline;
+    }
+
     /**
      * @param boolean $newline
      *
@@ -184,12 +193,4 @@ public function setNewline($newline)
         $this->newline = $newline;
         return $this;
     }
-
-    /**
-     * @return boolean
-     */
-    public function getNewline()
-    {
-        return $this->newline;
-    }
 }

src/Helper/Parentheses.php

@@ -11,6 +11,7 @@
 namespace NilPortugues\SqlQueryFormatter\Helper;
 
 use NilPortugues\SqlQueryFormatter\Formatter;
+use NilPortugues\SqlQueryFormatter\Tokenizer\Tokenizer;
 
 /**
  * Class Parentheses