Level-2 / Transphporm

src/Parser/Value.php

Braces +11 added lines, -12 removed lines

@@ -56,7 +56,9 @@ 
 		$this->last = null;
 		$this->traversing = false;
 
-		if (count($tokens) <= 0) return [$data];
+		if (count($tokens) <= 0) {
+			return [$data];
+		}
 
 		foreach (new TokenFilterIterator($tokens, [Tokenizer::WHITESPACE, Tokenizer::NEW_LINE]) as $token) {
 			$this->{$this->tokenFuncs[$token['type']]}($token);
@@ -84,8 +86,7 @@ 
 		// foo.bar is treated as looking up `bar` in `foo` whereas .foo is treated as the string ".foo"
 		if ($lastResult) {
 			$this->traversing = true;
-		}
-		else if ($this->last === null)  {
+		} else if ($this->last === null)  {
 			$this->processString(['value' => '.']);
 			$this->result->setMode(Tokenizer::CONCAT);
 		}
@@ -101,11 +102,12 @@ 
 		$parser = new Value($this->baseData, $this->autoLookup);
 		if ($this->hasFunction($this->last)) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
+		} else {
 			$this->data->traverse($this->last, $this->result);
 			$this->last = $parser->parseTokens($token['value'], null)[0];
-			if (!is_bool($this->last)) $this->traversing = true;
+			if (!is_bool($this->last)) {
+				$this->traversing = true;
+			}
 		}
 	}
 
@@ -125,8 +127,7 @@ 
 		if ($this->hasFunction($this->last)
 			&& !$this->data->methodExists($this->last)) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
+		} else {
 			$this->processNested($token);
 		}
 	}
@@ -156,8 +157,7 @@ 
 			try {
 				$value = $this->data->extract($this->last, $this->autoLookup, $this->traversing);
 				$this->result->processValue($value);
-			}
-			catch (\UnexpectedValueException $e) {
+			} catch (\UnexpectedValueException $e) {
 				$this->processLastUnexpected();
 			}
 		}
@@ -166,8 +166,7 @@ 
 	private function processLastUnexpected() {
 		if (!($this->autoLookup || $this->traversing)) {
 			$this->result->processValue($this->last);
-		}
-		else {
+		} else {
 			$this->result->clear();
 			$this->result->write(0, false);
 		}

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) {
@@ -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/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];