Level-2 / Transphporm

src/Parser/ValueData.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 
 	public function extract($last, $autoLookup, $traversing) {
 		$value = $this->read($last);
-		if ($value && ($autoLookup || $traversing) ) {
+		if ($value && ($autoLookup || $traversing)) {
 			return $value;
 		}
 		throw new \UnexpectedValueException('Not found');

Braces +25 added lines, -11 removed lines

@@ -15,13 +15,17 @@ 
 
 	//Read $key from array, $this->data = $this->data[$key] but also works for objects
 	private function traverseInto($key) {
-		if (isset($this->data->{$key})) $this->data = $this->data->{$key};
-		else if ($this->isArray() && isset($this->data[$key])) $this->data = $this->data[$key];
+		if (isset($this->data->{$key})) {
+			$this->data = $this->data->{$key};
+		} else if ($this->isArray() && isset($this->data[$key])) {
+			$this->data = $this->data[$key];
+		}
 	}
 
 	public function traverse($key, $result) {
-		if ($key !== null) $this->traverseInto($key);
-		else {
+		if ($key !== null) {
+			$this->traverseInto($key);
+		} else {
 			//But if the key is null, replace the data structure with the result of the last function call
 			$lastResult = $result->pop();
 			if ($lastResult) {
@@ -37,10 +41,14 @@ 
 
 	public function read($value) {
 		if ($this->isArray()) {
-			if (isset($this->data[$value])) return $this->data[$value];
+			if (isset($this->data[$value])) {
+				return $this->data[$value];
+			}
+		} else if (isset($this->data->$value)) {
+			return $this->data->$value;
+		} else {
+			return null;
 		}
-		else if (isset($this->data->$value)) return $this->data->$value;
-		else return null;
 	}
 
 	public function call($func, $args) {
@@ -53,14 +61,20 @@ 
 
 	public function parseNested($parser, $token, $funcName) {
 		$args = $parser->parseTokens($token['value'], $this->data);
-		if ($args[0] == $this->data) $args = [];
+		if ($args[0] == $this->data) {
+			$args = [];
+		}
 		return $this->callFuncOnObject($this->data, $funcName, $args);
 	}
 
 	private function callFuncOnObject($obj, $func, $args) {
-		if (isset($obj->$func) && is_callable($obj->$func)) return call_user_func_array($obj->$func, $args);
-		else if (is_callable([$obj, $func])) return call_user_func_array([$obj, $func], $args);
-		else return false;
+		if (isset($obj->$func) && is_callable($obj->$func)) {
+			return call_user_func_array($obj->$func, $args);
+		} else if (is_callable([$obj, $func])) {
+			return call_user_func_array([$obj, $func], $args);
+		} else {
+			return false;
+		}
 	}
 
 	public function extract($last, $autoLookup, $traversing) {

src/Parser/ValueResult.php

Braces +5 added lines, -4 removed lines

@@ -31,10 +31,11 @@
 		];
 
 		if ($funcs[$this->mode] === 'concat' && is_numeric($newValue)
-			&& is_numeric($this->result[count($this->result)-1]))
-			$this->add($newValue);
-		else
-			$this->{$funcs[$this->mode]}($newValue);
+			&& is_numeric($this->result[count($this->result)-1])) {
+					$this->add($newValue);
+		} else {
+					$this->{$funcs[$this->mode]}($newValue);
+		}
 	}
 
 	public function arg($value) {

src/Formatter/HTMLFormatter.php

Doc Comments +3 added lines

@@ -7,6 +7,9 @@
         $this->templateFunction = $templateFunction;
     }
 
+    /**
+     * @param string $val
+     */
     public function html($val) {
 		return $this->templateFunction->run(['<template>' . $val . '</template>']);
 	}

Indentation +5 added lines, -5 removed lines

@@ -1,13 +1,13 @@
 <?php
 namespace Transphporm\Formatter;
 class HTMLFormatter {
-    private $templateFunction;
+	private $templateFunction;
 
-    public function __construct(\Transphporm\TSSFunction\Template $templateFunction) {
-        $this->templateFunction = $templateFunction;
-    }
+	public function __construct(\Transphporm\TSSFunction\Template $templateFunction) {
+		$this->templateFunction = $templateFunction;
+	}
 
-    public function html($val) {
+	public function html($val) {
 		return $this->templateFunction->run(['<template>' . $val . '</template>']);
 	}
 

Spacing +2 added lines, -2 removed lines

@@ -8,12 +8,12 @@
     }
 
     public function html($val) {
-		return $this->templateFunction->run(['<template>' . $val . '</template>']);
+		return $this->templateFunction->run(['<template>'.$val.'</template>']);
 	}
 
 	public function debug($val) {
 		ob_start();
 		var_dump($val);
-		return $this->html('<pre>' . ob_get_clean() . '</pre>');
+		return $this->html('<pre>'.ob_get_clean().'</pre>');
 	}
 }

src/Property/Content.php

Doc Comments +16 added lines

@@ -28,6 +28,9 @@ 
 		}
 	}
 
+	/**
+	 * @param \DOMElement $element
+	 */
 	private function shouldRun($element) {
 		do {
 			if ($element->getAttribute('transphporm') == 'includedtemplate') return false;
@@ -40,6 +43,10 @@ 
 		return (isset($rules['content-mode'])) ? $rules['content-mode']->read() : 'append';
 	}
 
+	/**
+	 * @param \DOMElement $element
+	 * @param \Transphporm\Hook\PseudoMatcher $pseudoMatcher
+	 */
 	private function processPseudo($value, $element, $pseudoMatcher) {
 		$pseudoContent = ['attr', 'header', 'before', 'after'];
 		foreach ($pseudoContent as $pseudo) {
@@ -101,6 +108,9 @@ 
 		}
 	}
 
+	/**
+	 * @param \DOMElement $element
+	 */
 	private function replaceContent($element, $content) {
 		//If this rule was cached, the elements that were added last time need to be removed prior to running the rule again.
 		foreach ($this->getNode($content, $element->ownerDocument) as $node) {
@@ -109,12 +119,18 @@ 
 		$element->setAttribute('transphporm', 'remove');
 	}
 
+	/**
+	 * @param \DOMElement $element
+	 */
 	private function appendContent($element, $content) {
 		foreach ($this->getNode($content, $element->ownerDocument) as $node) {
 			$element->appendChild($node);
 		}
 	}
 
+	/**
+	 * @param \DOMElement $element
+	 */
 	private function removeAllChildren($element) {
 		while ($element->hasChildNodes()) $element->removeChild($element->firstChild);
 	}

Braces +22 added lines, -11 removed lines

@@ -15,7 +15,9 @@ 
 	}
 
 	public function run(array $values, \DomElement $element, array $rules, \Transphporm\Hook\PseudoMatcher $pseudoMatcher, array $properties = []) {
-		if (!$this->shouldRun($element)) return false;
+		if (!$this->shouldRun($element)) {
+			return false;
+		}
 
 		$values = $this->formatter->format($values, $rules);
 
@@ -23,14 +25,19 @@ 
 			//Remove the current contents
 			$this->removeAllChildren($element);
 			//Now make a text node
-			if ($this->getContentMode($rules) === 'replace') $this->replaceContent($element, $values);
-			else $this->appendContent($element, $values);
+			if ($this->getContentMode($rules) === 'replace') {
+				$this->replaceContent($element, $values);
+			} else {
+				$this->appendContent($element, $values);
+			}
 		}
 	}
 
 	private function shouldRun($element) {
 		do {
-			if ($element->getAttribute('transphporm') == 'includedtemplate') return false;
+			if ($element->getAttribute('transphporm') == 'includedtemplate') {
+				return false;
+			}
 		}
 		while (($element = $element->parentNode) instanceof \DomElement);
 		return true;
@@ -54,9 +61,10 @@ 
 	private function getNode($node, $document) {
 		foreach ($node as $n) {
 			if (is_array($n)) {
-				foreach ($this->getNode($n, $document) as $new) yield $new;
-			}
-			else {
+				foreach ($this->getNode($n, $document) as $new) {
+					yield $new;
+				}
+			} else {
 				yield $this->convertNode($n, $document);
 			}
 		}
@@ -67,9 +75,10 @@ 
 			$new = $document->importNode($node, true);
 			//Removing this might cause problems with caching...
 			//$new->setAttribute('transphporm', 'added');
-		}
-		else {
-			if ($node instanceof \DomText) $node = $node->nodeValue;
+		} else {
+			if ($node instanceof \DomText) {
+				$node = $node->nodeValue;
+			}
 			$new = $document->createElement('text');
 
 			$new->appendChild($document->createTextNode($node));
@@ -116,6 +125,8 @@ 
 	}
 
 	private function removeAllChildren($element) {
-		while ($element->hasChildNodes()) $element->removeChild($element->firstChild);
+		while ($element->hasChildNodes()) {
+			$element->removeChild($element->firstChild);
+		}
 	}
 }

src/Module/Format.php

Spacing +2 added lines, -2 removed lines

@@ -15,8 +15,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 load(\Transphporm\Config $config) {

Braces +7 added lines, -3 removed lines

@@ -14,9 +14,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 load(\Transphporm\Config $config) {

src/Pseudo/Attribute.php

Braces +3 added lines, -1 removed lines

@@ -7,7 +7,9 @@
 namespace Transphporm\Pseudo;
 class Attribute implements \Transphporm\Pseudo {
 	public function match($name, $args, \DomElement $element) {
-		if (!($name === null || in_array($name, ['data', 'iteration', 'root'])))  return true;
+		if (!($name === null || in_array($name, ['data', 'iteration', 'root']))) {
+			return true;
+		}
 		return $args[0];
 	}
 }

src/Cache.php

Braces +2 added lines, -1 removed lines

@@ -21,7 +21,8 @@
 		$key = md5($key);
 		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/FunctionSet.php

Braces +2 added lines, -4 removed lines

@@ -20,8 +20,7 @@ 
 			if (isset($this->functions[$name])) {
 				return $this->functions[$name]->run($this->getArgs0($name, $args), $this->element);
 			}
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 			throw new RunException(Exception::TSS_FUNCTION, $name, $e);
 		}
 		return true;
@@ -32,8 +31,7 @@ 
 			$tokens = $args[0];
 			$parser = new \Transphporm\Parser\Value($this);
 			return $parser->parseTokens($tokens, $this->elementData->getData($this->element));
-		}
-		else if ($args[0] instanceof Parser\Tokens) {
+		} else if ($args[0] instanceof Parser\Tokens) {
 			return iterator_to_array($args[0]);
 		}
 

src/Hook/Formatter.php

Braces +7 added lines, -4 removed lines

@@ -14,7 +14,9 @@ 
 	}
 
 	public function format($value, $rules) {
-		if (!isset($rules['format'])) return $value;
+		if (!isset($rules['format'])) {
+			return $value;
+		}
 		$tokens = $rules['format'];
 
 		$functionName = $tokens->from(\Transphporm\Parser\Tokenizer::NAME, true)->read();
@@ -27,15 +29,16 @@ 
 
 		try {
 			return $this->processFormat($options, $functionName, $value);
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 			throw new \Transphporm\RunException(\Transphporm\Exception::FORMATTER, $functionName, $e);
 		}
 	}
 
 	//TODO: Abstract all error reporting externally with a method for turning it on/off
 	private function assert($condition, $error) {
-		if (!$condition) throw new \Exception($error);
+		if (!$condition) {
+			throw new \Exception($error);
+		}
 	}
 
 	private function processFormat($format, $functionName, $value) {