Level-2 / Transphporm

src/Parser/Value.php

Doc Comments +4 added lines

@@ -155,6 +155,10 @@
 
 	//Extracts $last from $data. If "last" is "bar" from value "foo.bar",
 	//$data contains "foo" and this function reads $data[$bar] or $data->$bar
+
+	/**
+	 * @param ValueResult|null $result
+	 */
 	private function extractLast($result) {
 		if ($this->autoLookup && isset($this->data->{$this->last})) {
 			return $this->result->processValue($this->data->{$this->last});

Braces +36 added lines, -22 removed lines

@@ -51,7 +51,9 @@ 
 		$this->data = $data;
 		$this->last = null;
 
-		if (empty($tokens)) return [$this->data];
+		if (empty($tokens)) {
+			return [$this->data];
+		}
 		
 		foreach ($tokens as $token) {
 			$this->{$this->tokenFuncs[$token['type']]}($token);	
@@ -66,27 +68,36 @@ 
 
 		if ($this->result->getMode() == Tokenizer::NOT && $token['type'] == Tokenizer::EQUALS) {
 			$this->result->setMode(Tokenizer::NOT);
+		} else {
+			$this->result->setMode($token['type']);
 		}
-		else $this->result->setMode($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 = $this->result->pop();
+		if ($this->last !== null) {
+			$this->moveLastToData();
+		} else {
+			$this->data = $this->result->pop();
+		}
 
 		$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'], null)[0];
 	}
@@ -108,15 +119,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->result->processValue($this->data->{$this->last}($token['value']));
 			$this->last = null;
-		}
-		else {
+		} else {
 			$parser = new Value($this->baseData, $this->autoLookup);
 			$args = $parser->parseTokens($token['value'], $this->data);
-			if ($args[0] == $this->data) $args = [];
+			if ($args[0] == $this->data) {
+				$args = [];
+			}
 			$funcResult = $this->callFunc($this->last, $args, $this->data);
 			$this->result->processValue($funcResult);
 			$this->last = null;
@@ -127,9 +138,12 @@ 
 		$this->result->processValue($this->baseData->{$this->last}($token['value']));
 		foreach ($this->result->getResult() 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;
 	}
@@ -139,12 +153,10 @@ 
 		if ($this->last !== null) {
 			try {
 				$this->extractLast($this->result);
-			}
-			catch (\UnexpectedValueException $e) {
+			} catch (\UnexpectedValueException $e) {
 				if (!$this->autoLookup) {
 					$this->result->processValue($this->last);
-				}
-				else {
+				} else {
 					$this->result->clear();
 					$this->result[0] = false;
 				}
@@ -158,8 +170,7 @@ 
 	private function extractLast($result) {
 		if ($this->autoLookup && isset($this->data->{$this->last})) {
 			return $this->result->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->result->processValue($this->data[$this->last]);
 		}
 		throw new \UnexpectedValueException('Not found');
@@ -170,7 +181,10 @@ 
 	}
 
 	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);
+		}
 	}
 }
\ No newline at end of file