Level-2 / Transphporm

src/Hook/DataFunction.php

Doc Comments +13 added lines

@@ -11,6 +11,10 @@ 
 	private $data;
 	private $baseDir;
 
+	/**
+	 * @param string $baseDir
+	 * @param string $tss
+	 */
 	public function __construct(\SplObjectStorage $objectStorage, $data, $baseDir, $tss) {
 		$this->dataStorage = $objectStorage;
 		$this->data = $data;
@@ -79,6 +83,9 @@ 
 		return $obj;
 	}
 
+	/**
+	 * @param \Transphporm\Parser\Value $valueParser
+	 */
 	private function traverseObj($part, $obj, $valueParser, $element) {
 		if (strpos($part, '(') !== false) {
 			$subObjParser = new \Transphporm\Parser\Value($obj, $valueParser, false);
@@ -143,6 +150,9 @@ 
 		return $result;
 	}
 
+	/**
+	 * @param string $templateFile
+	 */
 	private function createDummyTemplateDoc(\DomElement $element, $templateFile) {		
 		$newDocument = new \DomDocument;
 		$root = $newDocument->createElement('template');
@@ -164,6 +174,9 @@ 
 		return $newDocument;
 	}
 
+	/**
+	 * @param \DOMNode $baseElement
+	 */
 	private function loadTemplate($baseElement, $templateFile) {
 		$baseElement->setAttribute('transphpormbaselement', 'true');
 		//Load the template XML

Spacing +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
 		else $tss = '';
 		//Create a document to mimic the structure of the parent template
 		
-		$newDocument = $this->createDummyTemplateDoc($element, $this->baseDir . $val[0]);		
+		$newDocument = $this->createDummyTemplateDoc($element, $this->baseDir.$val[0]);		
 
 		//Build a new template using the $newDocument
 		$newTemplate = new \Transphporm\Builder($newDocument->saveXml(), $tss);

Braces +40 added lines, -16 removed lines

@@ -25,7 +25,9 @@ 
 	/** Binds data to an element */
 	public function bind(\DomNode $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;
@@ -49,7 +51,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*/
 	public 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;
@@ -68,13 +72,17 @@ 
 		$valueParser = new \Transphporm\Parser\Value($this);
 
 		foreach ($parts as $part) {
-			if ($part === '') continue;
+			if ($part === '') {
+				continue;
+			}
 			$part = $valueParser->parse($part, $element)[0];
 			$funcResult = $this->traverseObj($part, $obj, $valueParser, $element);
 
-			if ($funcResult !== false) $obj = $funcResult;
-			
-			else $obj = $this->ifNull($obj, $part);
+			if ($funcResult !== false) {
+				$obj = $funcResult;
+			} else {
+				$obj = $this->ifNull($obj, $part);
+			}
 		}
 		return $obj;
 	}
@@ -83,14 +91,19 @@ 
 		if (strpos($part, '(') !== false) {
 			$subObjParser = new \Transphporm\Parser\Value($obj, $valueParser, false);
 			return $subObjParser->parse($part, $element)[0];
+		} else if (method_exists($obj, $part)) {
+			return call_user_func([$obj, $part]);
+		} else {
+			return false;
 		}
-		else if (method_exists($obj, $part)) return call_user_func([$obj, $part]); 
-		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) {
@@ -113,8 +126,11 @@ 
 
 	public function template($val, \DomElement $element, $rules) {
 		//Check the nesting level... without this it will keep applying TSS to included templates forever in some cases
-		if (isset($rules['template-recursion']) && $rules['template-recursion'] == 'on') $tss = $this->tss;
-		else $tss = '';
+		if (isset($rules['template-recursion']) && $rules['template-recursion'] == 'on') {
+			$tss = $this->tss;
+		} else {
+			$tss = '';
+		}
 		//Create a document to mimic the structure of the parent template
 		
 		$newDocument = $this->createDummyTemplateDoc($element, $this->baseDir . $val[0]);		
@@ -133,10 +149,14 @@ 
 		$result = [];
 		$xpath = new \DomXpath($doc);
 		$correspondingElement = $xpath->query('//*[@transphpormbaselement]')[0];
-		if (!$correspondingElement) $correspondingElement = $doc->documentElement;		
+		if (!$correspondingElement) {
+			$correspondingElement = $doc->documentElement;
+		}
 		foreach ($correspondingElement->childNodes as $child) {
 			$child = $child->cloneNode(true);
-			if ($child instanceof \DomElement) $child->setAttribute('transphporm', 'includedtemplate');
+			if ($child instanceof \DomElement) {
+				$child->setAttribute('transphporm', 'includedtemplate');
+			}
 
 			$result[] = $child;			
 		}		
@@ -155,8 +175,12 @@ 
 			$firstChild = $root->firstChild;
 			$el = $el->cloneNode();
 			$newNode = $newDocument->importNode($el);
-			if ($baseElement === null) $baseElement = $newNode;
-			if ($firstChild) $newNode->appendChild($firstChild);
+			if ($baseElement === null) {
+				$baseElement = $newNode;
+			}
+			if ($firstChild) {
+				$newNode->appendChild($firstChild);
+			}
 			$root->appendChild($newNode);
 		}
 		while (($el = $el->parentNode)  instanceof \DomElement);	

src/Parser/Value.php

Braces +33 added lines, -18 removed lines

@@ -33,8 +33,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, $rules = []) {
@@ -55,13 +56,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, $rules)) !== self::IS_NOT_FUNCTION) $result = $this->appendToArray($result, $data);
-			else $result[] = trim($function);
+			if (($data = $this->getFunctionValue($func['name'], $func['params'], $element, $rules)) !== self::IS_NOT_FUNCTION) {
+				$result = $this->appendToArray($result, $data);
+			} else {
+				$result[] = trim($function);
+			}
 		}
 		$remaining = trim(substr($function, $finalPos+1));
 		return $this->parseNextValue($remaining, $result, $element);
