Level-2 / Transphporm

src/Parser/Value.php

Braces +20 added lines, -17 removed lines

@@ -51,7 +51,9 @@ 
 		$this->data = new ValueData($data);
 		$this->last = null;
 
-		if (empty($tokens)) return [$data];
+		if (empty($tokens)) {
+			return [$data];
+		}
 
 		foreach ($tokens as $token) {
 			$this->{$this->tokenFuncs[$token['type']]}($token);	
@@ -66,8 +68,7 @@ 
 
 		if ($this->result->getMode() == Tokenizer::NOT && $token['type'] == Tokenizer::EQUALS) {
 			$this->result->setMode(Tokenizer::NOT);
-		}
-		else {
+		} else {
 			$this->result->setMode($token['type']);
 			$this->last = null;
 		}
@@ -77,8 +78,11 @@ 
 	//Reads the last selected value from $data regardless if it's an array or object and overrides $this->data with the new value
 	//Dot moves $data to the next object in $data foo.bar moves the $data pointer from `foo` to `bar`
 	private function processDot($token) {
-		if ($this->last !== null) $this->data->traverse($this->last);
-		else $this->data = new ValueData($this->result->pop());
+		if ($this->last !== null) {
+			$this->data->traverse($this->last);
+		} else {
+			$this->data = new ValueData($this->result->pop());
+		}
 
 		$this->last = null;
 	}
@@ -87,9 +91,10 @@ 
 		$parser = new Value($this->baseData, $this->autoLookup);
 		if ($this->baseData instanceof \Transphporm\Functionset && $this->baseData->hasFunction($this->last)) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
-			if ($this->last !== null) $this->data->traverse($this->last);			
+		} else {
+			if ($this->last !== null) {
+				$this->data->traverse($this->last);
+			}
 			$this->last = $parser->parseTokens($token['value'], null)[0];
 		}
 	}
@@ -111,12 +116,10 @@ 
 	private function processBrackets($token) {
 		if ($this->baseData instanceof \Transphporm\Functionset && $this->baseData->hasFunction($this->last)) {
 			$this->callTransphpormFunctions($token);
-		}
-		else if ($this->data->isFunctionSet()) {
+		} else if ($this->data->isFunctionSet()) {
 			$this->result = $this->result->processValue($this->data->call($this->last, [$token['value']]));
 			$this->last = null;
-		}
-		else {
+		} else {
 			$this->processNested($token);
 		}
 	}
@@ -133,7 +136,9 @@ 
 		foreach ($this->result->getResult() as $i => $value) {
 			if (is_scalar($value)) {
 				$val = $this->data->read($value);
-				if ($val) $this->result[$i] = $val;
+				if ($val) {
+					$this->result[$i] = $val;
+				}
 			}
 		}
 		$this->last = null;
@@ -145,12 +150,10 @@ 
 			try {
 				$value = $this->data->extract($this->last, $this->autoLookup);
 				$this->result->processValue($value);
-			}
-			catch (\UnexpectedValueException $e) {
+			} catch (\UnexpectedValueException $e) {
 				if (!$this->autoLookup) {
 					$this->result->processValue($this->last);
-				}
-				else {
+				} else {
 					$this->result->clear();
 					$this->result[0] = false;
 				}

src/Parser/ValueData.php

Spacing +1 added lines, -1 removed lines

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

Braces +20 added lines, -8 removed lines

@@ -14,16 +14,23 @@ 
 	}
 
 	public function traverse($key) {
-		if (isset($this->data->{$key})) $this->data = $this->data->{$key};
-		else if (is_array($this->data) && isset($this->data[$key])) $this->data = $this->data[$key];
+		if (isset($this->data->{$key})) {
+			$this->data = $this->data->{$key};
+		} else if (is_array($this->data) && isset($this->data[$key])) {
+			$this->data = $this->data[$key];
+		}
 	}
 
 	public function read($value) {
 		if (is_array($this->data)) {
-			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 false;
 		}
-		else if (isset($this->data->$value)) return $this->data->$value;
-		else return false;
 	}
 
 	public function isFunctionSet() {
@@ -36,7 +43,9 @@ 
 
 	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->callFunc($funcName, $args, $this->data);
 	}
 
