Level-2 / Transphporm

src/Property/Display.php

Braces +7 added lines, -3 removed lines

@@ -7,8 +7,12 @@
 namespace Transphporm\Property;
 class Display implements \Transphporm\Property {
 	public function run(array $values, \DomElement $element, array $rules, \Transphporm\Hook\PseudoMatcher $pseudoMatcher, array $properties = []) {
-		if ($pseudoMatcher->hasFunction('attr')) $element->removeAttribute($pseudoMatcher->getFuncArgs('attr')[0]);
-		else if (strtolower($values[0]) === 'none') $element->setAttribute('transphporm', 'remove');
-		else $element->setAttribute('transphporm', 'show');
+		if ($pseudoMatcher->hasFunction('attr')) {
+			$element->removeAttribute($pseudoMatcher->getFuncArgs('attr')[0]);
+		} else if (strtolower($values[0]) === 'none') {
+			$element->setAttribute('transphporm', 'remove');
+		} else {
+			$element->setAttribute('transphporm', 'show');
+		}
 	}
 }

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/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) {

src/Pseudo/Nth.php

Braces +12 added lines, -4 removed lines

@@ -11,25 +11,33 @@
 	private $lastParentNode;
 
 	public function match($name, $args, \DomElement $element) {
-		if ($element->parentNode !== $this->lastParentNode) $this->count = 0;
+		if ($element->parentNode !== $this->lastParentNode) {
+			$this->count = 0;
+		}
 
 		$this->lastParentNode = $element->parentNode;
 
 
 
-		if ($name !== 'nth-child') return true;
+		if ($name !== 'nth-child') {
+			return true;
+		}
 
 		$this->count++;
 		$criteria = $args[0];
 
-		if (is_callable([$this, $criteria])) return $this->$criteria($this->count);
+		if (is_callable([$this, $criteria])) {
+			return $this->$criteria($this->count);
+		}
 		$this->assert(is_numeric($criteria), "Argument passed to 'nth-child' must be 'odd', 'even', or of type int");
 		return $this->count == $criteria;
 	}
 
 	//TODO: Abstract assertions throughout
 	private function assert($condition, $error) {
-		if (!$condition) throw new \Exception($error);
+		if (!$condition) {
+			throw new \Exception($error);
+		}
 	}
 
 	private function odd($num) {

src/TSSFunction/Data.php

Braces +5 added lines, -2 removed lines

@@ -18,8 +18,11 @@
 	}
 
 	public function run(array $args, \DomElement $element = null) {
-		if ($this->dataKey === "root") $data = $this->data->getData(null, 'data');
-		else $data = $this->data->getData($element, $this->dataKey);
+		if ($this->dataKey === "root") {
+			$data = $this->data->getData(null, 'data');
+		} else {
+			$data = $this->data->getData($element, $this->dataKey);
+		}
 		$parser = new \Transphporm\Parser\Value($this->functionSet, true, true);
 		$return = $parser->parseTokens(new \Transphporm\Parser\Tokens($args), $data);
 		return $return[0];

src/Pseudo/Not.php

Braces +9 added lines, -3 removed lines

@@ -15,7 +15,9 @@ 
 	}
 
 	public function match($name, $args, \DomElement $element) {
-		if ($name !== 'not') return true;
+		if ($name !== 'not') {
+			return true;
+		}
 
 		$xpath = new \DomXpath($element->ownerDocument);
 		return $this->notElement($args, $xpath, $element);
@@ -28,7 +30,9 @@ 
 			$xpathString = $this->cssToXpath->getXpath($tokenizer->getTokens());
             $pseudo = $this->cssToXpath->getPseudo($tokenizer->getTokens());
             $pseudoMatcher = $this->config->createPseudoMatcher($pseudo);
-			if ($this->matches($xpath->query($xpathString), $element, $pseudoMatcher)) return false;
+			if ($this->matches($xpath->query($xpathString), $element, $pseudoMatcher)) {
+				return false;
+			}
 		}
 		return true;
 	}
@@ -37,7 +41,9 @@ 
         //Find all nodes matched by the expressions in the brackets :not(EXPR)
         foreach ($foundElements as $matchedElement) {
             //Check to see whether this node was matched by the not query
-            if ($pseudoMatcher->matches($matchedElement) && $element->isSameNode($matchedElement)) return true;
+            if ($pseudoMatcher->matches($matchedElement) && $element->isSameNode($matchedElement)) {
+            	return true;
+            }
         }
         return false;
     }

