Level-2 / Transphporm

src/FunctionSet.php

Braces +2 added lines, -1 removed lines

@@ -19,8 +19,9 @@
 	public function __call($name, $args) {
 		if (isset($this->functions[$name])) {
 			return $this->functions[$name]->run($args[0], $args[1]);
+		} else {
+			return \Transphporm\Parser\Value::IS_NOT_FUNCTION;
 		}
-		else return \Transphporm\Parser\Value::IS_NOT_FUNCTION;
 	}
 
 	public function addFunction($name, \Transphporm\TSSFunction $function) {

src/Hook/ElementData.php

Braces +6 added lines, -2 removed lines

@@ -18,7 +18,9 @@ 
 	/** Binds data to an element */
 	public function bind(\DomNode $element, $data, $type = '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];
+		}
 		$content = isset($this->elementMap[$element]) ? $this->elementMap[$element] : [];
 		$content[$type] = $data;
 		$this->elementMap[$element] = $content;
@@ -31,7 +33,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*/
 	public function getData(\DomElement $element = null, $type = 'data') {
 		while ($element) {
-			if (isset($this->elementMap[$element]) && isset($this->elementMap[$element][$type])) return $this->elementMap[$element][$type];
+			if (isset($this->elementMap[$element]) && isset($this->elementMap[$element][$type])) {
+				return $this->elementMap[$element][$type];
+			}
 			$element = $element->parentNode;
 		}
 		return $this->data;

src/Pseudo/Attribute.php

Braces +15 added lines, -6 removed lines

@@ -14,10 +14,14 @@ 
 
 	public function match($pseudo, \DomElement $element) {
 		$pos = strpos($pseudo, '[');
-		if ($pos === false) return true;
+		if ($pos === false) {
+			return true;
+		}
 		
 		$name = substr($pseudo, 0, $pos);
-		if (!is_callable([$this->functionSet, $name])) return true;
+		if (!is_callable([$this->functionSet, $name])) {
+			return true;
+		}
 
 		$bracketMatcher = new \Transphporm\Parser\BracketMatcher($pseudo);
 		$criteria = $bracketMatcher->match('[', ']');
@@ -41,16 +45,21 @@ 
 	}
 
 	private function parseValue($value) {
-		if ($value == 'true') return true;
-		else if ($value == 'false') return false;
-		else return $value;
+		if ($value == 'true') {
+			return true;
+		} else if ($value == 'false') {
+			return false;
+		} else {
+			return $value;
+		}
 	}
 
 	private function getOperator($field) {
 		if ($field[strlen($field)-1] == '!') {
 			return '!';
+		} else {
+			return '';
 		}
-		else return '';
 	}
 
 }
\ No newline at end of file

src/Property/Content.php

Braces +21 added lines, -9 removed lines

@@ -18,22 +18,31 @@ 
 	}
 
 	public function run($value, \DomElement $element, array $rules, \Transphporm\Hook\PseudoMatcher $pseudoMatcher, array $properties = []) {
-		if (!$this->shouldRun($element)) return false;
+		if (!$this->shouldRun($element)) {
+			return false;
+		}
 			
 		$value = $this->formatter->format($value, $rules);
 		if (!$this->processPseudo($value, $element, $pseudoMatcher)) {
 			//Remove the current contents
 			$this->removeAllChildren($element);
 			//Now make a text node
-			if ($this->getContentMode($rules) === 'replace') $this->replaceContent($element, $value);
-			else $this->appendContent($element, $value);
+			if ($this->getContentMode($rules) === 'replace') {
+				$this->replaceContent($element, $value);
+			} else {
+				$this->appendContent($element, $value);
+			}
 		}
 	}
 
 	private function shouldRun($element) {
-		if ($element->getAttribute('transphporm') === 'remove') return false;
+		if ($element->getAttribute('transphporm') === 'remove') {
+			return false;
+		}
 		do {
-			if ($element->getAttribute('transphporm') == 'includedtemplate') return false;
+			if ($element->getAttribute('transphporm') == 'includedtemplate') {
+				return false;
+			}
 		}
 		while (($element = $element->parentNode) instanceof \DomElement);
 		return true;
@@ -60,9 +69,10 @@ 
 				$new = $document->importNode($n, true);
 				//Removing this might cause problems with caching... 
 				//$new->setAttribute('transphporm', 'added');
-			}
-			else {
-				if ($n instanceof \DomText) $n = $n->nodeValue;
+			} else {
+				if ($n instanceof \DomText) {
+					$n = $n->nodeValue;
+				}
 				$new = $document->createElement('text');
 				$new->appendChild($document->createTextNode($n));
 				$new->setAttribute('transphporm', 'text');
@@ -108,6 +118,8 @@ 
 	}
 	
 	private function removeAllChildren($element) {
-		while ($element->hasChildNodes()) $element->removeChild($element->firstChild);
+		while ($element->hasChildNodes()) {
+			$element->removeChild($element->firstChild);
+		}
 	}
 }