@@ -45,8 +54,11 @@ 
 	}
 
 	private function callFuncOnObject($obj, $func, $args) {
-		if (isset($obj->$func) && is_callable($obj->$func)) return call_user_func_array($obj->$func, $args);
-		else return call_user_func_array([$obj, $func], $args);
+		if (isset($obj->$func) && is_callable($obj->$func)) {
+			return call_user_func_array($obj->$func, $args);
+		} else {
+			return call_user_func_array([$obj, $func], $args);
+		}
 	}
 
 	public function extract($last, $autoLookup) {

src/Pseudo/Attribute.php

Braces +6 added lines, -2 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 (!$this->functionSet->hasFunction($name)) return true;
+		if (!$this->functionSet->hasFunction($name)) {
+			return true;
+		}
 
 		$this->functionSet->setElement($element);
 		$valueParser = new \Transphporm\Parser\Value($this->functionSet);

src/Property/Content.php

Braces +21 added lines, -9 removed lines

@@ -18,21 +18,28 @@ 
 	}
 
 	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);
 		if (!$this->processPseudo($values, $element, $pseudoMatcher)) {
 			//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,17 +61,20 @@ 
 	}
 	
 	private function getNode($node, $document) {
-		if (is_array($node[0])) $node = $node[0];
+		if (is_array($node[0])) {
+			$node = $node[0];
+		}
 		foreach ($node as $n) {
 
 			if ($n instanceof \DomElement) {
 				$new = $document->importNode($n, true);
 				//Removing this might cause problems with caching... 
 				//$new->setAttribute('transphporm', 'added');
-			}
-			else {
+			} else {
 
-				if ($n instanceof \DomText) $n = $n->nodeValue;
+				if ($n instanceof \DomText) {
+					$n = $n->nodeValue;
+				}
 				$new = $document->createElement('text');
 				
 				$new->appendChild($document->createTextNode($n));
@@ -111,6 +121,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/Property/Repeat.php

Braces +12 added lines, -4 removed lines

@@ -15,14 +15,18 @@ 
 	}
 
 	public function run(array $values, \DomElement $element, array $rules, \Transphporm\Hook\PseudoMatcher $pseudoMatcher, array $properties = []) {
-		if ($element->getAttribute('transphporm') === 'added') return $element->parentNode->removeChild($element);
+		if ($element->getAttribute('transphporm') === 'added') {
+			return $element->parentNode->removeChild($element);
+		}
 		$max = $this->getMax($values);
 		$count = 0;
 
 		//What was this if statement for? removing it breaks nothing
 		//if (empty($values[0])) $values[0] = [];
 		foreach ($values[0] as $key => $iteration) {
-			if ($count+1 > $max) break;
+			if ($count+1 > $max) {
+				break;
+			}
 			$clone = $this->cloneElement($element, $iteration, $key, $count++);
 			//Re-run the hook on the new element, but use the iterated data
 			//Don't run repeat on the clones element or it will loop forever
@@ -46,7 +50,9 @@ 
 
 	private function tagElement($element, $count) {
 		//Mark all but one of the nodes as having been added by transphporm, when the hook is run again, these are removed
-		if ($count > 0) $element->setAttribute('transphporm', 'added');
+		if ($count > 0) {
+			$element->setAttribute('transphporm', 'added');
+		}
 	}
 
 	private function getMax($values) {
@@ -55,7 +61,9 @@ 
 
 	private function createHook($newRules, $pseudoMatcher, $properties) {
 		$hook = new \Transphporm\Hook\PropertyHook($newRules, $pseudoMatcher, new \Transphporm\Parser\Value($this->functionSet), $this->functionSet);
-		foreach ($properties as $name => $property) $hook->registerProperty($name, $property);
+		foreach ($properties as $name => $property) {
+			$hook->registerProperty($name, $property);
+		}
 		return $hook;
 	}
 }