Level-2 / Transphporm

src/Builder.php

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
 		$cachedOutput = $this->loadTemplate();
 		$xml = $cachedOutput['body'];
 		//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($xml) ? $xml : '<template>' . $xml . '</template>' );
+		$template = new Template($this->isValidDoc($xml) ? $xml : '<template>'.$xml.'</template>');
 		$time = time();
 
 		foreach ($this->getRules($template) as $rule) {
@@ -59,8 +59,8 @@ 
 
 	private function getRules($template) {		
 		if (is_file($this->tss)) {
-			$this->baseDir = dirname(realpath($this->tss)) . DIRECTORY_SEPARATOR;
-			$key = $this->tss . $template->getPrefix() . $this->baseDir;
+			$this->baseDir = dirname(realpath($this->tss)).DIRECTORY_SEPARATOR;
+			$key = $this->tss.$template->getPrefix().$this->baseDir;
 			$rules = $this->cache->load($key, filemtime($this->tss));
 			if (!$rules) return $this->cache->write($key, (new Sheet(file_get_contents($this->tss), $this->baseDir, $template->getPrefix()))->parse());
 			else return $rules;
@@ -84,8 +84,8 @@ 
 
 	private function getLocale() {
 		if (is_array($this->locale)) return $this->locale;
-		else if (strlen($this->locale) > 0) return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . $this->locale . '.json'), true);
-		else return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . 'enGB.json'), true);
+		else if (strlen($this->locale) > 0) return json_decode(file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'Formatter'.DIRECTORY_SEPARATOR.'Locale'.DIRECTORY_SEPARATOR.$this->locale.'.json'), true);
+		else return json_decode(file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'Formatter'.DIRECTORY_SEPARATOR.'Locale'.DIRECTORY_SEPARATOR.'enGB.json'), true);
 	}
 
 	public function registerProperties($object) {

Braces +28 added lines, -11 removed lines

@@ -34,10 +34,14 @@ 
 		$template = new Template($this->isValidDoc($xml) ? $xml : '<template>' . $xml . '</template>' );
 
 		//Allow $time to be set via arguments to spoof time passage during tests
-		if (!$time) $time = time();
+		if (!$time) {
+			$time = time();
+		}
 
 		foreach ($this->getRules($template) as $rule) {
-			if ($rule->shouldRun($time)) $this->executeTssRule($rule, $template, $data);			
+			if ($rule->shouldRun($time)) {
+				$this->executeTssRule($rule, $template, $data);
+			}
 		}
 		
 		$output = $template->output($document);	
@@ -49,7 +53,9 @@ 
 	private function executeTssRule($rule, $template, $data) {
 		$rule->touch();
 		$hook = new Hook\Rule($rule->properties, new Hook\PseudoMatcher($rule->pseudo, $data), $data);
-		foreach ($this->registeredProperties as $properties) $hook->registerProperties($properties);
+		foreach ($this->registeredProperties as $properties) {
+			$hook->registerProperties($properties);
+		}
 		$template->addHook($rule->query, $hook);
 	}
 
@@ -57,8 +63,9 @@ 
 		if (trim($this->template)[0] !== '<') {			
 			$xml = $this->cache->load($this->template, filemtime($this->template));
 			return $xml ? $xml : ['body' => file_get_contents($this->template), 'headers' => []];
+		} else {
+			return ['body' => $this->template, 'headers' => []];
 		}
-		else return ['body' => $this->template, 'headers' => []];	
 	}
 
 	private function getRules($template) {		
@@ -66,10 +73,14 @@ 
 			$this->baseDir = dirname(realpath($this->tss)) . DIRECTORY_SEPARATOR;
 			$key = $this->tss . $template->getPrefix() . $this->baseDir;
 			$rules = $this->cache->load($key, filemtime($this->tss));
-			if (!$rules) return $this->cache->write($key, (new Sheet(file_get_contents($this->tss), $this->baseDir, $template->getPrefix()))->parse());
-			else return $rules;
+			if (!$rules) {
+				return $this->cache->write($key, (new Sheet(file_get_contents($this->tss), $this->baseDir, $template->getPrefix()))->parse());
+			} else {
+				return $rules;
+			}
+		} else {
+			return (new Sheet($this->tss, $this->baseDir, $template->getPrefix()))->parse();
 		}
