Level-2 / Transphporm

src/Parser/Sheet.php

Doc Comments +16 added lines

@@ -43,6 +43,9 @@ 
 		return $this->cache->write($this->file, $rules, $this->import);
 	}
 
+	/**
+	 * @param integer $indexStart
+	 */
 	private function parseTokens($indexStart) {
 		$this->rules = [];
 		$line = 1;
@@ -60,6 +63,9 @@ 
 		return $this->rules;
 	}
 
+	/**
+	 * @param integer $line
+	 */
 	private function addRules($token, $indexStart, $line) {
 		$selector = $this->tss->from($token['type'], true)->to(Tokenizer::OPEN_BRACE);
 		$this->tss->skip(count($selector));
@@ -73,6 +79,9 @@ 
 		if (empty($rules) && count($this->tss) > 0) throw new \Exception('No TSS rules parsed');
 	}
 
+	/**
+	 * @param integer $index
+	 */
 	private function CssToRules($selector, $index, $properties, $line) {
 		$parts = $selector->trim()->splitOnToken(Tokenizer::ARG);
 		$rules = [];
@@ -96,6 +105,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);
@@ -123,6 +135,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) {

Braces +31 added lines, -13 removed lines

@@ -24,8 +24,11 @@ 
 			$this->file = $tss;
 			$this->rules = $this->cache->load($tss);
 			$baseDir = 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, '/*', '*/');
@@ -36,7 +39,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);
@@ -50,12 +55,12 @@ 
 			if ($processing = $this->processingInstructions($token, count($this->rules)+$indexStart)) {
 				$this->rules = array_merge($this->rules, $processing);
 				continue;
-			}
-			else if ($token['type'] === Tokenizer::NEW_LINE) {
+			} else if ($token['type'] === Tokenizer::NEW_LINE) {
 				$line++;
 				continue;
+			} else {
+				$this->addRules($token, $indexStart, $line);
 			}
-			else $this->addRules($token, $indexStart, $line);
 		}
 		return $this->rules;
 	}
@@ -63,14 +68,18 @@ 
 	private function addRules($token, $indexStart, $line) {
 		$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']), $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) {
@@ -97,7 +106,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,8 +120,11 @@ 
 	}
 
 	private function import($args, $indexStart) {
-		if ($this->file !== null) $fileName = dirname(realpath($this->file)) . DIRECTORY_SEPARATOR . $args[0];
-		else $fileName = $args[0];
+		if ($this->file !== null) {
+			$fileName = dirname(realpath($this->file)) . DIRECTORY_SEPARATOR . $args[0];
+		} else {
+			$fileName = $args[0];
+		}
 		$this->import[] = $fileName;
 		$sheet = new Sheet($fileName, $this->baseDir, $this->xPath, $this->valueParser, $this->cache);
 		return $sheet->parse($indexStart);
@@ -118,7 +132,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;
 	}
@@ -127,7 +143,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/Tokens.php

Indentation +74 added lines, -74 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,67 +38,67 @@ 
 		$this->iterator = 0;
 	}
 
-    private function getKeysOfTokenType($tokenType) {
-        return array_keys(array_column($this->tokens, 'type'), $tokenType);
-    }
-
-    private function getKeyToSlice($tokenType) {
-        $keys = $this->getKeysOfTokenType($tokenType);
-        if (empty($keys)) return false;
-        $key = $keys[0];
-        for ($i = 0; $key < $this->iterator; $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++;
-        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++;
-        return new Tokens(array_slice($this->tokens, $this->iterator, $key));
-    }
-
-    public function skip($count) {
-        $this->iterator += $count;
-    }
-
-    public function splitOnToken($tokenType) {
-        $splitTokens = [];
+	private function getKeysOfTokenType($tokenType) {
+		return array_keys(array_column($this->tokens, 'type'), $tokenType);
+	}
+
+	private function getKeyToSlice($tokenType) {
+		$keys = $this->getKeysOfTokenType($tokenType);
+		if (empty($keys)) return false;
+		$key = $keys[0];
+		for ($i = 0; $key < $this->iterator; $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++;
+		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++;
+		return new Tokens(array_slice($this->tokens, $this->iterator, $key));
+	}
+
+	public function skip($count) {
+		$this->iterator += $count;
+	}
+
+	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 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 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 type($offset = 0) {
+		return isset($this->tokens[$offset]) ? $this->tokens[$offset]['type'] : false;
+	}
 }