Level-2 / Transphporm

src/Parser/Sheet.php

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 
 	private function import($args, $indexStart) {
 		$fileName = $args[0];
-		$sheet = new Sheet(file_get_contents($this->baseDir . $fileName), dirname(realpath($this->baseDir . $fileName)) . DIRECTORY_SEPARATOR, $this->xPath, $this->valueParser);
+		$sheet = new Sheet(file_get_contents($this->baseDir.$fileName), dirname(realpath($this->baseDir.$fileName)).DIRECTORY_SEPARATOR, $this->xPath, $this->valueParser);
 		return $sheet->parse($indexStart);
 	}
 

Doc Comments +13 added lines

@@ -13,6 +13,9 @@ 
 	private $xPath;
 	private $tokenizer; 
 
+	/**
+	 * @param string $tss
+	 */
 	public function __construct($tss, $baseDir, CssToXpath $xPath, Value $valueParser) {
 		$this->tss = $this->stripComments($tss, '//', "\n");
 		$this->tss = $this->stripComments($this->tss, '/*', '*/');
@@ -44,6 +47,9 @@ 
 		return $rules;
 	}
 
+	/**
+	 * @param integer $index
+	 */
 	private function CssToRules($selector, $index, $properties) {
 		$parts = $selector->trim()->splitOnToken(Tokenizer::ARG);
 		$rules = [];
@@ -67,6 +73,9 @@ 
 		return $rules;
 	}
 
+	/**
+	 * @param integer $indexStart
+	 */
 	private function processingInstructions($token, $indexStart) {
 		if ($token['type'] !== Tokenizer::AT_SIGN) return false;
 		$tokens = $this->tss->from(Tokenizer::AT_SIGN, false)->to(Tokenizer::SEMI_COLON, false);
@@ -90,6 +99,10 @@ 
 		return ($a->depth < $b->depth) ? -1 : 1;
 	}
 
+	/**
+	 * @param string $open
+	 * @param string $close
+	 */
 	private function stripComments($str, $open, $close) {
 		$pos = 0;
 		while (($pos = strpos($str, $open, $pos)) !== false) {

Indentation +8 added lines, -8 removed lines

@@ -102,14 +102,14 @@
 	}
 
 	private function getProperties($tokens) {
-        $rules = $tokens->splitOnToken(Tokenizer::SEMI_COLON);
+		$rules = $tokens->splitOnToken(Tokenizer::SEMI_COLON);
 
-        $return = [];
-        foreach ($rules as $rule) {
-            $name = $rule->from(Tokenizer::NAME, true)->to(Tokenizer::COLON)->read();
-            $return[$name] = $rule->from(Tokenizer::COLON)->trim();
-        }
+		$return = [];
+		foreach ($rules as $rule) {
+			$name = $rule->from(Tokenizer::NAME, true)->to(Tokenizer::COLON)->read();
+			$return[$name] = $rule->from(Tokenizer::COLON)->trim();
+		}
 
-        return $return;
-    }
+		return $return;
+	}
 }

Braces +15 added lines, -5 removed lines

@@ -33,7 +33,9 @@ 
 			}
 			$selector = $this->tss->from($token['type'], true)->to(Tokenizer::OPEN_BRACE);
 			$this->tss->skip(count($selector));
-			if (count($selector) === 0) break;
+			if (count($selector) === 0) {
+				break;
+			}
 
 			$newRules = $this->cssToRules($selector, count($rules)+$indexStart, $this->getProperties($this->tss->current()['value']));
 			$rules = $this->writeRule($rules, $newRules);