@@ -70,23 +73,27 @@ 
 	private function getFunctionValue($name, $params, $element, $rules) {
 		if (($data = $this->callFunc($name, $params, $element, $rules)) !== self::IS_NOT_FUNCTION) {
 			return $data;
-		}
-		else if ($this->parent != null && ($data = $this->parent->callFunc($name, $params, $element, $rules)) !== self::IS_NOT_FUNCTION) {
+		} else if ($this->parent != null && ($data = $this->parent->callFunc($name, $params, $element, $rules)) !== self::IS_NOT_FUNCTION) {
 			return $data;
+		} else {
+			return self::IS_NOT_FUNCTION;
 		}
-		else return self::IS_NOT_FUNCTION;
 	}
 
 	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, $rules) {
 		if ($name && $this->isCallable($this->dataFunction, $name)) {
-			if ($this->callParamsAsArray) return $this->dataFunction->$name($this->parse($params, $element), $element, $rules);	
-			else {
+			if ($this->callParamsAsArray) {
+				return $this->dataFunction->$name($this->parse($params, $element), $element, $rules);
+			} else {
 				return $this->callFuncOnObject($this->dataFunction, $name, $this->parse($params, $element));
 			}
 		}
@@ -103,14 +110,21 @@ 
 		foreach ($params as $param) {
 			$stringExtractor = new StringExtractor($param);
 			$parts = explode(',', $stringExtractor);
-			foreach ($parts as $part) $args[] = $stringExtractor->rebuild($part);
+			foreach ($parts as $part) {
+				$args[] = $stringExtractor->rebuild($part);
+			}
+		}
+		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);
 	}
 
 	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;
 	}
 	
@@ -118,8 +132,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;
 			}
 		}

src/Hook/PropertyHook.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 		if (!$this->pseudoMatcher->matches($element)) return;
 
 		foreach ($this->rules as $name => $value) {
-			$result = $this->callProperty($name, $element, $this->valueParser->parse(trim($value), $element,$this->rules)) ;
+			$result = $this->callProperty($name, $element, $this->valueParser->parse(trim($value), $element, $this->rules));
 			if ($result === false) break;
 		}
 	}