Level-2 / Transphporm

src/Parser/Sheet.php

Doc Comments +16 added lines

@@ -16,6 +16,9 @@ 
 	private $filePath;
 	private $import = [];
 
+	/**
+	 * @param string $tss
+	 */
 	public function __construct($tss, CssToXpath $xPath, Value $valueParser, \Transphporm\TSSCache $cache, \Transphporm\FilePath $filePath) {
 		$this->cache = $cache;
 		$this->xPath = $xPath;
@@ -42,6 +45,9 @@ 
 		return $this->cache->write($this->file, $rules, $this->import);
 	}
 
+	/**
+	 * @param integer $indexStart
+	 */
 	private function parseTokens($indexStart) {
 		$this->rules = [];
 		foreach (new TokenFilterIterator($this->tss, [Tokenizer::WHITESPACE]) as $token) {
@@ -66,6 +72,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 = [];
@@ -89,6 +98,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);
@@ -117,6 +129,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 +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/FilePath.php

Indentation +11 added lines, -11 removed lines

@@ -2,20 +2,20 @@
 namespace Transphporm;
 
 class FilePath {
-    private $baseDir;
-    private $customBase;
+	private $baseDir;
+	private $customBase;
 
-    public function __construct($customBase = null) {
-        $this->baseDir = '';
-        if ($customBase === null) $this->customBase = getcwd();
-        else $this->customBase = rtrim($customBase, '/');
-    }
+	public function __construct($customBase = null) {
+		$this->baseDir = '';
+		if ($customBase === null) $this->customBase = getcwd();
+		else $this->customBase = rtrim($customBase, '/');
+	}
 
-    public function setBaseDir($baseDir) {
-        $this->baseDir = $baseDir;
-    }
+	public function setBaseDir($baseDir) {
+		$this->baseDir = $baseDir;
+	}
 
-    public function getFilePath($filePath = '') {
+	public function getFilePath($filePath = '') {
 		if (isset($filePath[0]) && $filePath[0] == '/') return $this->customBase . $filePath;
 		else return $this->baseDir . $filePath;
 	}

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@
     }
 
     public function getFilePath($filePath = '') {
-		if (isset($filePath[0]) && $filePath[0] == '/') return $this->customBase . $filePath;
-		else return $this->baseDir . $filePath;
+		if (isset($filePath[0]) && $filePath[0] == '/') return $this->customBase.$filePath;
+		else return $this->baseDir.$filePath;
 	}
 }

Braces +10 added lines, -4 removed lines

@@ -7,8 +7,11 @@ 
 
     public function __construct($customBase = null) {
         $this->baseDir = '';
-        if ($customBase === null) $this->customBase = getcwd();
-        else $this->customBase = rtrim($customBase, '/');
+        if ($customBase === null) {
+        	$this->customBase = getcwd();
+        } else {
+        	$this->customBase = rtrim($customBase, '/');
+        }
     }
 
     public function setBaseDir($baseDir) {
@@ -16,7 +19,10 @@ 
     }
 
     public function getFilePath($filePath = '') {
-		if (isset($filePath[0]) && $filePath[0] == '/') return $this->customBase . $filePath;
-		else return $this->baseDir . $filePath;
+		if (isset($filePath[0]) && $filePath[0] == '/') {
+			return $this->customBase . $filePath;
+		} else {
+			return $this->baseDir . $filePath;
+		}
 	}
 }