@@ -44,7 +46,9 @@ 
 	}
 
 	private function checkError($rules) {
-		if (empty($rules) && count($this->tss) > 0) throw new \Exception('No TSS rules parsed');
+		if (empty($rules) && count($this->tss) > 0) {
+			throw new \Exception('No TSS rules parsed');
+		}
 	}
 
 	private function CssToRules($selector, $index, $properties) {
@@ -71,7 +75,9 @@ 
 	}
 
 	private function processingInstructions($token, $indexStart) {
-		if ($token['type'] !== Tokenizer::AT_SIGN) return false;
+		if ($token['type'] !== Tokenizer::AT_SIGN) {
+			return false;
+		}
 		$tokens = $this->tss->from(Tokenizer::AT_SIGN, false)->to(Tokenizer::SEMI_COLON, false);
 		$funcName = $tokens->from(Tokenizer::NAME, true)->read();
 		$args = $this->valueParser->parseTokens($tokens->from(Tokenizer::NAME));
@@ -88,7 +94,9 @@ 
 
 	private function sortRules($a, $b) {
 		//If they have the same depth, compare on index
-		if ($a->depth === $b->depth) return $a->index < $b->index ? -1 : 1;
+		if ($a->depth === $b->depth) {
+			return $a->index < $b->index ? -1 : 1;
+		}
 
 		return ($a->depth < $b->depth) ? -1 : 1;
 	}
@@ -97,7 +105,9 @@ 
 		$pos = 0;
 		while (($pos = strpos($str, $open, $pos)) !== false) {
 			$end = strpos($str, $close, $pos);
-			if ($end === false) break;
+			if ($end === false) {
+				break;
+			}
 			$str = substr_replace($str, '', $pos, $end-$pos+strlen($close));
 		}
 

src/Parser/CssToXpath.php

Indentation +4 added lines, -4 removed lines

@@ -49,11 +49,11 @@
 		$functionSet->setElement($element[0]);
 
 		$attributes = array();
-        foreach($element[0]->attributes as $attribute_name => $attribute_node) {
-            $attributes[$attribute_name] = $attribute_node->nodeValue;
-        }
+		foreach($element[0]->attributes as $attribute_name => $attribute_node) {
+			$attributes[$attribute_name] = $attribute_node->nodeValue;
+		}
 
-        $parser = new \Transphporm\Parser\Value($functionSet, true);
+		$parser = new \Transphporm\Parser\Value($functionSet, true);
 		$return = $parser->parseTokens($attr, $attributes);
 
 		return $return[0] === '' ? false : $return[0];

Spacing +8 added lines, -8 removed lines

@@ -18,12 +18,12 @@ 
 		$this->functionSet = $functionSet;
 
 		$this->translators = [
-			Tokenizer::WHITESPACE => function($string) use ($prefix) { return '//' . $prefix . $string;	},
-			'' => function($string) use ($prefix) { return '/' . $prefix . $string;	},
-			Tokenizer::GREATER_THAN => function($string) use ($prefix) { return '/' . $prefix  . $string; },
-			Tokenizer::NUM_SIGN => function($string) { return '[@id=\'' . $string . '\']'; },
-			Tokenizer::DOT => function($string) { return '[contains(concat(\' \', normalize-space(@class), \' \'), \' ' . $string . ' \')]'; },
-			Tokenizer::OPEN_SQUARE_BRACKET => function($string) use ($hash) { return '[' .'php:function(\'\Transphporm\Parser\CssToXpath::processAttr\', \'' . base64_encode(serialize($string)) . '\', ., "' . $hash . '")' . ']';	}
+			Tokenizer::WHITESPACE => function($string) use ($prefix) { return '//'.$prefix.$string; },
+			'' => function($string) use ($prefix) { return '/'.$prefix.$string; },
+			Tokenizer::GREATER_THAN => function($string) use ($prefix) { return '/'.$prefix.$string; },
+			Tokenizer::NUM_SIGN => function($string) { return '[@id=\''.$string.'\']'; },
+			Tokenizer::DOT => function($string) { return '[contains(concat(\' \', normalize-space(@class), \' \'), \' '.$string.' \')]'; },
+			Tokenizer::OPEN_SQUARE_BRACKET => function($string) use ($hash) { return '['.'php:function(\'\Transphporm\Parser\CssToXpath::processAttr\', \''.base64_encode(serialize($string)).'\', ., "'.$hash.'")'.']'; }
 		];
 	}
 
@@ -47,7 +47,7 @@ 
 		$functionSet->setElement($element[0]);
 
 		$attributes = array();
