- Clean up some redundant code for doing the indent.

- Support for changing the indent character from tab to space.
- Support for specifying how many spaces to indent.
- Cli interface for the same.

bin/twigify.php

@@ -19,11 +19,14 @@
 
 $fileName = "";
 
-$converter = new Converter();
+$indenter = new \BambooHR\Twigify\Indenter();
+$converter = new Converter($indenter);
 for($i=1;$i<count($_SERVER['argv']); ++$i) {
 	$arg = $_SERVER['argv'][$i];
-	if($arg=='-j' || $arg=='jinja') {
-		$converter = new JinjaConverter();
+	if($arg=='-j' || $arg=='--jinja') {
+		$converter = new JinjaConverter($indenter);
+	} else if($arg=='-s' && $i+1 < count($_SERVER['argv'])) {
+		$indenter->setIndent(" ", $_SERVER['argv'][++$i] );
 	} else {
 		$fileName = $arg;
 	}

lib/Converter.php

@@ -23,9 +23,9 @@ class Converter extends \PhpParser\PrettyPrinter\Standard {
 	private $errors = [];
 	protected $indenter;
 
-	public function __construct(array $options = []) {
+	public function __construct(Indenter $indenter, array $options = []) {
 		parent::__construct($options);
-		$this->indenter=new Indenter();
+		$this->indenter = $indenter;
 	}
 
 
@@ -486,20 +486,15 @@ public function pStmt_Function(Stmt\Function_ $node) {
 		}
 		$ret.=")";
 		$this->indenter->statement($ret);
-		$this->indenter->indent();
-		$this->pStmts($node->stmts);
-		$this->indenter->unindent();
+		$this->pStmts($node->stmts, true);
 		$this->indenter->statement("endmacro");
-        return $ret;
     }
 
     // Control flow
 
     public function pStmt_If(Stmt\If_ $node) {
 		$this->indenter->statement("if " . $this->p($node->cond));
-		$this->indenter->indent();
-		$this->pStmts($node->stmts);
-		$this->indenter->unindent();
+		$this->pStmts($node->stmts, true);
 		foreach($node->elseifs as $stmt) {
 			$this->p($stmt);
 		}
@@ -511,16 +506,12 @@ public function pStmt_If(Stmt\If_ $node) {
 
     public function pStmt_ElseIf(Stmt\ElseIf_ $node) {
 		$this->indenter->statement('elseif ' . $this->p($node->cond) . ')' );
-		$this->indenter->indent();
-		$this->pStmts($node->stmts);
-		$this->indenter->unindent();
+		$this->pStmts($node->stmts, true);
     }
 
     public function pStmt_Else(Stmt\Else_ $node) {
 		$this->indenter->statement("else");
-		$this->indenter->indent();
-		$this->pStmts($node->stmts);
-		$this->indenter->unindent();
+		$this->pStmts($node->stmts, true);
     }
 
 	private function getForMax(Stmt\For_ $node) {
@@ -598,13 +589,14 @@ public function pStmt_For(Stmt\For_ $node) {
 		$step = $this->getForStep($name, $node);
 
 		$this->indenter->statement("for $loopCounter in range($min, $max, $step)");
-		$this->indenter->indent();
-		$this->pStmts($node->stmts);
-		$this->indenter->unindent();
+		$this->pStmts($node->stmts,true);
 		$this->indenter->statement("endfor");
     }
 
 	protected function pStmts(array $nodes, $indent = true) {
+		if($indent) {
+			$this->indenter->indent();
+		}
         foreach ($nodes as $node) {
             $this->pComments($node->getAttribute('comments', array()));
 			if ($node instanceof Expr) {
@@ -619,6 +611,9 @@ protected function pStmts(array $nodes, $indent = true) {
 				$this->p($node);
 			}
         }
+        if($indent) {
+			$this->indenter->unindent();
+		}
     }
 
     public function pStmt_Foreach(Stmt\Foreach_ $node) {
@@ -627,9 +622,7 @@ public function pStmt_Foreach(Stmt\Foreach_ $node) {
              . $this->p($node->valueVar) 
 			 . " in ". $this->p($node->expr)
 		);
-		$this->indenter->indent();
-		$this->pStmts($node->stmts);
-		$this->indenter->unindent();
+		$this->pStmts($node->stmts, true);
 		$this->indenter->statement("endfor");
     }
 
@@ -718,7 +711,7 @@ protected function pComments(array $comments) {
     }
 
     public function prettyPrint(array $stmts) {
-		$this->pStmts( $stmts );
+		$this->pStmts( $stmts, false );
 		return $this->indenter->getOutput();
 	}
 }

lib/Indenter.php

@@ -7,8 +7,8 @@
 namespace BambooHR\Twigify;
 
 class Indenter {
-	const TAB =  "\t";
 	private $indent = 0;
+	private $indentSequence = "\t";
 	private $inTag = false;
 	private $inCloseTag = false;
 
@@ -24,6 +24,10 @@ class Indenter {
 
 	private $output = "";
 
+	function setIndent($str, $count) {
+		$this->indentSequence = str_repeat($str, $count);
+	}
+
 	function indent() {
 		$this->indent++;
 	}
@@ -41,7 +45,7 @@ function append($str) {
 	}
 
 	function newLine() {
-		$this->output = rtrim($this->output)."\n". str_repeat(self::TAB, $this->indent);
+		$this->output = rtrim($this->output)."\n". str_repeat($this->indentSequence, $this->indent);
 	}
 
 	function statement($str) {

lib/JinjaConverter.php

@@ -12,10 +12,8 @@
 class JinjaConverter extends Converter
 {
 	public function pStmt_ElseIf(Stmt\ElseIf_ $node) {
-		$this->indenter->statement("elif " . $this->p($node->cond) . ')' );
-		$this->indenter->indent();
+		$this->indenter->statement("elif " . $this->p($node->cond) . ')', true );
 		$this->pStmts($node->stmts);
-		$this->indenter->unindent();
 	}
 
 	public function pStmt_Foreach(Stmt\Foreach_ $node) {
@@ -26,19 +24,15 @@ public function pStmt_Foreach(Stmt\Foreach_ $node) {
 				. $this->p($node->valueVar)
 				. " in " . $this->p($node->expr) . '.iteritems()'
 			);
-			$this->indenter->indent();
-			$this->pStmts($node->stmts);
-			$this->indenter->unindent();
+			$this->pStmts($node->stmts,true);
 			$this->indenter->statement('endfor');
 		} else {
 			$this->indenter->statement(
 				'for '
 				. $this->p($node->valueVar)
 				. " in " . $this->p($node->expr)
 			);
-			$this->indenter->indent();
-			$this->pStmts($node->stmts);
-			$this->indenter->unindent();
+			$this->pStmts($node->stmts,true);
 		}
 	}
 }

sample-files/test.php

@@ -31,7 +31,7 @@
 
 <html> <head>
 		<style>
-			.a { color: red} 
+			.a { color: red; } 
 
 			div { 
 				margin: 5px;