Level-2 / Transphporm

src/Builder.php

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/Hook/DataFunction.php

Braces +25 added lines, -9 removed lines

@@ -22,7 +22,9 @@ 
 	/** Binds data to an element */
 	public function bind(\DomElement $element, $data) {
 		//This is a bit of a hack to workaround #24, might need a better way of doing this if it causes a problem
-		if (is_array($data) && count($data) === 1 && isset($data[0]) && is_object($data[0])) $data = $data[0];
+		if (is_array($data) && count($data) === 1 && isset($data[0]) && is_object($data[0])) {
+			$data = $data[0];
+		}
 		$this->dataStorage[$element] = $data;
 	}
 
@@ -35,7 +37,9 @@ 
 	/** Returns the data that has been bound to $element, or, if no data is bound to $element climb the DOM tree to find the data bound to a parent node*/
 	private function getData(\DomElement $element) {
 		while ($element) {
-			if (isset($this->dataStorage[$element])) return $this->dataStorage[$element];
+			if (isset($this->dataStorage[$element])) {
+				return $this->dataStorage[$element];
+			}
 			$element = $element->parentNode;
 		}
 		return $this->data;
@@ -52,16 +56,24 @@ 
 		$parts = explode('.', $name[0]);
 		$obj = $data;
 		foreach ($parts as $part) {
-			if ($part === '') continue;
-			if (is_callable([$obj, $part])) $obj = call_user_func([$obj, $part]); 
-			else $obj = $this->ifNull($obj, $part);
+			if ($part === '') {
+				continue;
+			}
+			if (is_callable([$obj, $part])) {
+				$obj = call_user_func([$obj, $part]);
+			} else {
+				$obj = $this->ifNull($obj, $part);
+			}
 		}
 		return $obj;
 	}
 
 	private function ifNull($obj, $key) {
-		if (is_array($obj)) return isset($obj[$key]) ? $obj[$key] : null;
-		else return isset($obj->$key) ? $obj->$key : null;
+		if (is_array($obj)) {
+			return isset($obj[$key]) ? $obj[$key] : null;
+		} else {
+			return isset($obj->$key) ? $obj->$key : null;
+		}
 	}
 
 	public function attr($val, $element) {
@@ -87,14 +99,18 @@ 
 
 		$doc = $newTemplate->output([], true)->body;
 
-		if (isset($val[1])) return $this->templateSubsection($val[1], $doc, $element);
+		if (isset($val[1])) {
+			return $this->templateSubsection($val[1], $doc, $element);
+		}
 		
 		$newNode = $element->ownerDocument->importNode($doc->documentElement, true);
 
 		$result = [];
 
 		if ($newNode->tagName === 'template') {
-			foreach ($newNode->childNodes as $node) $result[] = $node->cloneNode(true);
+			foreach ($newNode->childNodes as $node) {
+				$result[] = $node->cloneNode(true);
+			}
 		}		
 		//else $result[] = $newNode;
 

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

src/Sheet.php

Braces +13 added lines, -6 removed lines

@@ -31,7 +31,9 @@ 
 			$rules = $this->writeRule($rules, $selector, $rule);
 		}
 		//there may be processing instructions at the end
-		if ($processing = $this->processingInstructions($this->tss, $pos, strlen($this->tss))) $rules = array_merge($processing['rules'], $rules);
+		if ($processing = $this->processingInstructions($this->tss, $pos, strlen($this->tss))) {
+			$rules = array_merge($processing['rules'], $rules);
+		}
 		usort($rules, [$this, 'sortRules']);
 		return $rules;
 	}
@@ -43,7 +45,9 @@ 
 	}
 
 	private function writeRule($rules, $selector, $newRule) {
-		if (isset($rules[$selector])) $newRule->properties = array_merge($rules[$selector], $newRule->properties);
+		if (isset($rules[$selector])) {
+			$newRule->properties = array_merge($rules[$selector], $newRule->properties);
+		}
 		$rules[$selector] = $newRule;
 		
 		return $rules;
@@ -58,8 +62,7 @@ 
 				$pos = strpos($tss, ';', $spacePos);
 				$args = substr($tss, $spacePos+1, $pos-$spacePos-1);
 				$rules = array_merge($rules, $this->$funcName($args));
-			}
-			else {
+			} else {
 				break;	
 			} 
 		}
@@ -74,7 +77,9 @@ 
 
 	private function sortRules($a, $b) {
 		//If they have the same depth, compare on index
-		if ($a->depth === $b->depth) return $a->index < $b->index ? -1 : 1;
+		if ($a->depth === $b->depth) {
+			return $a->index < $b->index ? -1 : 1;
+		}
 
 		return ($a->depth < $b->depth) ? -1 : 1;
 	}
@@ -95,7 +100,9 @@ 
 		$return = [];
 
 		foreach ($rules as $rule) {
-			if (trim($rule) === '') continue;
+			if (trim($rule) === '') {
+				continue;
+			}
 			$parts = explode(':', $rule, 2);
 
 			$parts[1] = $stringExtractor->rebuild($parts[1]);