-        foreach($element[0]->attributes as $attribute_name => $attribute_node) {
+        foreach ($element[0]->attributes as $attribute_name => $attribute_node) {
             $attributes[$attribute_name] = $attribute_node->nodeValue;
         }
 
@@ -78,7 +78,7 @@ 
 		$tokens = [];
 
 		foreach ($css->splitOnToken(Tokenizer::GREATER_THAN) as $token) {
-			foreach ($token->trim() as $t) $tokens[]  = $t;
+			foreach ($token->trim() as $t) $tokens[] = $t;
 			$tokens[] = ['type' => Tokenizer::GREATER_THAN];
 		}
 		$tokens = new Tokens(array_slice($tokens, 0, -1));

Braces +9 added lines, -3 removed lines

@@ -69,7 +69,9 @@ 
 				$selector->type = $token['type'];
 				$selectors[] = $selector;
 			}
-			if (isset($token['value'])) $selectors[count($selectors)-1]->string = $token['value'];
+			if (isset($token['value'])) {
+				$selectors[count($selectors)-1]->string = $token['value'];
+			}
 		}
 		return $selectors;
 	}
@@ -78,7 +80,9 @@ 
 		$tokens = [];
 
 		foreach ($css->splitOnToken(Tokenizer::GREATER_THAN) as $token) {
-			foreach ($token->trim() as $t) $tokens[]  = $t;
+			foreach ($token->trim() as $t) {
+				$tokens[]  = $t;
+			}
 			$tokens[] = ['type' => Tokenizer::GREATER_THAN];
 		}
 		$tokens = new Tokens(array_slice($tokens, 0, -1));
@@ -87,7 +91,9 @@ 
 		$selectors = $this->split($css);
 		$xpath = '/';
 		foreach ($selectors as $selector) {
-			if (isset($this->translators[$selector->type])) $xpath .= $this->translators[$selector->type]($selector->string, $xpath);
+			if (isset($this->translators[$selector->type])) {
+				$xpath .= $this->translators[$selector->type]($selector->string, $xpath);
+			}
 		}
 
 		$xpath = str_replace('/[', '/*[', $xpath);

src/Property/Display.php

Braces +7 added lines, -3 removed lines

@@ -7,8 +7,12 @@
 namespace Transphporm\Property;
 class Display implements \Transphporm\Property {
 	public function run(array $values, \DomElement $element, array $rules, \Transphporm\Hook\PseudoMatcher $pseudoMatcher, array $properties = []) {
-		if ($pseudoMatcher->hasFunction('attr')) $element->removeAttribute($pseudoMatcher->getFuncArgs('attr')[0]);
-		else if (strtolower($values[0]) === 'none') $element->setAttribute('transphporm', 'remove');
-		else $element->setAttribute('transphporm', 'show');
+		if ($pseudoMatcher->hasFunction('attr')) {
+			$element->removeAttribute($pseudoMatcher->getFuncArgs('attr')[0]);
+		} else if (strtolower($values[0]) === 'none') {
+			$element->setAttribute('transphporm', 'remove');
+		} else {
+			$element->setAttribute('transphporm', 'show');
+		}
 	}
 }

src/Hook/Formatter.php

Braces +3 added lines, -1 removed lines

@@ -14,7 +14,9 @@
 	}
 
 	public function format($value, $rules) {
-		if (!isset($rules['format'])) return $value;
+		if (!isset($rules['format'])) {
+			return $value;
+		}
 		$tokens = $rules['format'];
 		
 		$functionName = $tokens->from(\Transphporm\Parser\Tokenizer::NAME, true)->read();

src/Hook/PseudoMatcher.php

Braces +12 added lines, -6 removed lines

@@ -39,31 +39,37 @@
 		$parts['name'] = $this->getFuncName($tokens);
 		if ($parts['name'] === null || in_array($parts['name'], ['data', 'iteration', 'root'])) {
 			$parts['args'] = $this->valueParser->parseTokens($tokens);
-		}
-		else if (count($tokens) > 1) {
+		} else if (count($tokens) > 1) {
 			$tokens->rewind();
 			$tokens->next();
 			$parts['args'] = $this->valueParser->parseTokens($tokens->current()['value']);
+		} else {
+			$parts['args'] = [['']];
 		}
-		else $parts['args'] = [['']];
 		return $parts;
 	}
 
 	private function getFuncName($tokens) {
-		if ($tokens->type() === Tokenizer::NAME) return $tokens->read();
+		if ($tokens->type() === Tokenizer::NAME) {
+			return $tokens->read();
+		}
 		return null;
 	}
 
 	public function hasFunction($name) {
 		foreach ($this->pseudo as $tokens) {
-			if ($name === $this->getFuncName($tokens)) return true;
+			if ($name === $this->getFuncName($tokens)) {
+				return true;
+			}
 		}
 	}
 
 	public function getFuncArgs($name) {
 		foreach ($this->pseudo as $tokens) {
 			$parts = $this->getFuncParts($tokens);
-			if ($name === $parts['name']) return $parts['args'];
+			if ($name === $parts['name']) {
+				return $parts['args'];
+			}
 		}
 	}
 }

