Level-2 / Transphporm

src/Parser/Value.php

Braces +30 added lines, -17 removed lines

@@ -32,8 +32,9 @@ 
 			$params = $bracketMatcher->match('(', ')');
 			
 			return ['name' => $name, 'params' => $params, 'endPoint' => $bracketMatcher->getClosePos()];
+		} else {
+			return ['name' => null, 'params' => $function, 'endPoint' => strlen($function)];
 		}
-		else return ['name' => null, 'params' => $function, 'endPoint' => strlen($function)];
 	}
 
 	public function parse($function, \DomElement $element) {
@@ -41,13 +42,15 @@ 
 		if ($function && in_array($function[0], ['\'', '"'])) {
 			$finalPos = $this->findMatchingPos($function, $function[0]);
 			$result[] = $this->extractQuotedString($function[0], $function);
-		}
-		else {
+		} else {
 			$func = $this->parseFunction($function);
 			$finalPos = $func['endPoint'];			
 
-			if (($data = $this->getFunctionValue($func['name'], $func['params'], $element)) !== false) $result = $this->appendToArray($result, $data);
-			else $result[] = trim($function);
+			if (($data = $this->getFunctionValue($func['name'], $func['params'], $element)) !== false) {
+				$result = $this->appendToArray($result, $data);
+			} else {
+				$result[] = trim($function);
+			}
 		}
 		$remaining = trim(substr($function, $finalPos+1));
 		return $this->parseNextValue($remaining, $result, $element);
@@ -56,23 +59,27 @@ 
 	private function getFunctionValue($name, $params, $element) {
 		if (($data = $this->callFunc($name, $params, $element)) !== false) {
 			return $data;
-		}
-		else if ($this->parent != null && ($data = $this->parent->callFunc($name, $params, $element)) !== false) {
+		} else if ($this->parent != null && ($data = $this->parent->callFunc($name, $params, $element)) !== false) {
 			return $data;
+		} else {
+			return false;
 		}
-		else return false;
 	}
 
 	private function appendToArray($array, $value) {
-		if (is_array($value)) $array += $value;
-		else $array[] = $value;
+		if (is_array($value)) {
+			$array += $value;
+		} else {
+			$array[] = $value;
+		}
 		return $array;
 	}
 
 	private function callFunc($name, $params, $element) {
 		if ($name && $this->isCallable($this->dataFunction, $name)) {
-			if ($this->callParamsAsArray) return $this->dataFunction->$name($this->parse($params, $element), $element);	
-			else {
+			if ($this->callParamsAsArray) {
+				return $this->dataFunction->$name($this->parse($params, $element), $element);
+			} else {
 				return $this->callFuncOnObject($this->dataFunction, $name, $this->parse($params, $element));
 			}
 		}
@@ -85,12 +92,17 @@ 
 	}
 
 	private function callFuncOnObject($obj, $func, $params) {
-		if (isset($obj->$func) && is_callable($obj->$func)) return call_user_func_array($obj->$func, $params);
-		else return call_user_func_array([$obj, $func], $params);
+		if (isset($obj->$func) && is_callable($obj->$func)) {
+			return call_user_func_array($obj->$func, $params);
+		} else {
+			return call_user_func_array([$obj, $func], $params);
+		}
 	}
 
 	private function parseNextValue($remaining, $result, $element) {
-		if (strlen($remaining) > 0 && $remaining[0] == ',') $result = array_merge($result, $this->parse(trim(substr($remaining, 1)), $element));
+		if (strlen($remaining) > 0 && $remaining[0] == ',') {
+			$result = array_merge($result, $this->parse(trim(substr($remaining, 1)), $element));
+		}
 		return $result;
 	}
 	
@@ -98,8 +110,9 @@ 
 		$pos = $start+1;
 		$end = 0;
 		while ($end = strpos($string, $char, $pos)) {
-			if ($string[$end-1] === $escape) $pos = $end+1;
-			else {
+			if ($string[$end-1] === $escape) {
+				$pos = $end+1;
+			} else {
 				break;
 			}
 		}