Level-2 / Transphporm

src/Parser/Value.php

Braces +48 added lines, -30 removed lines

@@ -52,7 +52,9 @@ 
 	public function parse($str, $element = null, $returnTokens = false) {
 		$tokenizer = new Tokenizer($str);
 		$tokens = $tokenizer->getTokens();
-		if ($returnTokens) return $tokens;
+		if ($returnTokens) {
+			return $tokens;
+		}
 		$this->result = $this->parseTokens($tokens, $element, $this->baseData);
 		return $this->result;
 	}
@@ -64,7 +66,9 @@ 
 		$this->last = null;
 		$this->element = $element;
 
-		if (empty($tokens)) return [$this->data];
+		if (empty($tokens)) {
+			return [$this->data];
+		}
 		
 		foreach ($tokens as $token) {
 			$this->{$this->tokenFuncs[$token['type']]}($token);	
@@ -78,27 +82,36 @@ 
 
 		if ($this->mode == Tokenizer::NOT && $token['type'] == Tokenizer::EQUALS) {
 			$this->mode = Tokenizer::NOT;
+		} else {
+			$this->mode = $token['type'];
 		}
-		else $this->mode = $token['type'];
 	}
 
 
 	//Reads the last selected value from $data regardless if it's an array or object and overrides $this->data with the new value
 	private function moveLastToData() {
-		if (isset($this->data->{$this->last})) $this->data = $this->data->{$this->last};
-		else if (is_array($this->data) && isset($this->data[$this->last])) $this->data = $this->data[$this->last];
+		if (isset($this->data->{$this->last})) {
+			$this->data = $this->data->{$this->last};
+		} else if (is_array($this->data) && isset($this->data[$this->last])) {
+			$this->data = $this->data[$this->last];
+		}
 	}
 
 	//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->moveLastToData();
-		else $this->data = array_pop($this->result);
+		if ($this->last !== null) {
+			$this->moveLastToData();
+		} else {
+			$this->data = array_pop($this->result);
+		}
 
 		$this->last = null;
 	}
 
 	private function processSquareBracket($token) {
-		if ($this->last !== null) $this->moveLastToData();
+		if ($this->last !== null) {
+			$this->moveLastToData();
+		}
 
 		$parser = new Value($this->baseData, $this->autoLookup);
 		$this->last = $parser->parseTokens($token['value'], $this->element, null)[0];
@@ -121,15 +134,15 @@ 
 	private function processBrackets($token) {
 		if ($this->baseData instanceof \Transphporm\Functionset && $this->baseData->hasFunction($this->last)) {
 			$this->callTransphpormFunctions($token);
-		}
-		else if ($this->data instanceof \Transphporm\Functionset) {
+		} else if ($this->data instanceof \Transphporm\Functionset) {
 			$this->result = $this->processValue($this->data->{$this->last}($token['value'], $this->element));
 			$this->last = null;
-		}
-		else {
+		} else {
 			$parser = new Value($this->baseData, $this->autoLookup);
 			$args = $parser->parseTokens($token['value'], $this->element, $this->data);
-			if ($args[0] == $this->data) $args = [];
+			if ($args[0] == $this->data) {
+				$args = [];
+			}
 			$funcResult = $this->callFunc($this->last, $args, $this->element, $this->data);
 			$this->result = $this->processValue($funcResult);
 			$this->last = null;
@@ -140,9 +153,12 @@ 
 		$this->result = $this->processValue($this->baseData->{$this->last}($token['value'], $this->element));
 		foreach ($this->result as $i => $value) {
 			if (is_array($this->data)) {
-				if (isset($this->data[$value])) $this->result[$i] = $this->data[$value];
+				if (isset($this->data[$value])) {
+					$this->result[$i] = $this->data[$value];
+				}
+			} else if (is_scalar($value) && isset($this->data->$value)) {
+				$this->result[$i] = $this->data->$value;
 			}
-			else if (is_scalar($value) && isset($this->data->$value)) $this->result[$i] = $this->data->$value;
 		}
 		$this->last = null;
 	}
@@ -152,12 +168,12 @@ 
 		if ($this->last !== null) {
 			try {
 				$this->result = $this->extractLast($this->result);
-			}
-			catch (\UnexpectedValueException $e) {
+			} catch (\UnexpectedValueException $e) {
 				if (!$this->autoLookup) {
 					$this->result = $this->processValue($this->last);
+				} else {
+					$this->result = [false];
 				}
-				else $this->result = [false];			
 			}			
 		}
 		return $this->result;
@@ -169,8 +185,7 @@ 
 	private function extractLast($result) {
 		if ($this->autoLookup && isset($this->data->{$this->last})) {
 			return $this->processValue($this->data->{$this->last});
-		}
-		else if (is_array($this->data) && isset($this->data[$this->last])) {
+		} else if (is_array($this->data) && isset($this->data[$this->last])) {
 			return $this->processValue($this->data[$this->last]);
 		}
 		throw new \UnexpectedValueException('Not found');
@@ -181,14 +196,11 @@ 
 	private function processValue($newValue) {
 		if ($this->mode == Tokenizer::ARG) {
 			$this->result[] = $newValue;
-		}
-		else if ($this->mode == Tokenizer::CONCAT) {
+		} else if ($this->mode == Tokenizer::CONCAT) {
 				$this->result[count($this->result)-1] .= $newValue;
-		}
-		else if ($this->mode == Tokenizer::NOT) {
+		} else if ($this->mode == Tokenizer::NOT) {
 			$this->result[count($this->result)-1] = $this->result[count($this->result)-1] != $newValue;
-		}
-		else if ($this->mode == Tokenizer::EQUALS) {
+		} else if ($this->mode == Tokenizer::EQUALS) {
 			$this->result[count($this->result)-1] = $this->result[count($this->result)-1] == $newValue;
 		}
 
@@ -196,12 +208,18 @@ 
 	}
 
 	private function callFunc($name, $args, $element, $data) {
-		if ($this->data instanceof \Transphporm\FunctionSet) return $this->data->$name($args, $element);
-		else return $this->callFuncOnObject($this->data, $name, $args, $element);
+		if ($this->data instanceof \Transphporm\FunctionSet) {
+			return $this->data->$name($args, $element);
+		} else {
+			return $this->callFuncOnObject($this->data, $name, $args, $element);
+		}
 	}
 
 	private function callFuncOnObject($obj, $func, $args, $element) {
-		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);
+		}
 	}
 }