src/FunctionSet.php

Braces +1 added lines, -2 removed lines

@@ -20,8 +20,7 @@
 			$tokens = $args[0];
 			$parser = new \Transphporm\Parser\Value($this);
 			$args[0] = $parser->parseTokens($tokens, $this->elementData->getData($this->element));
-		}
-		else if ($args[0] instanceof Parser\Tokens) {
+		} else if ($args[0] instanceof Parser\Tokens) {
 			$args[0] = iterator_to_array($args[0]);
 		}
 		if (isset($this->functions[$name])) {

src/Parser/Tokenizer.php

Spacing +2 added lines, -2 removed lines

@@ -121,7 +121,7 @@ 
 			$string = $this->extractString($i);
 			$length = strlen($string)+1;
 			$char = $this->getChar($char);
-			$string = str_replace('\\' . $char, $char, $string);
+			$string = str_replace('\\'.$char, $char, $string);
 			$tokens[] = ['type' => self::STRING, 'value' => $string];
 			return $length;
 		}
@@ -164,7 +164,7 @@ 
 				$str .= $chars[$token['type']];
 			}
 			if (isset($token['value'])) {
-				if ($token['value'] instanceof Tokens) $str.= $this->serialize($token['value']);
+				if ($token['value'] instanceof Tokens) $str .= $this->serialize($token['value']);
 				else $str .= $token['value'];	
 			}			
 		}

Braces +35 added lines, -14 removed lines

@@ -69,8 +69,11 @@ 
 			$i += $this->doStrings($tokens, $char, $i);
 			$i += $this->doBrackets($tokens, $char, $i);
 		}
