Level-2 / Transphporm

src/Hook/DataFunction.php

Doc Comments +6 added lines

@@ -11,6 +11,9 @@ 
 	private $data;
 	private $baseDir;
 
+	/**
+	 * @param string $baseDir
+	 */
 	public function __construct(\SplObjectStorage $objectStorage, $data, $baseDir) {
 		$this->dataStorage = $objectStorage;
 		$this->data = $data;
@@ -74,6 +77,9 @@ 
 		return $obj;
 	}
 
+	/**
+	 * @param \Transphporm\Parser\Value $valueParser
+	 */
 	private function processNestedFunc($part, $obj, $valueParser, $element) {
 		if (strpos($part, '(') !== false) {
 			$subObjParser = new \Transphporm\Parser\Value($obj, $valueParser, false);

Braces +29 added lines, -11 removed lines

@@ -20,7 +20,9 @@ 
 	/** Binds data to an element */
 	public function bind(\DomElement $element, $data, $type = 'data') {
 		//This is a bit of a hack to workaround #24, might need a better way of doing this if it causes a problem
-		if (is_array($data) && $this->isObjectArray($data)) $data = $data[0];
+		if (is_array($data) && $this->isObjectArray($data)) {
+			$data = $data[0];
+		}
 		$content = isset($this->dataStorage[$element]) ? $this->dataStorage[$element] : [];
 		$content[$type] = $data;
 		$this->dataStorage[$element] = $content;
@@ -44,7 +46,9 @@ 
 	/** Returns the data that has been bound to $element, or, if no data is bound to $element climb the DOM tree to find the data bound to a parent node*/
 	private function getData(\DomElement $element = null, $type = 'data') {
 		while ($element) {
-			if (isset($this->dataStorage[$element]) && isset($this->dataStorage[$element][$type])) return $this->dataStorage[$element][$type];
+			if (isset($this->dataStorage[$element]) && isset($this->dataStorage[$element][$type])) {
+				return $this->dataStorage[$element][$type];
+			}
 			$element = $element->parentNode;
 		}
 		return $this->data;
@@ -63,13 +67,19 @@ 
 		$valueParser = new \Transphporm\Parser\Value($this);
 
 		foreach ($parts as $part) {
-			if ($part === '') continue;
+			if ($part === '') {
+				continue;
+			}
 			$part = $valueParser->parse($part, $element)[0];
 			$funcResult = $this->processNestedFunc($part, $obj, $valueParser, $element);
 			
-			if ($funcResult !== false) $obj = $funcResult;
-			else if (method_exists($obj, $part)) $obj = call_user_func([$obj, $part]); 
-			else $obj = $this->ifNull($obj, $part);
+			if ($funcResult !== false) {
+				$obj = $funcResult;
+			} else if (method_exists($obj, $part)) {
+				$obj = call_user_func([$obj, $part]);
+			} else {
+				$obj = $this->ifNull($obj, $part);
+			}
 		}
 		return $obj;
 	}
@@ -78,13 +88,17 @@ 
 		if (strpos($part, '(') !== false) {
 			$subObjParser = new \Transphporm\Parser\Value($obj, $valueParser, false);
 			return $subObjParser->parse($part, $element);
+		} else {
+			return false;
 		}
-		else return false;
 	}
 
 	private function ifNull($obj, $key) {
-		if (is_array($obj)) return isset($obj[$key]) ? $obj[$key] : null;
-		else return isset($obj->$key) ? $obj->$key : null;
+		if (is_array($obj)) {
+			return isset($obj[$key]) ? $obj[$key] : null;
+		} else {
+			return isset($obj->$key) ? $obj->$key : null;
+		}
 	}
 
 	public function attr($val, $element) {
@@ -109,14 +123,18 @@ 
 
 		$doc = $newTemplate->output([], true)->body;
 
-		if (isset($val[1])) return $this->templateSubsection($val[1], $doc, $element);
+		if (isset($val[1])) {
+			return $this->templateSubsection($val[1], $doc, $element);
+		}
 		
 		$newNode = $element->ownerDocument->importNode($doc->documentElement, true);
 
 		$result = [];
 
 		if ($newNode->tagName === 'template') {
-			foreach ($newNode->childNodes as $node) $result[] = $node->cloneNode(true);
+			foreach ($newNode->childNodes as $node) {
+				$result[] = $node->cloneNode(true);
+			}
 		}		
 		//else $result[] = $newNode;
 

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, $params);
+		if (isset($obj->$func) && is_callable($obj->$func)) {
+			return call_user_func_array($obj->$func, $params);
+		} else {
+			return call_user_func_array($obj, $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;
 			}
 		}