Level-2 / Transphporm

src/Rule.php

Doc Comments +4 added lines

@@ -21,6 +21,10 @@
 	const D = 86400;
 
 
+	/**
+	 * @param string $query
+	 * @param integer $depth
+	 */
 	public function __construct($query, $pseudo, $depth, $index, $file, $line, array $properties = []) {
 		$this->query = $query;
 		$this->pseudo = $pseudo;

Spacing +3 added lines, -3 removed lines

@@ -48,7 +48,7 @@ 
 
 		$offset = $this->getUpdateFrequency();
 
-		if ($time > $this->lastRun + $offset) return true;
+		if ($time > $this->lastRun+$offset) return true;
 		else return false;
 	}
 
@@ -70,8 +70,8 @@ 
 		$num = (int) $frequency;
 		$unit = strtoupper(trim(str_replace($num, '', $frequency)));
 		if ($frequency == 'always') return 0;
-		else if ($frequency == 'never') return self::D*3650; //Not quite never, in 10 years will cause issues on 32 bit PHP builds re 2038 problem
+		else if ($frequency == 'never') return self::D * 3650; //Not quite never, in 10 years will cause issues on 32 bit PHP builds re 2038 problem
 
-		return $num * constant(self::class . '::' . $unit);
+		return $num * constant(self::class.'::'.$unit);
 	}
 }

Braces +24 added lines, -9 removed lines

@@ -44,33 +44,48 @@
 	}
 
 	private function timeFrequency($frequency, $time = null) {
-		if ($time === null) $time = time();
+		if ($time === null) {
+			$time = time();
+		}
 
 		$offset = $this->getUpdateFrequency();
 
-		if ($time > $this->lastRun + $offset) return true;
-		else return false;
+		if ($time > $this->lastRun + $offset) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	public function shouldRun($time = null) {
 		if (isset($this->properties['update-frequency']) && $this->lastRun !== 0) {
 			$frequency = $this->properties['update-frequency']->read();
 			$static = ['always' => true, 'never' => false];
-			if (isset($static[$frequency])) return $static[$frequency];
-			else return $this->timeFrequency($frequency, $time);
+			if (isset($static[$frequency])) {
+				return $static[$frequency];
+			} else {
+				return $this->timeFrequency($frequency, $time);
+			}
+		} else {
+			return true;
 		}
-		else return true;
 	}
 
 	public function getUpdateFrequency() {
 		$frequency = isset($this->properties['update-frequency']) ? $this->properties['update-frequency']->read() : false;
 
-		if (empty($frequency)) return 0;
+		if (empty($frequency)) {
+			return 0;
+		}
 
 		$num = (int) $frequency;
 		$unit = strtoupper(trim(str_replace($num, '', $frequency)));
-		if ($frequency == 'always') return 0;
-		else if ($frequency == 'never') return self::D*3650; //Not quite never, in 10 years will cause issues on 32 bit PHP builds re 2038 problem
+		if ($frequency == 'always') {
+			return 0;
+		} else if ($frequency == 'never') {
+			return self::D*3650;
+		}
+		//Not quite never, in 10 years will cause issues on 32 bit PHP builds re 2038 problem
 
 		return $num * constant(self::class . '::' . $unit);
 	}

src/SheetLoader.php

Indentation +16 added lines, -16 removed lines

@@ -7,17 +7,17 @@ 
 namespace Transphporm;
 //Separates out TSS file loading/caching from parsing
 class SheetLoader {
-    private $cache;
-    private $sheet;
-    private $time;
-    private $import = [];
-
-    public function __construct(Cache $cache, FilePath $filePath, $tss, $time) {
-        $this->cache = $cache;
-        $this->filePath = $filePath;
-        $this->tss = $tss;
-        $this->time = $time;
-    }
+	private $cache;
+	private $sheet;
+	private $time;
+	private $import = [];
+
+	public function __construct(Cache $cache, FilePath $filePath, $tss, $time) {
+		$this->cache = $cache;
+		$this->filePath = $filePath;
+		$this->tss = $tss;
+		$this->time = $time;
+	}
 
 	private function getRulesFromCache($file) {
 		$key = $file;
@@ -71,7 +71,7 @@ 
 		return dirname(realpath($file));
 	}
 	//write the sheet to cache
-    public function write($file, $rules, $imports = []) {
+	public function write($file, $rules, $imports = []) {
 
 		if (is_file($file)) {
 			$key = $this->getCacheKey($file);
@@ -80,7 +80,7 @@ 
 			$this->cache->write($file, ['rules' => $rules, 'import' => $imports, 'minFreq' => $this->getMinUpdateFreq($rules), 'ctime' => time()]);
 		}
 		return $rules;
-    }
+	}
 
 	public function processRules($template, \Transphporm\Config $config) {
 		$rules = $this->getRules($this->tss, $config->getCssToXpath(), $config->getValueParser());
@@ -97,12 +97,12 @@ 
 	//Load the TSS
 	public function getRules($tss, $cssToXpath, $valueParser) {
 		if (is_file($tss)) {
-    		//$rules = $this->cache->load($tss);
-    		$rules = $this->getRulesFromCache($tss)['rules'];
+			//$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;
-    	}
+		}
 		return $tss == null ? [] : (new Parser\Sheet($tss, $cssToXpath, $valueParser, $this->filePath, $this))->parse();
 	}
 

Spacing +1 added lines, -1 removed lines

@@ -129,6 +129,6 @@
 
 
 	private function sortPseudo($a, $b) {
-		return count($a->pseudo) < count($b->pseudo)  ? -1  :1;
+		return count($a->pseudo) < count($b->pseudo) ? -1 : 1;
 	}
 }

Braces +34 added lines, -12 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;
+				}
 			}
 		}
 
@@ -41,10 +43,14 @@ 
 	//	 1. If all update-frequencies  haven't expired
 	//   2. If the data hasn't changed since the last run
 	public function updateRequired($data) {
-		if (!is_file($this->tss)) return true;
+		if (!is_file($this->tss)) {
+			return true;
+		}
 		$rules = $this->getRulesFromCache($this->tss);
 		//Nothing was cached or the TSS file has changed, update is required
-		if (empty($rules)) return true;
+		if (empty($rules)) {
+			return true;
+		}
 
 		//TOD: use `getMinUpdateFreq' to determne whether the rules need to be executed again
 
@@ -57,7 +63,9 @@ 
 
 		foreach ($rules as $rule) {
 			$ruleFreq = $rule->getUpdateFrequency();
-			if ($ruleFreq < $min) $min = $ruleFreq;
+			if ($ruleFreq < $min) {
+				$min = $ruleFreq;
+			}
 		}
 
 		return $min;
@@ -76,7 +84,9 @@ 
 		if (is_file($file)) {
 			$key = $this->getCacheKey($file);
 			$existing = $this->cache->load($key, filemtime($file));
-			if (isset($existing['import']) && empty($imports)) $imports = $existing['import'];
+			if (isset($existing['import']) && empty($imports)) {
+				$imports = $existing['import'];
+			}
 			$this->cache->write($file, ['rules' => $rules, 'import' => $imports, 'minFreq' => $this->getMinUpdateFreq($rules), 'ctime' => time()]);
 		}
 		return $rules;
@@ -88,10 +98,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
@@ -100,8 +114,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();
 	}
@@ -119,10 +136,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;
 	}