-		if ($returnObj) return new Tokens($tokens);
-		else return $tokens;
+		if ($returnObj) {
+			return new Tokens($tokens);
+		} else {
+			return $tokens;
+		}
 	}
 
 	private function doSimpleTokens(&$tokens, $char) {
@@ -93,10 +96,15 @@ 
 	}
 
 	private function processLiterals(&$tokens, $name) {
-		if (is_numeric($name)) $tokens[] = ['type' => self::NUMERIC, 'value' => $name];
-		else if ($name == 'true') $tokens[] = ['type' => self::BOOL, 'value' => true];
-		else if ($name == 'false') $tokens[] = ['type' => self::BOOL, 'value' => false];
-		else $tokens[] = ['type' => self::NAME, 'value' => $name];
+		if (is_numeric($name)) {
+			$tokens[] = ['type' => self::NUMERIC, 'value' => $name];
+		} else if ($name == 'true') {
+			$tokens[] = ['type' => self::BOOL, 'value' => true];
+		} else if ($name == 'false') {
+			$tokens[] = ['type' => self::BOOL, 'value' => false];
+		} else {
+			$tokens[] = ['type' => self::NAME, 'value' => $name];
+		}
 	}
 
 	private function doBrackets(&$tokens, $char, $i) {
@@ -130,7 +138,9 @@ 
 	private function extractString($pos) {
 		$char = $this->str[$pos];
 		$end = strpos($this->str, $char, $pos+1);
-		while ($end !== false && $this->str[$end-1] == '\\') $end = strpos($this->str, $char, $end+1);
+		while ($end !== false && $this->str[$end-1] == '\\') {
+			$end = strpos($this->str, $char, $end+1);
+		}
 
 		return substr($this->str, $pos+1, $end-$pos-1);
 	}
@@ -139,19 +149,27 @@ 
 		$close = strpos($this->str, $closeBracket, $open);
 
 		$cPos = $open+1;
-		while (($cPos = strpos($this->str, $startBracket, $cPos+1)) !== false && $cPos < $close) $close = strpos($this->str, $closeBracket, $close+1);
+		while (($cPos = strpos($this->str, $startBracket, $cPos+1)) !== false && $cPos < $close) {
+			$close = strpos($this->str, $closeBracket, $close+1);
+		}
 		return substr($this->str, $open+1, $close-$open-1);
 	}
 
 	private function identifyChar($chr) {
-		if (isset($this->chars[$chr])) return $this->chars[$chr];
-		else return self::NAME;
+		if (isset($this->chars[$chr])) {
+			return $this->chars[$chr];
+		} else {
+			return self::NAME;
+		}
 	}
 
 	private function getChar($num) {
 		$chars = array_reverse($this->chars);
-		if (isset($chars[$num])) return $chars[$num];
-		else return false;
+		if (isset($chars[$num])) {
+			return $chars[$num];
+		} else {
+			return false;
+		}
 	}
 
 	public function serialize($tokens) {
@@ -164,8 +182,11 @@ 
 				$str .= $chars[$token['type']];
 			}
 			if (isset($token['value'])) {
-				if ($token['value'] instanceof Tokens) $str.= $this->serialize($token['value']);
-				else $str .= $token['value'];	
+				if ($token['value'] instanceof Tokens) {
+					$str.= $this->serialize($token['value']);
+				} else {
+					$str .= $token['value'];
+				}
 			}			
 		}
 

src/Parser/Value.php

Braces +22 added lines, -16 removed lines

@@ -49,10 +49,14 @@ 
 		$this->data = new ValueData($data ? $data : $this->baseData);
 		$this->last = null;
 
-		if (count($tokens) <= 0) return [$data];
+		if (count($tokens) <= 0) {
+			return [$data];
+		}
 
 		foreach ($tokens as $token) {
-			if ($token['type'] !== Tokenizer::WHITESPACE) $this->{$this->tokenFuncs[$token['type']]}($token);
+			if ($token['type'] !== Tokenizer::WHITESPACE) {
+				$this->{$this->tokenFuncs[$token['type']]}($token);
+			}
 		}
 
 		$this->processLast();
