Level-2 / Transphporm

src/Parser/Tokens.php

Braces +26 added lines, -9 removed lines

@@ -44,23 +44,35 @@ 
 
     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;
     }
 
     public function from($tokenType, $inclusive = false) {
         $key = $this->getKeyToSlice($tokenType);
-        if ($key === false) return new Tokens([]);
-        if (!$inclusive) $key++;
+        if ($key === false) {
+        	return new Tokens([]);
+        }
+        if (!$inclusive) {
+        	$key++;
+        }
         return new Tokens(array_slice($this->tokens, $key));
     }
 
     public function to($tokenType, $inclusive = false) {
         $key = $this->getKeyToSlice($tokenType);
-        if ($key === false) return new Tokens([]);
-        if ($inclusive) $key++;
+        if ($key === false) {
+        	return new Tokens([]);
+        }
+        if ($inclusive) {
+        	$key++;
+        }
         return new Tokens(array_slice($this->tokens, $this->iterator, $key));
     }
 
@@ -72,8 +84,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);
@@ -96,7 +111,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);
     }
 

src/Parser/Sheet.php

Braces +25 added lines, -9 removed lines

@@ -25,8 +25,11 @@ 
 			$this->file = $tss;
 			$this->rules = $this->cache->load($tss);
 			$this->filePath->setBaseDir(dirname(realpath($tss)) . DIRECTORY_SEPARATOR);
-			if (empty($this->rules)) $tss = file_get_contents($tss);
-			else return;
+			if (empty($this->rules)) {
+				$tss = file_get_contents($tss);
+			} else {
+				return;
+			}
 		}
 		$this->tss = $this->stripComments($tss, '//', "\n");
 		$this->tss = $this->stripComments($this->tss, '/*', '*/');
@@ -35,7 +38,9 @@ 
 	}
 
 	public function parse($indexStart = 0) {
-		if (!empty($this->rules)) return $this->rules['rules'];
+		if (!empty($this->rules)) {
+			return $this->rules['rules'];
+		}
 		$rules = $this->parseTokens($indexStart);
 		usort($rules, [$this, 'sortRules']);
 		$this->checkError($rules);
@@ -47,8 +52,9 @@ 
 		foreach (new TokenFilterIterator($this->tss, [Tokenizer::WHITESPACE]) as $token) {
 			if ($processing = $this->processingInstructions($token, count($this->rules)+$indexStart)) {
 				$this->rules = array_merge($this->rules, $processing);
+			} else if ($token['type'] !== Tokenizer::NEW_LINE) {
+				$this->addRules($token, $indexStart);
 			}
-			else if ($token['type'] !== Tokenizer::NEW_LINE) $this->addRules($token, $indexStart);
 		}
 		return $this->rules;
 	}
@@ -56,14 +62,18 @@ 
 	private function addRules($token, $indexStart) {
 		$selector = $this->tss->from($token['type'], true)->to(Tokenizer::OPEN_BRACE);
 		$this->tss->skip(count($selector));
-		if (count($selector) === 0) return;
+		if (count($selector) === 0) {
+			return;
+		}
 
 		$newRules = $this->cssToRules($selector, count($this->rules)+$indexStart, $this->getProperties($this->tss->current()['value']), $token['line']);
 		$this->rules = $this->writeRule($this->rules, $newRules);
 	}
 
 	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, $line) {
@@ -90,7 +100,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));
@@ -112,7 +124,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;
 	}
@@ -121,7 +135,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/Tokenizer.php

Braces +30 added lines, -12 removed lines

@@ -79,8 +79,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) {
@@ -117,10 +120,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, 'line' => $this->lineNo];
+		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, 'line' => $this->lineNo];
+		}
 	}
 
 	private function doBrackets(&$tokens, $char, $i) {
@@ -154,7 +162,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);
 	}
@@ -163,18 +173,26 @@ 
 		$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;
+		}
 	}
 }