Level-2 / Transphporm

src/Parser/Sheet.php

Indentation +8 added lines, -8 removed lines

@@ -102,14 +102,14 @@
 	}
 
 	private function getProperties($tokens) {
-        $rules = $tokens->splitOnToken(Tokenizer::SEMI_COLON);
+		$rules = $tokens->splitOnToken(Tokenizer::SEMI_COLON);
 
-        $return = [];
-        foreach ($rules as $rule) {
-            $name = $rule->from(Tokenizer::NAME, true)->to(Tokenizer::COLON)->read();
-            $return[$name] = $rule->from(Tokenizer::COLON)->trim();
-        }
+		$return = [];
+		foreach ($rules as $rule) {
+			$name = $rule->from(Tokenizer::NAME, true)->to(Tokenizer::COLON)->read();
+			$return[$name] = $rule->from(Tokenizer::COLON)->trim();
+		}
 
-        return $return;
-    }
+		return $return;
+	}
 }

src/SheetCache.php

Indentation +5 added lines, -5 removed lines

@@ -44,17 +44,17 @@
 
 
 	//write the sheet to cache
-    public function write($file, $rules, $imports = []) {
+	public function write($file, $rules, $imports = []) {
 		if (is_file($file)) {
 			$existing = $this->cache->load($file, filemtime($file));
 			if (isset($existing['import'])) $imports = $existing['import'];
 			$this->cache->write($this->cacheName, ['rules' => $rules, 'import' => $imports, 'minFreq' => $this->getMinUpdateFreq($rules), 'ctime' => $this->time, 'cacheKey' => $this->cacheKey]);
 		}
 		return $rules;
-    }
+	}
 
-    public function setKey($key) {
-    	$this->cacheKey = $key;
-    }
+	public function setKey($key) {
+		$this->cacheKey = $key;
+	}
 
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 		if ($this->cacheKey) {
 			$parser = new Parser\Value($data);
 			$parsedKey = $parser->parseTokens($this->cacheKey)[0];
-			$this->cacheName = $parsedKey . $this->tss;
+			$this->cacheName = $parsedKey.$this->tss;
 			return $parsedKey;
 		}
 		else return '';

Braces +11 added lines, -4 removed lines

@@ -24,7 +24,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;
+				}
 			}
 		}
 		return $rules;
@@ -32,14 +34,17 @@ 
 
 	public function getCacheKey($tss, $data) {
 		//Read the rules so that $this->cacheKey is set
-		if (is_file($tss)) $this->getRulesFromCache($tss);
+		if (is_file($tss)) {
+			$this->getRulesFromCache($tss);
+		}
 		if ($this->cacheKey) {
 			$parser = new Parser\Value($data);
 			$parsedKey = $parser->parseTokens($this->cacheKey)[0];
 			$this->cacheName = $parsedKey . $this->tss;
 			return $parsedKey;
+		} else {
+			return '';
 		}
-		else return '';
 	}
 
 
@@ -47,7 +52,9 @@ 
     public function write($file, $rules, $imports = []) {
 		if (is_file($file)) {
 			$existing = $this->cache->load($file, filemtime($file));
-			if (isset($existing['import'])) $imports = $existing['import'];
+			if (isset($existing['import'])) {
+				$imports = $existing['import'];
+			}
 			$this->cache->write($this->cacheName, ['rules' => $rules, 'import' => $imports, 'minFreq' => $this->getMinUpdateFreq($rules), 'ctime' => $this->time, 'cacheKey' => $this->cacheKey]);
 		}
 		return $rules;

src/SheetLoader/TSSFile.php

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
 	}
 
 	public function updateRequired($data) {
-		$this->cacheName = $this->getCacheKey($data) . $this->fileName;
+		$this->cacheName = $this->getCacheKey($data).$this->fileName;
 
 		$rules = $this->getRulesFromCache($this->fileName, $data);
 		//Nothing was cached or the TSS file has changed, update is required
@@ -58,7 +58,7 @@ 
 		if ($this->cacheKey) {
 			$parser = new \Transphporm\Parser\Value($data);
 			$cacheKey = $parser->parseTokens($this->cacheKey)[0];
-			$this->cacheName = $cacheKey . $this->fileName;
+			$this->cacheName = $cacheKey.$this->fileName;
 			return $cacheKey;
 		}
 		else return '';

Braces +22 added lines, -8 removed lines

@@ -29,7 +29,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;
+				}
 			}
 		}
 
@@ -45,10 +47,14 @@ 
 
 		$rules = $this->getRulesFromCache($this->fileName, $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;
 	}
@@ -60,15 +66,19 @@ 
 			$cacheKey = $parser->parseTokens($this->cacheKey)[0];
 			$this->cacheName = $cacheKey . $this->fileName;
 			return $cacheKey;
+		} else {
+			return '';
 		}
-		else return '';
 	}
 
 	public function getRules($cssToXpath, $valueParser, $sheetLoader, $indexStart) {
 		$rules = $this->getRulesFromCache($this->fileName)['rules'];
 		$this->filePath->addPath(dirname(realpath($this->fileName)));
-		if (empty($rules)) $tss = file_get_contents($this->fileName);
-		else return $rules;
+		if (empty($rules)) {
+			$tss = file_get_contents($this->fileName);
+		} else {
+			return $rules;
+		}
 
 		return $tss == null ? [] : (new \Transphporm\Parser\Sheet($tss, $cssToXpath, $valueParser, $this->filePath, $sheetLoader))->parse($indexStart);
 	}
@@ -76,7 +86,9 @@ 
 	//write the sheet to cache
     public function write($rules, $imports = []) {
 		$existing = $this->cache->load($this->fileName, filemtime($this->fileName));
-		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;
@@ -88,7 +100,9 @@ 
 
 		foreach ($rules as $rule) {
 			$ruleFreq = $rule->getUpdateFrequency();
-			if ($ruleFreq < $min) $min = $ruleFreq;
+			if ($ruleFreq < $min) {
+				$min = $ruleFreq;
+			}
 		}
 
 		return $min;

src/SheetLoader/SheetLoader.php

Braces +13 added lines, -5 removed lines

@@ -39,8 +39,9 @@ 
 			if ($token['type'] == \Transphporm\Parser\Tokenizer::NAME && $token['value'] == 'data') {
 				$tokens->next();
 				$newTokens = array_merge($newTokens, iterator_to_array($tokens->current()['value']));
+			} else {
+				$newTokens[] = $token;
 			}
-			else $newTokens[] = $token;
 		}
 
 		$this->tss->setCacheKey(new \Transphporm\Parser\Tokens($newTokens));
@@ -58,7 +59,9 @@ 
 		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);
@@ -83,10 +86,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;
 	}