Level-2 / Transphporm

src/Builder.php

Braces +25 added lines, -10 removed lines

@@ -40,7 +40,9 @@ 
 
 		//Allow $time to be set via arguments to spoof time passage during tests
 		foreach ($this->getRules($template) as $rule) {
-			if ($rule->shouldRun($this->time)) $this->executeTssRule($rule, $template, $data);			
+			if ($rule->shouldRun($this->time)) {
+				$this->executeTssRule($rule, $template, $data);
+			}
 		}
 		
 		$output = $template->output($document);
@@ -55,7 +57,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);
 	}
 
@@ -63,8 +67,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) {		
@@ -72,10 +77,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) {
@@ -83,7 +92,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;
 	}
@@ -93,9 +104,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/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 = []) {
@@ -39,9 +39,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 +15 added lines, -6 removed lines

@@ -35,24 +35,33 @@
 	}
 
 	private function timeFrequency($frequency, $time = null) {
-		if ($time === null) $time = time();
+		if ($time === null) {
+			$time = time();
+		}
 		$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;
+		}
 	}
 
 	public function shouldRun($time = null) {
 		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];
-			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;
 	}
 }
\ No newline at end of file

src/Hook/BasicProperties.php

Braces +17 added lines, -6 removed lines

@@ -63,12 +63,15 @@ 
 				$node = $element->ownerDocument->importNode($node, true);
 				$element->appendChild($node);
 			}
+		} else {
+			$element->appendChild($element->ownerDocument->createTextNode(implode('', $content)));
 		}
-		else $element->appendChild($element->ownerDocument->createTextNode(implode('', $content)));		
 	}
 
 	private function removeAllChildren($element) {
-		while ($element->hasChildNodes()) $element->removeChild($element->firstChild);
+		while ($element->hasChildNodes()) {
+			$element->removeChild($element->firstChild);
+		}
 	}
 
 	public function registerFormatter($formatter) {
@@ -76,11 +79,15 @@ 
 	}
 
 	private function format($value, $rules) {
-		if (!isset($rules['format'])) return $value;
+		if (!isset($rules['format'])) {
+			return $value;
+		}
 		$format = new \Transphporm\StringExtractor($rules['format']);
 		$options = explode(' ', $format);
 		$functionName = array_shift($options);
-		foreach ($options as &$f) $f = trim($format->rebuild($f), '"');
+		foreach ($options as &$f) {
+			$f = trim($format->rebuild($f), '"');
+		}
 
 		return $this->processFormat($options, $functionName, $value);		
 	}
@@ -109,7 +116,9 @@ 
 			unset($newRules['repeat']);
 
 			$hook = new Rule($newRules, $rule->getPseudoMatcher(), $this->data);
-			foreach ($rule->getProperties() as $obj) $hook->registerProperties($obj);
+			foreach ($rule->getProperties() as $obj) {
+				$hook->registerProperties($obj);
+			}
 			$hook->run($clone);
 		}
 
@@ -120,7 +129,9 @@ 
 	}
 
 	public function display($value, $element) {
-		if (strtolower($value[0]) === 'none') $element->setAttribute('transphporm', 'remove');
+		if (strtolower($value[0]) === 'none') {
+			$element->setAttribute('transphporm', 'remove');
+		}
 	}
 
 	public function bind($value, $element) {

src/Hook/PostProcess.php

Braces +5 added lines, -2 removed lines

@@ -9,8 +9,11 @@
 class PostProcess implements \Transphporm\Hook {
 	public function run(\DomElement $element) {
 		$transphporm = $element->getAttribute('transphporm');
-		if ($transphporm == 'remove') $element->parentNode->removeChild($element);
-		else $element->removeAttribute('transphporm');
+		if ($transphporm == 'remove') {
+			$element->parentNode->removeChild($element);
+		} else {
+			$element->removeAttribute('transphporm');
+		}
 	}
 
 }
\ No newline at end of file

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) && $this->isObjectArray($data)) $data = $data[0];
+		if (is_array($data) && $this->isObjectArray($data)) {
+			$data = $data[0];
+		}
 		$this->dataStorage[$element] = $data;
 	}
 
@@ -38,7 +40,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;
@@ -55,16 +59,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) {
@@ -90,14 +102,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;