-		else return (new Sheet($this->tss, $this->baseDir, $template->getPrefix()))->parse();
 	}
 
 	private function getBasicProperties($data, $locale, &$headers) {
@@ -77,7 +88,9 @@ 
 		$basicProperties->registerFormatter(new Formatter\Number($locale));
 		$basicProperties->registerFormatter(new Formatter\Date($locale));
 		$basicProperties->registerFormatter(new Formatter\StringFormatter());
-		foreach ($this->formatters as $formatter) $basicProperties->registerFormatter($formatter);
+		foreach ($this->formatters as $formatter) {
+			$basicProperties->registerFormatter($formatter);
+		}
 
 		return isset($this->userCache) ? new Hook\Cache($basicProperties, $this->userCache) : $basicProperties;
 	}
@@ -87,9 +100,13 @@ 
 	}
 
 	private function getLocale() {
-		if (is_array($this->locale)) return $this->locale;
-		else if (strlen($this->locale) > 0) return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . $this->locale . '.json'), true);
-		else return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . 'enGB.json'), true);
+		if (is_array($this->locale)) {
+			return $this->locale;
+		} else if (strlen($this->locale) > 0) {
+			return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . $this->locale . '.json'), true);
+		} else {
+			return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . 'enGB.json'), true);
+		}
 	}
 
 	public function registerProperties($object) {

src/Cache.php

Braces +2 added lines, -1 removed lines

@@ -20,7 +20,8 @@
 	public function load($key, $modified = 0) {
 		if (isset($this->cache[$key]) && $this->cache[$key]['timestamp'] >= $modified) {
 			return $this->cache[$key]['content'];
+		} else {
+			return false;
 		}
-		else return false;
 	}
 }
\ No newline at end of file

src/Rule.php

Spacing +4 added lines, -4 removed lines

@@ -10,8 +10,8 @@ 
 
 	const S = 1;
 	const M = 60;
-	const H = self::M*60;
-	const D = self::H*24;
+	const H = self::M * 60;
+	const D = self::H * 24;
 
 
 	public function __construct($query, $pseudo, $depth, $index, array $properties = []) {
@@ -43,9 +43,9 @@ 
 			$num = (int) $frequency;
 			$unit = strtoupper(trim(str_replace($num, '', $frequency)));
 			
-			$offset = $num * constant(self::class . '::' . $unit);
+			$offset = $num * constant(self::class.'::'.$unit);
 
-			if ($time > $this->lastRun + $offset) return true;
+			if ($time > $this->lastRun+$offset) return true;
 			else return false;
 
 		}

Braces +10 added lines, -4 removed lines

@@ -38,17 +38,23 @@
 		if (isset($this->properties['update-frequency']) && $this->lastRun !== 0) {
 			$frequency = $this->properties['update-frequency'];
 			$static = ['always' => true, 'never' => false];
-			if (isset($static[$frequency])) return $static[$frequency];
+			if (isset($static[$frequency])) {
+				return $static[$frequency];
+			}
 
 			$num = (int) $frequency;
 			$unit = strtoupper(trim(str_replace($num, '', $frequency)));
 			
 			$offset = $num * constant(self::class . '::' . $unit);
 
-			if ($time > $this->lastRun + $offset) return true;
-			else return false;
+			if ($time > $this->lastRun + $offset) {
+				return true;
+			} else {
+				return false;
+			}
 
+		} else {
+			return true;
 		}
-		else return true;
 	}
 }
\ No newline at end of file