Level-2 / Transphporm

src/Parser/Sheet.php

Spacing +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
 
 
 	private function sortPseudo($a, $b) {
-		return count($a->pseudo) < count($b->pseudo)  ? -1  :1;
+		return count($a->pseudo) < count($b->pseudo) ? -1 : 1;
 	}
 
 	private function getProperties($tokens) {

Braces +27 added lines, -10 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);
@@ -45,8 +50,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 @@ 
 		$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) {
@@ -91,7 +101,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));
@@ -111,10 +123,15 @@ 
 
 	private function sortRules($a, $b) {
 		//If they have the same depth, compare on index
-		if ($a->query === $b->query) return $this->sortPseudo($a, $b);
+		if ($a->query === $b->query) {
+			return $this->sortPseudo($a, $b);
+		}
 
-		if ($a->depth === $b->depth) $property = 'index';
-		else $property = 'depth'; 
+		if ($a->depth === $b->depth) {
+			$property = 'index';
+		} else {
+			$property = 'depth';
+		}
 		
 		return ($a->$property < $b->$property) ? -1 : 1;
 	}