Level-2 / Transphporm

src/Parser/Tokenizer/Brackets.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 
 class Brackets implements \Transphporm\Parser\Tokenizable {
 
-	private $types =  [
+	private $types = [
 			Tokenizer::OPEN_BRACKET => ['(', ')'],
 			Tokenizer::OPEN_BRACE => ['{', '}'],
 			Tokenizer::OPEN_SQUARE_BRACKET => ['[', ']']

src/Parser/CssToXpath.php

Braces +12 added lines, -4 removed lines

@@ -69,7 +69,9 @@ 
 				$selector->type = $token['type'];
 				$selectors[] = $selector;
 			}
-			if (isset($token['value'])) $selectors[count($selectors)-1]->string = $token['value'];
+			if (isset($token['value'])) {
+				$selectors[count($selectors)-1]->string = $token['value'];
+			}
 		}
 		return $selectors;
 	}
@@ -79,7 +81,9 @@ 
 		$selectors = $this->split($css);
 		$xpath = '/';
 		foreach ($selectors as $selector) {
-			if (isset($this->translators[$selector->type])) $xpath .= $this->translators[$selector->type]($selector->string, $xpath);
+			if (isset($this->translators[$selector->type])) {
+				$xpath .= $this->translators[$selector->type]($selector->string, $xpath);
+			}
 		}
 
 		$xpath = str_replace('/[', '/*[', $xpath);
@@ -92,11 +96,15 @@ 
 		$split = $css->splitOnToken(Tokenizer::GREATER_THAN);
 		$numSplits = count($split);
 
-		if ($numSplits <= 1) return $css;
+		if ($numSplits <= 1) {
+			return $css;
+		}
 
 		for ($i = 0; $i < $numSplits; $i++) {
 			$tokens->add($split[$i]->trim());
-			if (isset($split[$i+1])) $tokens->add(['type' => Tokenizer::GREATER_THAN]);
+			if (isset($split[$i+1])) {
+				$tokens->add(['type' => Tokenizer::GREATER_THAN]);
+			}
 		}
 
 		return $tokens;

src/Builder.php

Indentation +8 added lines, -8 removed lines

@@ -42,9 +42,9 @@ 
 	}
 
 	public function setLocale($locale) {
-        $format = new \Transphporm\Module\Format($locale);
-        $this->modules[get_class($format)] = $format;
-    }
+		$format = new \Transphporm\Module\Format($locale);
+		$this->modules[get_class($format)] = $format;
+	}
 
 	public function addPath($dir) {
 		$this->filePath->addPath($dir);
@@ -100,15 +100,15 @@ 
 
 	//Load a template, firstly check if it's a file or a valid string
 	private function loadTemplate() {
-        $result = ['cache' => $this->template, 'headers' => []];
+		$result = ['cache' => $this->template, 'headers' => []];
 		if (strpos($this->template, "\n") === false && is_file($this->template)) $result = $this->loadTemplateFromFile($this->template);
 		return $result;
 	}
 
-    private function loadTemplateFromFile($file) {
-        $xml = $this->cache->load($this->cacheKey . $file, filemtime($file));
-        return $xml ? $xml : ['cache' => file_get_contents($file) ?: "", 'headers' => []];
-    }
+	private function loadTemplateFromFile($file) {
+		$xml = $this->cache->load($this->cacheKey . $file, filemtime($file));
+		return $xml ? $xml : ['cache' => file_get_contents($file) ?: "", 'headers' => []];
+	}
 
 	public function setCache(\ArrayAccess $cache) {
 		$this->cache = new Cache($cache);

Spacing +3 added lines, -3 removed lines

@@ -72,7 +72,7 @@ 
 			   'headers' => array_merge($result['headers'], $headers),
 			   'body' => $this->doPostProcessing($template)->output($document)
 			];
-			$this->cache->write($tssCache->getCacheKey($data) . $this->template, $result);
+			$this->cache->write($tssCache->getCacheKey($data).$this->template, $result);
 		}
 		unset($result['cache'], $result['renderTime']);
 		return (object) $result;
@@ -82,7 +82,7 @@ 
 		$elementData = new \Transphporm\Hook\ElementData(new \SplObjectStorage(), $data);
 		$functionSet = new FunctionSet($elementData);
 		//To be a valid XML document it must have a root element, automatically wrap it in <template> to ensure it does
-		$template = new Template($this->isValidDoc($body) ? str_ireplace('<!doctype', '<!DOCTYPE', $body) : '<template>' . $body . '</template>' );
+		$template = new Template($this->isValidDoc($body) ? str_ireplace('<!doctype', '<!DOCTYPE', $body) : '<template>'.$body.'</template>');
 
 		$valueParser = new Parser\Value($functionSet);
 		$this->config = new Config($functionSet, $valueParser, $elementData, new Hook\Formatter(), new Parser\CssToXpath($functionSet, $template->getPrefix(), md5($this->tss)), $this->filePath, $headers);
