Level-2 / Transphporm

src/Parser/StringExtractor.php

Braces +6 added lines, -2 removed lines

@@ -21,7 +21,9 @@ 
 		$strings = [];
 		while (isset($str[$pos]) && ($pos = strpos($str, '"', $pos)) !== false) {
 			$end = strpos($str, '"', $pos+1);
-			if (!$end) break;
+			if (!$end) {
+				break;
+			}
 			$end = $this->getNextPosEscaped($str, '\\', '"', $end);
 			$strings['$___STR' . ++$num] = substr($str, $pos, $end-$pos+1);
 			$str = substr_replace($str, '$___STR' . $num, $pos, $end-$pos+1);
@@ -31,7 +33,9 @@ 
 	}
 
 	private function getNextPosEscaped($str, $escape, $chr, $start) {
-		while ($str[$start-1] == $escape) $start = strpos($str, $chr, $start+1);
+		while ($str[$start-1] == $escape) {
+			$start = strpos($str, $chr, $start+1);
+		}
 		return $start;
 	}
 

src/Property/Content.php

Braces +24 added lines, -10 removed lines

@@ -18,23 +18,32 @@ 
 	}
 
 	public function run($value, \DomElement $element, array $rules, \Transphporm\Hook\PseudoMatcher $pseudoMatcher, array $properties = []) {
-		if ($this->shouldRun($element) == false) return;
+		if ($this->shouldRun($element) == false) {
+			return;
+		}
 			
 		$value = $this->formatter->format($value, $rules);
 		if (!$this->processPseudo($value, $element, $pseudoMatcher)) {
 			//Remove the current contents
 			$this->removeAllChildren($element);
 			//Now make a text node
-			if ($this->getContentMode($rules) === 'replace') $this->replaceContent($element, $value);
-			else $this->appendContent($element, $value);
+			if ($this->getContentMode($rules) === 'replace') {
+				$this->replaceContent($element, $value);
+			} else {
+				$this->appendContent($element, $value);
+			}
 		}
 	}
 
 	private function shouldRun($element) {
-		if ($element->getAttribute('transphporm') === 'remove') return false;
+		if ($element->getAttribute('transphporm') === 'remove') {
+			return false;
+		}
 
 		while (!($element instanceof \DomDocument) && $element->parentNode) {
-			if ($element->getAttribute('transphporm') == 'includedtemplate') return false;
+			if ($element->getAttribute('transphporm') == 'includedtemplate') {
+				return false;
+			}
 			$element = $element->parentNode;
 		}
 
@@ -60,9 +69,10 @@ 
 			if ($n instanceof \DomElement) {
 				$new = $document->importNode($n, true);
 				$new->setAttribute('transphporm', 'added');
-			}
-			else {
-				if ($n instanceof \DomText) $n = $n->nodeValue;
+			} else {
+				if ($n instanceof \DomText) {
+					$n = $n->nodeValue;
+				}
 				$new = $document->createElement('text');
 				$new->appendChild($document->createTextNode($n));
 				$new->setAttribute('transphporm', 'text');
@@ -98,7 +108,9 @@ 
 		while ($e = $e->previousSibling && !in_array($e->getAttribute('transphporm'), [null, 'remove'])) {
 			$remove[] = $e;
 		}
-		foreach ($remove as $r) $r->parentNode->removeChild($r);
+		foreach ($remove as $r) {
+			$r->parentNode->removeChild($r);
+		}
 	}
 
 	private function replaceContent($element, $content) {
@@ -117,6 +129,8 @@ 
 	}
 	
 	private function removeAllChildren($element) {
-		while ($element->hasChildNodes()) $element->removeChild($element->firstChild);
+		while ($element->hasChildNodes()) {
+			$element->removeChild($element->firstChild);
+		}
 	}
 }
\ No newline at end of file

src/Hook/DataFunction.php

Braces +29 added lines, -12 removed lines

@@ -21,7 +21,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;
@@ -45,7 +47,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;
@@ -64,13 +68,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;
 	}
@@ -79,14 +87,19 @@ 
 		if (strpos($part, '(') !== false) {
 			$subObjParser = new \Transphporm\Parser\Value($obj, $valueParser, false);
 			return $subObjParser->parse($part, $element);
+		} 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) {
@@ -112,7 +125,9 @@ 
 
 		$doc = $newTemplate->output($data, 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);
 	//	$this->bind($newNode, $data);
@@ -121,7 +136,9 @@ 
 		if ($newNode->tagName === 'template') {
 			foreach ($newNode->childNodes as $node) {
 				$clone = $node->cloneNode(true);
-				if ($clone instanceof \DomElement) $clone->setAttribute('transphporm', 'includedtemplate');
+				if ($clone instanceof \DomElement) {
+					$clone->setAttribute('transphporm', 'includedtemplate');
+				}
 				$result[] = $clone;
 			}
 		}