Level-2 / Transphporm

src/Parser/Tokens.php

Spacing +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
 	}
 
 	public function add($token) {
-		if ($token instanceof Tokens) $this->tokens = array_merge($this->tokens,  $token->tokens);
+		if ($token instanceof Tokens) $this->tokens = array_merge($this->tokens, $token->tokens);
 		else $this->tokens[] = $token;
 	}
 
@@ -87,7 +87,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 +30 added lines, -11 removed lines

@@ -39,8 +39,11 @@ 
 	}
 
 	public function add($token) {
-		if ($token instanceof Tokens) $this->tokens = array_merge($this->tokens,  $token->tokens);
-		else $this->tokens[] = $token;
+		if ($token instanceof Tokens) {
+			$this->tokens = array_merge($this->tokens,  $token->tokens);
+		} else {
+			$this->tokens[] = $token;
+		}
 	}
 
 
@@ -54,9 +57,13 @@ 
 
 	private function getKeyToSlice($tokenType) {
 		$keys = $this->getKeysOfTokenType($tokenType);
-		if (empty($keys)) return false;
+		if (empty($keys)) {
+			return false;
+		}
 		$key = $keys[0];
-		for ($i = 0; $key < $this->iterator && isset($keys[$i]); $i++) $key = $keys[$i];
+		for ($i = 0; $key < $this->iterator && isset($keys[$i]); $i++) {
+			$key = $keys[$i];
+		}
 		return $key;
 	}
 
@@ -70,10 +77,17 @@ 
 
 	private function sliceTokens($tokenType, $type, $increment = false) {
 		$key = $this->getKeyToSlice($tokenType);
-		if ($key === false) return new Tokens([]);
-		if ($increment) $key++;
-		if ($type === "from") return new Tokens(array_slice($this->tokens, $key));
-		else return new Tokens(array_slice($this->tokens, $this->iterator, $key));
+		if ($key === false) {
+			return new Tokens([]);
+		}
+		if ($increment) {
+			$key++;
+		}
+		if ($type === "from") {
+			return new Tokens(array_slice($this->tokens, $key));
+		} else {
+			return new Tokens(array_slice($this->tokens, $this->iterator, $key));
+		}
 	}
 
 	public function skip($count) {
@@ -84,8 +98,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);
@@ -109,7 +126,9 @@ 
 
 	public function removeLine() {
 		$tokens = $this->tokens;
-		foreach ($tokens as &$token) unset($token['line']);
+		foreach ($tokens as &$token) {
+			unset($token['line']);
+		}
 		return new Tokens($tokens);
 	}