Level-2 / Transphporm

src/Parser/Sheet.php

Braces +22 added lines, -8 removed lines

@@ -25,14 +25,19 @@ 
 			$this->file = $tss;
 			$this->rules = $this->cache->load($tss);
 			$this->filePath->addPath(dirname(realpath($tss)));
-			if (empty($this->rules)) $tss = file_get_contents($tss);
-			else return;
+			if (empty($this->rules)) {
+				$tss = file_get_contents($tss);
+			} else {
+				return;
+			}
 		}
 		$this->tss = (new Tokenizer($tss))->getTokens();
 	}
 
 	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);
@@ -44,8 +49,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;
@@ -55,14 +61,18 @@ 
 		$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) {
@@ -89,7 +99,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));
@@ -109,7 +121,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;
 	}

src/Parser/CssToXpath.php

Braces +12 added lines, -4 removed lines

@@ -70,7 +70,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;
 	}
@@ -80,7 +82,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);
@@ -92,11 +96,15 @@ 
 		$tokens = new Tokens;
 		$split = $css->splitOnToken(Tokenizer::GREATER_THAN);
 
-		if (count($split) <= 1) return $css;
+		if (count($split) <= 1) {
+			return $css;
+		}
 
 		for ($i = 0; $i < count($split); $i++) {
 			$tokens->add($split[$i]->trim());
-			if (isset($split[$i+1])) $tokens->add(['type' => Tokenizer::GREATER_THAN]);
+			if (isset($split[$i+1])) {
+				$tokens->add(['type' => Tokenizer::GREATER_THAN]);
+			}
 		}
 		
 		return $tokens;

src/Parser/Tokens.php

Braces +30 added lines, -11 removed lines

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

src/Parser/Tokenizer/TokenizedString.php

Braces +16 added lines, -6 removed lines

@@ -40,8 +40,11 @@ 
 	}
 
 	public function move($n) {
-		if ($n === false) $this->pos = strlen($this->str)-1;
-		else $this->pos += $n;
+		if ($n === false) {
+			$this->pos = strlen($this->str)-1;
+		} else {
+			$this->pos += $n;
+		}
 	}
 
 	public function next() {
@@ -60,8 +63,11 @@ 
 
 	public function identifyChar($offset = 0) {
 		$chr = $this->str[$this->pos + $offset];
-		if (!empty($this->chars[$chr])) return $this->chars[$chr];
-		else return Tokenizer::NAME;
+		if (!empty($this->chars[$chr])) {
+			return $this->chars[$chr];
+		} else {
+			return Tokenizer::NAME;
+		}
 	}
 
 	public function has($offset = 0) {
@@ -85,7 +91,9 @@ 
 		$pos = $this->pos + $offset;
 		$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);
 	}
@@ -95,7 +103,9 @@ 
 		$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);
 	}
 

src/Parser/Tokenizer/Literals.php

Braces +9 added lines, -4 removed lines

@@ -32,9 +32,14 @@
 	}
 
 	private function processLiterals($tokens, $name, $str) {
-		if (is_numeric($name)) $tokens->add(['type' => Tokenizer::NUMERIC, 'value' => $name]);
-		else if ($name == 'true') $tokens->add(['type' => Tokenizer::BOOL, 'value' => true]);
-		else if ($name == 'false') $tokens->add(['type' => Tokenizer::BOOL, 'value' => false]);
-		else $tokens->add(['type' => Tokenizer::NAME, 'value' => $name, 'line' => $str->lineNo()]);
+		if (is_numeric($name)) {
+			$tokens->add(['type' => Tokenizer::NUMERIC, 'value' => $name]);
+		} else if ($name == 'true') {
+			$tokens->add(['type' => Tokenizer::BOOL, 'value' => true]);
+		} else if ($name == 'false') {
+			$tokens->add(['type' => Tokenizer::BOOL, 'value' => false]);
+		} else {
+			$tokens->add(['type' => Tokenizer::NAME, 'value' => $name, 'line' => $str->lineNo()]);
+		}
 	}
 }
\ No newline at end of file