Level-2 / Transphporm

src/Parser/ValueData.php

Doc Comments +6 added lines

@@ -34,6 +34,9 @@ 
 		return $this->data->$func(...$args);
 	}
 
+	/**
+	 * @param Value $parser
+	 */
 	public function parseNested($parser, $token, $funcName) {
 		$args = $parser->parseTokens($token['value'], $this->data);
 		if ($args[0] == $this->data) $args = [];
@@ -49,6 +52,9 @@ 
 		else return call_user_func_array([$obj, $func], $args);
 	}
 
+	/**
+	 * @param boolean $autoLookup
+	 */
 	public function extract($last, $autoLookup) {
 		if ($autoLookup && isset($this->data->{$last})) {
 			return $this->data->{$last};

Braces +21 added lines, -10 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 (is_scalar($value) && isset($this->data->$value)) {
+			return $this->data->$value;
+		} else {
+			return false;
 		}
-		else if (is_scalar($value) && 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,15 +54,17 @@ 
 	}
 
 	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) {
 		if ($autoLookup && isset($this->data->{$last})) {
 			return $this->data->{$last};
-		}
-		else if (is_array($this->data) && isset($this->data[$last])) {
+		} else if (is_array($this->data) && isset($this->data[$last])) {
 			return $this->data[$last];
 		}
 		throw new \UnexpectedValueException('Not found');

src/Parser/Value.php

Braces +20 added lines, -14 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,9 @@ 
 
 		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']);
 	}
 
 
@@ -75,14 +78,19 @@ 
 
 	//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;
 	}
 
 	private function processSquareBracket($token) {
-		if ($this->last !== null) $this->data->traverse($this->last);
+		if ($this->last !== null) {
+			$this->data->traverse($this->last);
+		}
 		$parser = new Value($this->baseData, $this->autoLookup);
 		$this->last = $parser->parseTokens($token['value'], null)[0];
 	}
@@ -104,12 +112,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);
 		}
 	}
@@ -125,7 +131,9 @@ 
 		$this->result->processValue($this->baseData->{$this->last}($token['value']));
 		foreach ($this->result->getResult() as $i => $value) {
 			$val = $this->data->read($value);
-			if ($val) $this->result[$i] = $val;
+			if ($val) {
+				$this->result[$i] = $val;
+			}
 		}
 		$this->last = null;
 	}
@@ -136,12 +144,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;
 				}