@@ -106,7 +106,7 @@ 
 	}
 
     private function loadTemplateFromFile($file) {
-        $xml = $this->cache->load($this->cacheKey . $file, filemtime($file));
+        $xml = $this->cache->load($this->cacheKey.$file, filemtime($file));
         return $xml ? $xml : ['cache' => file_get_contents($file) ?: "", 'headers' => []];
     }
 

src/Rule.php

Spacing +3 added lines, -3 removed lines

@@ -48,7 +48,7 @@ 
 
 		$offset = $this->getUpdateFrequency($frequency);
 
-		if ($time > $this->lastRun + $offset) return true;
+		if ($time > $this->lastRun+$offset) return true;
 		else return false;
 	}
 
@@ -75,8 +75,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 +26 added lines, -10 removed lines

@@ -44,22 +44,31 @@ 
 	}
 
 	private function timeFrequency($frequency, $time = null) {
-		if ($time === null) $time = time();
+		if ($time === null) {
+			$time = time();
+		}
 
 		$offset = $this->getUpdateFrequency($frequency);
 
-		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 = null) {
@@ -67,15 +76,22 @@ 
 			$frequency = isset($this->properties['update-frequency']) ? $this->properties['update-frequency']->read() : false;
 		}
 
-		if (empty($frequency)) return 0;
-		else return $this->calcUpdateFrequency($frequency);
+		if (empty($frequency)) {
+			return 0;
+		} else {
+			return $this->calcUpdateFrequency($frequency);
+		}
 	}
 
 	private function calcUpdateFrequency($frequency) {
 		$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/TSSFile.php

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 	}
 
 	public function updateRequired($data) {
-		$this->cacheName = $this->getCacheKey($data) . $this->fileName;
+		$this->cacheName = $this->getCacheKey($data).$this->fileName;
 
 		$rules = $this->getRulesFromCache($this->fileName);
 		//Nothing was cached or the TSS file has changed, update is required
@@ -59,7 +59,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

@@ -30,7 +30,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;
+				}
 			}
 		}
 
@@ -46,10 +48,14 @@ 
 
 		$rules = $this->getRulesFromCache($this->fileName);
 		//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;
 	}
@@ -61,15 +67,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);
 	}
@@ -77,7 +87,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;
@@ -89,7 +101,9 @@ 
 
 		foreach ($rules as $rule) {
 			$ruleFreq = $rule->getUpdateFrequency();
-			if ($ruleFreq < $min) $min = $ruleFreq;
+			if ($ruleFreq < $min) {
+				$min = $ruleFreq;
+			}
 		}
 
 		return $min;

Indentation +5 added lines, -5 removed lines

@@ -17,8 +17,8 @@ 
 		$this->fileName = $fileName;
 		$this->filePath = $filePath;
 		$this->cache = $cache;
-	    $this->time = isset($time) ? $time : time();
-	    $this->cacheName = $this->fileName;
+		$this->time = isset($time) ? $time : time();
+		$this->cacheName = $this->fileName;
 	}
 
 	private function getRulesFromCache($file) {
@@ -77,15 +77,15 @@ 
 	}
 
 	//write the sheet to cache
-    public function write($rules, $imports = []) {
+	public function write($rules, $imports = []) {
 		$existing = $this->cache->load($this->fileName, filemtime($this->fileName));
 		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;
-    }
+	}
 
-    //Gets the minimum update-frequency for a sheet's rules
+	//Gets the minimum update-frequency for a sheet's rules
 	private function getMinUpdateFreq($rules) {
 		$min = \PHP_INT_MAX;
 

src/SheetLoader/SheetLoader.php

Indentation +11 added lines, -11 removed lines

@@ -7,17 +7,17 @@
 namespace Transphporm\SheetLoader;
 //Separates out TSS file loading/caching from parsing
 class SheetLoader {
-    private $tss;
-    private $filePath;
-    private $time;
-    private $import = [];
-
-    public function __construct(\Transphporm\Cache $cache, \Transphporm\FilePath $filePath, TSSRules $tss, $time) {
-    	$this->cache = $cache;
-        $this->filePath = $filePath;
-        $this->tss = $tss;
-        $this->time = isset($time) ? $time : time();
-    }
+	private $tss;
+	private $filePath;
+	private $time;
+	private $import = [];
+
+	public function __construct(\Transphporm\Cache $cache, \Transphporm\FilePath $filePath, TSSRules $tss, $time) {
+		$this->cache = $cache;
+		$this->filePath = $filePath;
+		$this->tss = $tss;
+		$this->time = isset($time) ? $time : time();
+	}
 
 	//Allows controlling whether any updates are required to the template
 	//e.g. return false