Level-2 / Transphporm

src/Parser/StringExtractor.php

Spacing +2 added lines, -2 removed lines

@@ -23,8 +23,8 @@
 			$end = strpos($str, '"', $pos+1);
 			if (!$end) break;
 			while ($str[$end-1] == '\\') $end = strpos($str, '"', $end+1);
-			$strings['$___STR' . ++$num] = substr($str, $pos, $end-$pos+1);
-			$str = substr_replace($str, '$___STR' . $num, $pos, $end-$pos+1);
+			$strings['$___STR'.++$num] = substr($str, $pos, $end-$pos+1);
+			$str = substr_replace($str, '$___STR'.$num, $pos, $end-$pos+1);
 		}
 
 		return [$str, $strings];

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/Module/Format.php

Spacing +2 added lines, -2 removed lines

@@ -14,8 +14,8 @@
 
 	private function getLocale() {
 		if (is_array($this->locale)) return $this->locale;
-		else if (strlen($this->locale) > 0) return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . $this->locale . '.json'), true);
-		else return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . 'enGB.json'), true);
+		else if (strlen($this->locale) > 0) return json_decode(file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'../Formatter'.DIRECTORY_SEPARATOR.'Locale'.DIRECTORY_SEPARATOR.$this->locale.'.json'), true);
+		else return json_decode(file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'../Formatter'.DIRECTORY_SEPARATOR.'Locale'.DIRECTORY_SEPARATOR.'enGB.json'), true);
 	}
 
 	public function load(\Transphporm\FeatureSet $featureSet) {

Braces +7 added lines, -3 removed lines

@@ -13,9 +13,13 @@
 	}
 
 	private function getLocale() {
-		if (is_array($this->locale)) return $this->locale;
-		else if (strlen($this->locale) > 0) return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . $this->locale . '.json'), true);
-		else return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . 'enGB.json'), true);
+		if (is_array($this->locale)) {
+			return $this->locale;
+		} else if (strlen($this->locale) > 0) {
+			return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . $this->locale . '.json'), true);
+		} else {
+			return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . 'enGB.json'), true);
+		}
 	}
 
 	public function load(\Transphporm\FeatureSet $featureSet) {

src/Property/Content.php

Doc Comments +19 added lines

@@ -11,6 +11,9 @@ 
 	private $formatter;
 
 
+	/**
+	 * @param \Transphporm\Hook\DataFunction $data
+	 */
 	public function __construct($data, &$headers, \Transphporm\Hook\Formatter $formatter) {
 		$this->data = $data;
 		$this->headers = &$headers;
@@ -30,6 +33,9 @@ 
 		}
 	}
 
+	/**
+	 * @param \DOMElement $element
+	 */
 	private function shouldRun($element) {
 		if ($element->getAttribute('transphporm') === 'remove') return false;
 
@@ -44,6 +50,10 @@ 
 		return (isset($rules['content-mode'])) ? $rules['content-mode'] : 'append';
 	}
 
+	/**
+	 * @param \DOMElement $element
+	 * @param \Transphporm\Hook\PseudoMatcher $pseudoMatcher
+	 */
 	private function processPseudo($value, $element, $pseudoMatcher) {
 		$pseudoContent = ['attr', 'header', 'before', 'after'];
 		foreach ($pseudoContent as $pseudo) {
@@ -101,6 +111,9 @@ 
 		foreach ($remove as $r) $r->parentNode->removeChild($r);
 	}
 
+	/**
+	 * @param \DOMElement $element
+	 */
 	private function replaceContent($element, $content) {
 		//If this rule was cached, the elements that were added last time need to be removed prior to running the rule again.
 		$this->removeAdded($element);
@@ -110,12 +123,18 @@ 
 		$element->setAttribute('transphporm', 'remove');
 	}
 
+	/**
+	 * @param \DOMElement $element
+	 */
 	private function appendContent($element, $content) {
 		foreach ($this->getNode($content, $element->ownerDocument) as $node) {
 			$element->appendChild($node);
 		}
 	}
 	
+	/**
+	 * @param \DOMElement $element
+	 */
 	private function removeAllChildren($element) {
 		while ($element->hasChildNodes()) $element->removeChild($element->firstChild);
 	}

Braces +27 added lines, -11 removed lines

@@ -18,23 +18,34 @@ 
 	}
 
 	public function run($value, \DomElement $element, array $rules, \Transphporm\Hook\PseudoMatcher $pseudoMatcher, array $properties = []) {
-		if ($this->isIncludedTemplate($element)) return;
-		if ($element->getAttribute('transphporm') === 'remove') return;
+		if ($this->isIncludedTemplate($element)) {
+			return;
+		}
+		if ($element->getAttribute('transphporm') === 'remove') {
+			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 isIncludedTemplate($element) {
 		do {
-			if ($element instanceof \DomDocument) return false;
-			if ($element->getAttribute('transphporm') == 'includedtemplate') return true;
+			if ($element instanceof \DomDocument) {
+				return false;
+			}
+			if ($element->getAttribute('transphporm') == 'includedtemplate') {
+				return true;
+			}
 		}
 		while ($element = $element->parentNode);
 		return false;
@@ -60,9 +71,10 @@ 
 				$new = $document->importNode($n, true);
 				//Removing this might cause problems with caching... 
 				//$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 +110,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 +131,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

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);