@@ -71,13 +75,15 @@ 
 	//Reads the last selected value from $data regardless if it's an array or object and overrides $this->data with the new value
 	//Dot moves $data to the next object in $data foo.bar moves the $data pointer from `foo` to `bar`
 	private function processDot($token) {
-		if ($this->last !== null) $this->data->traverse($this->last);
-		else {
+		if ($this->last !== null) {
+			$this->data->traverse($this->last);
+		} else {
 			//When . is not preceeded by anything, treat it as part of the string instead of an operator
 			// foo.bar is treated as looking up `bar` in `foo` whereas .foo is treated as the string ".foo"
 			$lastResult = $this->result->pop();
-			if ($lastResult) $this->data = new ValueData($lastResult);
-			else {
+			if ($lastResult) {
+				$this->data = new ValueData($lastResult);
+			} else {
 				$this->processString(['value' => '.']);
 				$this->result->setMode(Tokenizer::CONCAT);
 			}
@@ -90,9 +96,10 @@ 
 		$parser = new Value($this->baseData, $this->autoLookup);
 		if ($this->baseData instanceof \Transphporm\Functionset && $this->baseData->hasFunction($this->last)) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
-			if ($this->last !== null) $this->data->traverse($this->last);
+		} else {
+			if ($this->last !== null) {
+				$this->data->traverse($this->last);
+			}
 			$this->last = $parser->parseTokens($token['value'], null)[0];
 		}
 	}
@@ -112,8 +119,7 @@ 
 	private function processBrackets($token) {
 		if ($this->baseData instanceof \Transphporm\Functionset && $this->baseData->hasFunction($this->last)) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
+		} else {
 			$this->processNested($token);
 		}
 	}
@@ -130,7 +136,9 @@ 
 		foreach ($this->result->getResult() as $i => $value) {
 			if (is_scalar($value)) {
 				$val = $this->data->read($value);
-				if ($val) $this->result[$i] = $val;
+				if ($val) {
+					$this->result[$i] = $val;
+				}
 			}
 		}
 		$this->last = null;
@@ -142,12 +150,10 @@ 
 			try {
 				$value = $this->data->extract($this->last, $this->autoLookup);
 				$this->result->processValue($value);
-			}
-			catch (\UnexpectedValueException $e) {
+			} catch (\UnexpectedValueException $e) {
 				if (!$this->autoLookup) {
 					$this->result->processValue($this->last);
-				}
-				else {
+				} else {
 					$this->result->clear();
 					$this->result[0] = false;
 				}

src/Parser/Tokens.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
 			if ($token['type'] === $tokenType) $i++;
 			else $splitTokens[$i][] = $token;
 		}
-        return array_map(function ($tokens) {
+        return array_map(function($tokens) {
             return new Tokens($tokens);
         }, $splitTokens);
 		//return $splitTokens;

Braces +23 added lines, -8 removed lines

@@ -51,19 +51,31 @@ 
 
     public function from($tokenType, $inclusive = false) {
         $keys = $this->getKeysOfTokenType($tokenType);
-        if (count($keys) === 0) return new Tokens([]);
+        if (count($keys) === 0) {
+        	return new Tokens([]);
+        }
         $key = $keys[0];
-        for ($i = 0; $key < $this->iterator; $i++) $key = $keys[$i];
-        if (!$inclusive) $key++;
+        for ($i = 0; $key < $this->iterator; $i++) {
+        	$key = $keys[$i];
+        }
+        if (!$inclusive) {
+        	$key++;
+        }
         return new Tokens(array_slice($this->tokens, $key));
     }
 
     public function to($tokenType, $inclusive = false) {
         $keys = $this->getKeysOfTokenType($tokenType);
-        if (empty($keys)) return new Tokens([]);
+        if (empty($keys)) {
+        	return new Tokens([]);
+        }
         $key = $keys[0];
-        for ($i = 0; $key < $this->iterator; $i++) $key = $keys[$i];
-        if ($inclusive) $key++;
+        for ($i = 0; $key < $this->iterator; $i++) {
+        	$key = $keys[$i];
+        }
+        if ($inclusive) {
+        	$key++;
+        }
         return new Tokens(array_slice($this->tokens, 0, $key));
     }
 
@@ -75,8 +87,11 @@ 
         $splitTokens = [];
 		$i = 0;
 		foreach ($this->tokens as $token) {
-			if ($token['type'] === $tokenType) $i++;
-			else $splitTokens[$i][] = $token;
+			if ($token['type'] === $tokenType) {
+				$i++;
+			} else {
+				$splitTokens[$i][] = $token;
+			}
 		}
         return array_map(function ($tokens) {
             return new Tokens($tokens);

Indentation +63 added lines, -63 removed lines

@@ -6,28 +6,28 @@ 
  * @version         1.0                                                             */
 namespace Transphporm\Parser;
 class Tokens implements \Iterator, \Countable {
-    private $tokens;
-    private $iterator = 0;
+	private $tokens;
+	private $iterator = 0;
 
-    public function __construct(array $tokens) {
-        $this->tokens = $tokens;
-    }
+	public function __construct(array $tokens) {
+		$this->tokens = $tokens;
+	}
 
-    public function count() {
-        return count($this->tokens);
-    }
+	public function count() {
+		return count($this->tokens);
+	}
 
-    // Iterator Functions
-    public function current() {
-        return $this->tokens[$this->iterator];
-    }
+	// Iterator Functions
+	public function current() {
+		return $this->tokens[$this->iterator];
+	}
 
-    public function key() {
-        return $this->iterator;
-    }
+	public function key() {
+		return $this->iterator;
+	}
 
-    public function next() {
-        ++$this->iterator;
+	public function next() {
+		++$this->iterator;
 	}
 
 	public function valid() {
@@ -38,63 +38,63 @@ 
 		$this->iterator = 0;
 	}
 
-    private function getKeysOfTokenType($tokenType) {
-        return array_keys(array_column($this->tokens, 'type'), $tokenType);
-    }
+	private function getKeysOfTokenType($tokenType) {
+		return array_keys(array_column($this->tokens, 'type'), $tokenType);
+	}
 
-    public function from($tokenType, $inclusive = false) {
-        $keys = $this->getKeysOfTokenType($tokenType);
-        if (count($keys) === 0) return new Tokens([]);
-        $key = $keys[0];
-        for ($i = 0; $key < $this->iterator; $i++) $key = $keys[$i];
-        if (!$inclusive) $key++;
-        return new Tokens(array_slice($this->tokens, $key));
-    }
+	public function from($tokenType, $inclusive = false) {
+		$keys = $this->getKeysOfTokenType($tokenType);
+		if (count($keys) === 0) return new Tokens([]);
+		$key = $keys[0];
+		for ($i = 0; $key < $this->iterator; $i++) $key = $keys[$i];
+		if (!$inclusive) $key++;
+		return new Tokens(array_slice($this->tokens, $key));
+	}
 
-    public function to($tokenType, $inclusive = false) {
-        $keys = $this->getKeysOfTokenType($tokenType);
-        if (empty($keys)) return new Tokens([]);
-        $key = $keys[0];
-        for ($i = 0; $key < $this->iterator; $i++) $key = $keys[$i];
-        if ($inclusive) $key++;
-        return new Tokens(array_slice($this->tokens, 0, $key));
-    }
+	public function to($tokenType, $inclusive = false) {
+		$keys = $this->getKeysOfTokenType($tokenType);
+		if (empty($keys)) return new Tokens([]);
+		$key = $keys[0];
+		for ($i = 0; $key < $this->iterator; $i++) $key = $keys[$i];
+		if ($inclusive) $key++;
+		return new Tokens(array_slice($this->tokens, 0, $key));
+	}
 
-    public function skip($count) {
-        $this->iterator += $count;
-    }
+	public function skip($count) {
+		$this->iterator += $count;
+	}
 
-    public function splitOnToken($tokenType) {
-        $splitTokens = [];
+	public function splitOnToken($tokenType) {
+		$splitTokens = [];
 		$i = 0;
 		foreach ($this->tokens as $token) {
 			if ($token['type'] === $tokenType) $i++;
 			else $splitTokens[$i][] = $token;
 		}
-        return array_map(function ($tokens) {
-            return new Tokens($tokens);
-        }, $splitTokens);
+		return array_map(function ($tokens) {
+			return new Tokens($tokens);
+		}, $splitTokens);
 		//return $splitTokens;
-    }
+	}
 
-    public function trim() {
-        $tokens = $this->tokens;
-        // Remove end whitespace
-        while (end($tokens)['type'] === Tokenizer::WHITESPACE) {
-            array_pop($tokens);
-        }
-        // Remove begining whitespace
-        while (isset($tokens[0]) && $tokens[0]['type'] === Tokenizer::WHITESPACE) {
-            array_shift($tokens);
-        }
-        return new Tokens($tokens);
-    }
+	public function trim() {
+		$tokens = $this->tokens;
+		// Remove end whitespace
+		while (end($tokens)['type'] === Tokenizer::WHITESPACE) {
+			array_pop($tokens);
+		}
+		// Remove begining whitespace
+		while (isset($tokens[0]) && $tokens[0]['type'] === Tokenizer::WHITESPACE) {
+			array_shift($tokens);
+		}
+		return new Tokens($tokens);
+	}
 
-    public function read($offset = 0) {
-        return isset($this->tokens[$offset]) ? $this->tokens[$offset]['value'] : false;
-    }
+	public function read($offset = 0) {
+		return isset($this->tokens[$offset]) ? $this->tokens[$offset]['value'] : false;
+	}
 
-    public function type($offset = 0) {
-        return isset($this->tokens[$offset]) ? $this->tokens[$offset]['type'] : false;   
-    }
+	public function type($offset = 0) {
+		return isset($this->tokens[$offset]) ? $this->tokens[$offset]['type'] : false;   
+	}
 }