Level-2 / Transphporm

src/SheetLoader.php

Braces +42 added lines, -15 removed lines

@@ -32,7 +32,9 @@ 
 		if ($rules) {
 			foreach ($rules['import'] as $file) {
 				//Check that the import file hasn't been changed since the cache was written
-				if (filemtime($file) > $rules['ctime']) return false;
+				if (filemtime($file) > $rules['ctime']) {
+					return false;
+				}
 			}
 		}
 
@@ -44,16 +46,22 @@ 
 	//   2. If the data hasn't changed since the last run
 	//If this function returns false, the rendered template is sent straight from the cache skipping 99% of transphporm's code
 	public function updateRequired($data) {
-		if (!is_file($this->tss)) return true;
+		if (!is_file($this->tss)) {
+			return true;
+		}
 
 		$this->cacheName = $this->getCacheKey($data) . $this->tss;
 
 		$rules = $this->getRulesFromCache($this->tss, $data);
 		//Nothing was cached or the TSS file has changed, update is required
-		if (empty($rules)) return true;
+		if (empty($rules)) {
+			return true;
+		}
 
 		//Find the sheet's minimum update-frequency, if it hasn't passed then no updates are required
-		if ($rules['ctime']+$rules['minFreq'] <= $this->time) return true;
+		if ($rules['ctime']+$rules['minFreq'] <= $this->time) {
+			return true;
+		}
 
 		return false;
 	}
@@ -64,7 +72,9 @@ 
 
 		foreach ($rules as $rule) {
 			$ruleFreq = $rule->getUpdateFrequency();
-			if ($ruleFreq < $min) $min = $ruleFreq;
+			if ($ruleFreq < $min) {
+				$min = $ruleFreq;
+			}
 		}
 
 		return $min;
@@ -79,21 +89,26 @@ 
 	}
 
 	public function getCacheKey($data) {
-		if (is_file($this->tss)) $this->getRulesFromCache($this->tss);
+		if (is_file($this->tss)) {
+			$this->getRulesFromCache($this->tss);
+		}
 		if ($this->cacheKey) {
 			$parser = new Parser\Value($data);
 			$x= $parser->parseTokens($this->cacheKey)[0];
 			$this->cacheName = $x . $this->tss;
 			return $x;
+		} else {
+			return '';
 		}
-		else return '';
 	}
 
 	//write the sheet to cache
     public function write($file, $rules, $imports = []) {
 		if (is_file($file)) {
 			$existing = $this->cache->load($file, filemtime($file));
-			if (isset($existing['import']) && empty($imports)) $imports = $existing['import'];
+			if (isset($existing['import']) && empty($imports)) {
+				$imports = $existing['import'];
+			}
 			$this->cache->write($this->cacheName, ['rules' => $rules, 'import' => $imports, 'minFreq' => $this->getMinUpdateFreq($rules), 'ctime' => $this->time, 'cacheKey' => $this->cacheKey]);
 		}
 		return $rules;
@@ -104,10 +119,14 @@ 
 
 		usort($rules, [$this, 'sortRules']);
 		foreach ($rules as $rule) {
-			if ($rule->shouldRun($this->time)) $this->executeTssRule($rule, $template, $config);
+			if ($rule->shouldRun($this->time)) {
+				$this->executeTssRule($rule, $template, $config);
+			}
 		}
 
-		if (is_file($this->tss)) $this->write($this->tss, $rules, $this->import);
+		if (is_file($this->tss)) {
+			$this->write($this->tss, $rules, $this->import);
+		}
 	}
 
 	//Load the TSS
@@ -116,8 +135,11 @@ 
     		//$rules = $this->cache->load($tss);
     		$rules = $this->getRulesFromCache($tss)['rules'];
 			$this->filePath->addPath(dirname(realpath($tss)));
-			if (empty($rules)) $tss = file_get_contents($tss);
-			else return $rules;
+			if (empty($rules)) {
+				$tss = file_get_contents($tss);
+			} else {
+				return $rules;
+			}
     	}
 		return $tss == null ? [] : (new Parser\Sheet($tss, $cssToXpath, $valueParser, $this->filePath, $this))->parse();
 	}
@@ -134,10 +156,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;
 	}

src/Parser/Sheet.php

Braces +14 added lines, -5 removed lines

@@ -24,7 +24,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);
 		$this->checkError($rules);
 		return $rules;
@@ -35,8 +37,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 (!in_array($token['type'], [Tokenizer::NEW_LINE, Tokenizer::AT_SIGN])) {
+				$this->addRules($token, $indexStart++);
 			}
-			else if (!in_array($token['type'], [Tokenizer::NEW_LINE, Tokenizer::AT_SIGN])) $this->addRules($token, $indexStart++);
 		}
 
 		return $this->rules;
@@ -46,13 +49,17 @@ 
 		$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) {
@@ -79,7 +86,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();
 		$funcToks = $tokens->from(Tokenizer::NAME);