src/Hook/PropertyHook.php

Braces +14 added lines, -8 removed lines

@@ -31,15 +31,18 @@ 
 
 	public function run(\DomElement $element) {
 		//Set the baseDir so that all files for this rule are relative to the file it came from
-        if ($this->file !== null) $this->filePath->setBaseDir(dirname(realpath($this->file)));
+        if ($this->file !== null) {
+        	$this->filePath->setBaseDir(dirname(realpath($this->file)));
+        }
 		$this->functionSet->setElement($element);
 		$this->configLine = $this->line;
 		try {
 			//Don't run if there's a pseudo element like nth-child() and this element doesn't match it
-			if (!$this->pseudoMatcher->matches($element)) return;
+			if (!$this->pseudoMatcher->matches($element)) {
+				return;
+			}
 			$this->callProperties($element);
-		}
-		catch (\Transphporm\RunException $e) {
+		} catch (\Transphporm\RunException $e) {
 			throw new \Transphporm\Exception($e, $this->file, $this->line);
 		}
 	}
@@ -50,7 +53,9 @@ 
 	private function callProperties($element) {
 		foreach ($this->rules as $name => $value) {
 			$result = $this->callProperty($name, $element, $this->getArgs($value));
-			if ($result === false) break;
+			if ($result === false) {
+				break;
+			}
 		}
 	}
 	private function getArgs($value) {
@@ -65,9 +70,10 @@ 
 		if (isset($this->properties[$name])) {
 			try {
 				return $this->properties[$name]->run($value, $element, $this->rules, $this->pseudoMatcher, $this->properties);
-			}
-			catch (\Exception $e) {
-				if ($e instanceof \Transphporm\RunException) throw $e;
+			} catch (\Exception $e) {
+				if ($e instanceof \Transphporm\RunException) {
+					throw $e;
+				}
 				throw new \Transphporm\RunException(\Transphporm\Exception::PROPERTY, $name, $e);
 			}
 		}

src/TSSFunction/Template.php

Braces +16 added lines, -6 removed lines

@@ -25,13 +25,18 @@ 
 		$selector = $this->readArray($args, 1);
 		$tss = $this->readArray($args, 2);
 
-		if (trim($args[0])[0] === '<') $xml = $args[0];
-		else $xml = $this->filePath->getFilePath($args[0]);
+		if (trim($args[0])[0] === '<') {
+			$xml = $args[0];
+		} else {
+			$xml = $this->filePath->getFilePath($args[0]);
+		}
 
 		$newTemplate = new \Transphporm\Builder($xml, $tss ? $this->filePath->getFilePath($tss) : null);
 
 		$doc = $newTemplate->output($this->elementData->getData($element), true)->body;
-		if ($selector != '') return $this->templateSubsection($doc, $selector);
+		if ($selector != '') {
+			return $this->templateSubsection($doc, $selector);
+		}
 
 		return $this->getTemplateContent($doc->documentElement, $tss);
 	}
@@ -39,8 +44,11 @@ 
 	private function getTemplateContent($newNode, $tss) {
 		$result = [];
 		foreach ($newNode->childNodes as $node) {
-            if (isset($node->tagName) && $node->tagName === 'template') $result[] = $this->getTemplateContent($node, $tss);
-			else $result[] = $this->getClonedElement($node, $tss);
+            if (isset($node->tagName) && $node->tagName === 'template') {
+            	$result[] = $this->getTemplateContent($node, $tss);
+            } else {
+				$result[] = $this->getClonedElement($node, $tss);
+			}
 		}
 		return $result;
 	}
@@ -59,7 +67,9 @@ 
 
 	private function getClonedElement($node, $tss) {
 		$clone = $node->cloneNode(true);
-		if ($tss != null && $clone instanceof \DomElement) $clone->setAttribute('transphporm', 'includedtemplate');
+		if ($tss != null && $clone instanceof \DomElement) {
+			$clone->setAttribute('transphporm', 'includedtemplate');
+		}
 		return $clone;
 	}
 }

src/Parser/ValueData.php

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) {
@@ -41,10 +45,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) {
@@ -57,14 +65,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) {