Level-2 / Transphporm

src/Parser/Value.php

Braces +11 added lines, -9 removed lines

@@ -58,7 +58,9 @@ 
 		$this->last = new Last($this->data, $this->result, $this->autoLookup);
 		$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 $name => $token) {
 			$this->{$this->tokenFuncs[$token['type']]}($token);
@@ -86,8 +88,7 @@ 
 		// foo.bar is treated as looking up `bar` in `foo` whereas .foo is treated as the string ".foo"
 		if ($lastResult) {
 			$this->last->makeTraversing();
-		}
-		else if ($this->last->isEmpty())  {
+		} else if ($this->last->isEmpty())  {
 			$this->processString(['value' => '.']);
 			$this->result->setMode(Tokenizer::CONCAT);
 		}
@@ -102,11 +103,12 @@ 
 	private function processSquareBracket($token) {
 		if ($this->hasFunction($this->last->read())) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
+		} else {
 			$this->last->traverse();
 			$this->last->set($this->getNewParser()->parseTokens($token['value'], null)[0]);
-			if (!is_bool($this->last->read())) $this->last->makeTraversing();
+			if (!is_bool($this->last->read())) {
+				$this->last->makeTraversing();
+			}
 		}
 	}
 
@@ -129,8 +131,7 @@ 
 		if ($this->hasFunction($this->last->read())
 			&& !$this->data->methodExists($this->last->read())) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
+		} else {
 			$this->last->processNested($this->getNewParser(), $token);
 		}
 	}
@@ -147,8 +148,9 @@ 
 			$parser = new Value($this->data->getData());
 			$parsedArr = $parser->parse($val);
 			$parsedVal = isset($parsedArr[0]) ? $parsedArr[0] : null;
+		} else {
+			$parsedVal = null;
 		}
-		else $parsedVal = null;
         
         $this->result->postProcess($this->data, $val, $parsedVal, $this->allowNullResult);
 

src/Parser/ValueResult.php

Indentation +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
 
 	//Postprocessing - replace values with null where allowed, or override a value at position
 	public function postProcess(ValueData $data, $val, $overrideVal, $allowNull) {
-        if ($this->getMode() !== Tokenizer::ARG) return;
+		if ($this->getMode() !== Tokenizer::ARG) return;
 		foreach ($this->getResult() as $i => $value) {
 			if (is_scalar($value)) {
 				$val = ($overrideVal == $val) ? $data->read($value) : $overrideVal;

Braces +11 added lines, -6 removed lines

@@ -33,14 +33,17 @@ 
 		];
 
 		if ($funcs[$this->mode] === 'concat' && is_numeric($newValue)
-			&& is_numeric($this->result[count($this->result)-1]))
-			$this->add($newValue);
-		else
-			$this->{$funcs[$this->mode]}($newValue);
+			&& is_numeric($this->result[count($this->result)-1])) {
+					$this->add($newValue);
+		} else {
+					$this->{$funcs[$this->mode]}($newValue);
+		}
 	}
 
 	public function in($value) {
-		if (!is_array($value)) throw new \Exception(' `in` can only be used with arrays');
+		if (!is_array($value)) {
+			throw new \Exception(' `in` can only be used with arrays');
+		}
 		$this->result[count($this->result)-1] = in_array($this->result[count($this->result)-1], $value);
 	}
 
@@ -108,7 +111,9 @@ 
 
 	//Postprocessing - replace values with null where allowed, or override a value at position
 	public function postProcess(ValueData $data, $val, $overrideVal, $allowNull) {
-        if ($this->getMode() !== Tokenizer::ARG) return;
+        if ($this->getMode() !== Tokenizer::ARG) {
+        	return;
+        }
 		foreach ($this->getResult() as $i => $value) {
 			if (is_scalar($value)) {
 				$val = ($overrideVal == $val) ? $data->read($value) : $overrideVal;