\ No newline at end of file

src/TSSFunction/Template.php

Braces +6 added lines, -2 removed lines

@@ -27,7 +27,9 @@ 
 		$newTemplate = new \Transphporm\Builder($this->baseDir . $args[0], $tss);
 
 		$doc = $newTemplate->output($this->elementData->getData($element), true)->body;
-		if ($selector != '') return $this->templateSubsection($doc, $selector);
+		if ($selector != '') {
+			return $this->templateSubsection($doc, $selector);
+		}
 		
 		$newNode = $doc->documentElement;
 		$result = [];
@@ -54,7 +56,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;
 	}
 }
\ No newline at end of file

src/TSSFunction/Data.php

Braces +17 added lines, -8 removed lines

@@ -25,14 +25,18 @@ 
 		$valueParser = new \Transphporm\Parser\Value($this->functionSet);
 
 		foreach ($parts as $part) {
-			if ($part === '') continue;
+			if ($part === '') {
+				continue;
+			}
 			$part = $valueParser->parse($part, $element)[0];
 
 			$funcResult = $this->traverseObj($part, $obj, $valueParser, $element);
 
-			if ($funcResult !== false) $obj = $funcResult;
-			
-			else $obj = $this->ifNull($obj, $part);
+			if ($funcResult !== false) {
+				$obj = $funcResult;
+			} else {
+				$obj = $this->ifNull($obj, $part);
+			}
 		}
 		return $obj;
 	}
@@ -41,14 +45,19 @@ 
 		if (strpos($part, '(') !== false) {
 			$subObjParser = new \Transphporm\Parser\Value($obj, $valueParser, false);
 			return $subObjParser->parse($part, $element)[0];
+		} else if (method_exists($obj, $part)) {
+			return call_user_func([$obj, $part]);
+		} else {
+			return false;
 		}
-		else if (method_exists($obj, $part)) return call_user_func([$obj, $part]); 
-		else return false;
 	}
 
 	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;
+		}
 	}
 
 

src/Builder.php

Braces +18 added lines, -7 removed lines

@@ -26,7 +26,9 @@ 
 		$this->cache = new Cache(new \ArrayObject());
 
 		$modules = is_array($modules) ? $modules : $this->defaultModules;
-		foreach ($modules as $module) $this->loadModule(new $module);
+		foreach ($modules as $module) {
+			$this->loadModule(new $module);
+		}
 	}
 
 	//Allow setting the time used by Transphporm for caching. This is for testing purposes
@@ -47,7 +49,9 @@ 
 		$data = new FunctionSet($elementData, $this->baseDir);
 		$config = new Config($data, $elementData, new Hook\Formatter(), $headers, $this->baseDir);
 
-		foreach ($this->modules as $module) $module->load($config);
+		foreach ($this->modules as $module) {
+			$module->load($config);
+		}
 		
 		$cachedOutput = $this->loadTemplate();
 		//To be a valid XML document it must have a root element, automatically wrap it in <template> to ensure it does
@@ -67,7 +71,9 @@ 
 		$rules = $this->getRules($template, $valueParser);
 
 		foreach ($rules as $rule) {
-			if ($rule->shouldRun($this->time)) $this->executeTssRule($rule, $template, $valueParser, $config);
+			if ($rule->shouldRun($this->time)) {
+				$this->executeTssRule($rule, $template, $valueParser, $config);
+			}
 		}
 	}
 
@@ -92,8 +98,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' => []];	
 	}
 
 	//Load the TSS rules either from a file or as a string
@@ -107,10 +114,14 @@ 
 			$key = $this->tss . $template->getPrefix() . $this->baseDir;
 			//Try to load the cached rules, if not set in the cache (or expired) parse the supplied sheet
 			$rules = $this->cache->load($key, filemtime($this->tss));
-			if (!$rules) return $this->cache->write($key, (new Parser\Sheet(file_get_contents($this->tss), $this->baseDir, $valueParser, $template->getPrefix()))->parse());
-			else return $rules;
+			if (!$rules) {
+				return $this->cache->write($key, (new Parser\Sheet(file_get_contents($this->tss), $this->baseDir, $valueParser, $template->getPrefix()))->parse());
+			} else {
+				return $rules;
+			}
+		} else {
+			return (new Parser\Sheet($this->tss, $this->baseDir, $valueParser, $template->getPrefix()))->parse();
 		}
-		else return (new Parser\Sheet($this->tss, $this->baseDir, $valueParser, $template->getPrefix()))->parse();
 	}
 
 	public function setCache(\ArrayAccess $cache) {