Level-2 / Transphporm

src/Parser/Value.php

Indentation +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
 		}
 		else $parsedVal = null;
         
-        $this->result->postProcess($this->data, $val, $parsedVal, $this->allowNullResult);
+		$this->result->postProcess($this->data, $val, $parsedVal, $this->allowNullResult);
 
 		$this->last->clear();
 	}

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
 		if ($lastResult) {
 			$this->last->makeTraversing();
 		}
-		else if ($this->last->isEmpty())  {
+		else if ($this->last->isEmpty()) {
 			$this->processString(['value' => '.']);
 			$this->result->setMode(Tokenizer::CONCAT);
 		}

Braces +11 added lines, -9 removed lines

@@ -56,7 +56,9 @@ 
 		$this->last = new Last($this->data, $this->result, $this->autoLookup);
 		$this->traversing = false;
 
-		if (count($tokens) <= 0) return [$data];
+		if (count($tokens) <= 0) {
+			return [$data];
+		}
 
 		foreach (new TokenFilterIterator($tokens, [Tokenizer::WHITESPACE, Tokenizer::NEW_LINE]) as $token) {
 			$this->{$this->tokenFuncs[$token['type']]}($token);
@@ -84,8 +86,7 @@ 
 		// foo.bar is treated as looking up `bar` in `foo` whereas .foo is treated as the string ".foo"
 		if ($lastResult) {
 			$this->last->makeTraversing();
-		}
-		else if ($this->last->isEmpty())  {
+		} else if ($this->last->isEmpty())  {
 			$this->processString(['value' => '.']);
 			$this->result->setMode(Tokenizer::CONCAT);
 		}
@@ -100,11 +101,12 @@ 
 	private function processSquareBracket($token) {
 		if ($this->hasFunction($this->last->read())) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
+		} else {
 			$this->last->traverse();
 			$this->last->set($this->getNewParser()->parseTokens($token['value'], null)[0]);
-			if (!is_bool($this->last->read())) $this->last->makeTraversing();
+			if (!is_bool($this->last->read())) {
+				$this->last->makeTraversing();
+			}
 		}
 	}
 
@@ -127,8 +129,7 @@ 
 		if ($this->hasFunction($this->last->read())
 			&& !$this->data->methodExists($this->last->read())) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
+		} else {
 			$this->last->processNested($this->getNewParser(), $token);
 		}
 	}
@@ -145,8 +146,9 @@ 
 			$parser = new Value($this->data->getData());
 			$parsedArr = $parser->parse($val);
 			$parsedVal = isset($parsedArr[0]) ? $parsedArr[0] : null;
+		} else {
+			$parsedVal = null;
 		}
-		else $parsedVal = null;
         
         $this->result->postProcess($this->data, $val, $parsedVal, $this->allowNullResult);
 

src/Property/ContentPseudo.php

Indentation +1 added lines, -1 removed lines

@@ -2,5 +2,5 @@
 namespace Transphporm\Property;
 
 interface ContentPseudo {
-    public function run($value, $pseudoArgs, $element);
+	public function run($value, $pseudoArgs, $element);
 }

src/Property/Content.php

Indentation +3 added lines, -3 removed lines

@@ -39,9 +39,9 @@
 		return (isset($rules['content-mode'])) ? $rules['content-mode']->read() : 'append';
 	}
 
-    public function addContentPseudo($name, ContentPseudo $contentPseudo) {
-        $this->contentPseudo[$name] = $contentPseudo;
-    }
+	public function addContentPseudo($name, ContentPseudo $contentPseudo) {
+		$this->contentPseudo[$name] = $contentPseudo;
+	}
     
 	private function processPseudo($value, $element, $pseudoMatcher) {
 		foreach ($this->contentPseudo as $pseudoName => $pseudoFunction) {

Braces +22 added lines, -11 removed lines

@@ -14,7 +14,9 @@ 
 	}
 
 	public function run(array $values, \DomElement $element, array $rules, \Transphporm\Hook\PseudoMatcher $pseudoMatcher, array $properties = []) {
-		if (!$this->shouldRun($element)) return false;
+		if (!$this->shouldRun($element)) {
+			return false;
+		}
 
 		$values = $this->formatter->format($values, $rules);
 
@@ -22,14 +24,19 @@ 
 			//Remove the current contents
 			$this->removeAllChildren($element);
 			//Now make a text node
-			if ($this->getContentMode($rules) === 'replace') $this->replaceContent($element, $values);
-			else $this->appendContent($element, $values);
+			if ($this->getContentMode($rules) === 'replace') {
+				$this->replaceContent($element, $values);
+			} else {
+				$this->appendContent($element, $values);
+			}
 		}
 	}
 
 	private function shouldRun($element) {
 		do {
-			if ($element->getAttribute('transphporm') == 'includedtemplate') return false;
+			if ($element->getAttribute('transphporm') == 'includedtemplate') {
+				return false;
+			}
 		}
 		while (($element = $element->parentNode) instanceof \DomElement);
 		return true;
@@ -56,9 +63,10 @@ 
 	public function getNode($node, $document) {
 		foreach ($node as $n) {
 			if (is_array($n)) {
-				foreach ($this->getNode($n, $document) as $new) yield $new;
-			}
-			else {
+				foreach ($this->getNode($n, $document) as $new) {
+					yield $new;
+				}
+			} else {
 				yield $this->convertNode($n, $document);
 			}
 		}
@@ -69,9 +77,10 @@ 
 			$new = $document->importNode($node, true);
 			//Removing this might cause problems with caching...
 			//$new->setAttribute('transphporm', 'added');
-		}
-		else {
-			if ($node instanceof \DomText) $node = $node->nodeValue;
+		} else {
+			if ($node instanceof \DomText) {
+				$node = $node->nodeValue;
+			}
 			$new = $document->createElement('text');
 
 			$new->appendChild($document->createTextNode($node));
@@ -95,6 +104,8 @@ 
 	}
 
 	private function removeAllChildren($element) {
-		while ($element->hasChildNodes()) $element->removeChild($element->firstChild);
+		while ($element->hasChildNodes()) {
+			$element->removeChild($element->firstChild);
+		}
 	}
 }

src/Property/ContentPseudo/Attr.php

Indentation +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@
 <?php
 namespace Transphporm\Property\ContentPseudo;
 class Attr implements \Transphporm\Property\ContentPseudo {
-    public function run($value, $pseudoArgs, $element) {
-        $element->setAttribute($pseudoArgs, implode('', $value));
-    }
+	public function run($value, $pseudoArgs, $element) {
+		$element->setAttribute($pseudoArgs, implode('', $value));
+	}
 }

src/Property/ContentPseudo/BeforeAfter.php

Indentation +8 added lines, -8 removed lines

@@ -1,18 +1,18 @@
 <?php
 namespace Transphporm\Property\ContentPseudo;
 class BeforeAfter implements \Transphporm\Property\ContentPseudo {
-    private $insertLocation;
-    private $content;
+	private $insertLocation;
+	private $content;
 
-    public function __construct($insertLocation, \Transphporm\Property\Content $content) {
-        $this->insertLocation = $insertLocation;
+	public function __construct($insertLocation, \Transphporm\Property\Content $content) {
+		$this->insertLocation = $insertLocation;
 		$this->content = $content;
 	}
 
-    public function run($value, $pseudoArgs, $element) {
-        foreach ($this->content->getNode($value, $element->ownerDocument) as $node) {
+	public function run($value, $pseudoArgs, $element) {
+		foreach ($this->content->getNode($value, $element->ownerDocument) as $node) {
 			if ($this->insertLocation === "before") $element->insertBefore($node, $element->firstChild);
-            else if ($this->insertLocation === "after") $element->appendChild($node);
+			else if ($this->insertLocation === "after") $element->appendChild($node);
 		}
-    }
+	}
 }

Braces +5 added lines, -2 removed lines

@@ -11,8 +11,11 @@
 
     public function run($value, $pseudoArgs, $element) {
         foreach ($this->content->getNode($value, $element->ownerDocument) as $node) {
-			if ($this->insertLocation === "before") $element->insertBefore($node, $element->firstChild);
-            else if ($this->insertLocation === "after") $element->appendChild($node);
+			if ($this->insertLocation === "before") {
+				$element->insertBefore($node, $element->firstChild);
+			} else if ($this->insertLocation === "after") {
+            	$element->appendChild($node);
+            }
 		}
     }
 }

src/Property/ContentPseudo/Headers.php

Indentation +5 added lines, -5 removed lines

@@ -1,13 +1,13 @@
 <?php
 namespace Transphporm\Property\ContentPseudo;
 class Headers implements \Transphporm\Property\ContentPseudo {
-    private $headers;
+	private $headers;
 
-    public function __construct(&$headers) {
+	public function __construct(&$headers) {
 		$this->headers = &$headers;
 	}
 
-    public function run($value, $pseudoArgs, $element) {
-        $this->headers[] = [$pseudoArgs, implode('', $value)];
-    }
+	public function run($value, $pseudoArgs, $element) {
+		$this->headers[] = [$pseudoArgs, implode('', $value)];
+	}
 }

src/Module/Basics.php

Indentation +5 added lines, -5 removed lines

@@ -13,15 +13,15 @@
 		$data = $config->getFunctionSet();
 		$headers = &$config->getHeaders();
 
-        $content = new \Transphporm\Property\Content($config->getFormatter());
+		$content = new \Transphporm\Property\Content($config->getFormatter());
 		$config->registerProperty('content', $content);
 		$config->registerProperty('repeat', new \Transphporm\Property\Repeat($data, $config->getElementData(), $config->getLine(), $config->getFilePath()));
 		$config->registerProperty('display', new \Transphporm\Property\Display);
 		$config->registerProperty('bind', new \Transphporm\Property\Bind($config->getElementData()));
 
-        $content->addContentPseudo("before", new \Transphporm\Property\ContentPseudo\BeforeAfter("before", $content));
-        $content->addContentPseudo("after", new \Transphporm\Property\ContentPseudo\BeforeAfter("after", $content));
-        $content->addContentPseudo("attr", new \Transphporm\Property\ContentPseudo\Attr());
-        $content->addContentPseudo("header", new \Transphporm\Property\ContentPseudo\Headers($headers));
+		$content->addContentPseudo("before", new \Transphporm\Property\ContentPseudo\BeforeAfter("before", $content));
+		$content->addContentPseudo("after", new \Transphporm\Property\ContentPseudo\BeforeAfter("after", $content));
+		$content->addContentPseudo("attr", new \Transphporm\Property\ContentPseudo\Attr());
+		$content->addContentPseudo("header", new \Transphporm\Property\ContentPseudo\Headers($headers));
 	}
 }

src/Config.php

Braces +9 added lines, -3 removed lines

@@ -68,7 +68,9 @@ 
 	}
 
     public function registerContentPseudo($name, Property\ContentPseudo $pseudo) {
-        if (isset($this->properties['content'])) $this->properties['content']->addContentPseudo($name, $pseudo);
+        if (isset($this->properties['content'])) {
+        	$this->properties['content']->addContentPseudo($name, $pseudo);
+        }
     }
 
 	public function registerPseudo(Pseudo $pseudo) {
@@ -76,12 +78,16 @@ 
 	}
 
 	public function loadProperties(Hook\PropertyHook $hook) {
-		foreach ($this->properties as $name => $property) $hook->registerProperty($name, $property);
+		foreach ($this->properties as $name => $property) {
+			$hook->registerProperty($name, $property);
+		}
 	}
 
 	public function createPseudoMatcher($pseudo) {
 		$pseudoMatcher = new Hook\PseudoMatcher($pseudo, $this->valueParser);
-		foreach ($this->pseudo as $pseudoFunction) $pseudoMatcher->registerFunction(clone $pseudoFunction);
+		foreach ($this->pseudo as $pseudoFunction) {
+			$pseudoMatcher->registerFunction(clone $pseudoFunction);
+		}
 		return $pseudoMatcher;
 	}
 

Indentation +4 added lines, -4 removed lines

@@ -40,7 +40,7 @@ 
 	}
 
 	public function &getLine() {
-        $line = &$this->line;
+		$line = &$this->line;
 		return $line;
 	}
 
@@ -68,9 +68,9 @@ 
 		$this->properties[$name] = $property;
 	}
 
-    public function registerContentPseudo($name, Property\ContentPseudo $pseudo) {
-        if (isset($this->properties['content'])) $this->properties['content']->addContentPseudo($name, $pseudo);
-    }
+	public function registerContentPseudo($name, Property\ContentPseudo $pseudo) {
+		if (isset($this->properties['content'])) $this->properties['content']->addContentPseudo($name, $pseudo);
+	}
 
 	public function registerPseudo(Pseudo $pseudo) {
 		$this->pseudo[] = $pseudo;

src/Template.php

Braces +14 added lines, -5 removed lines

@@ -66,7 +66,9 @@ 
 	/** Loops through all assigned hooks, runs the Xpath query and calls the hook */
 	private function processHooks() {
 		foreach ($this->hooks as list($query, $hook)) {
-			foreach ($this->xpath->query($query) as $element) $hook->run($element);
+			foreach ($this->xpath->query($query) as $element) {
+				$hook->run($element);
+			}
 		}
 		$this->hooks = [];
 	}
@@ -74,7 +76,9 @@ 
 	/** Prints out the current DomDocument as HTML */
 	private function printDocument() {
 		$output = '';
-		foreach ($this->document->documentElement->childNodes as $node) $output .= call_user_func($this->save, $node);
+		foreach ($this->document->documentElement->childNodes as $node) {
+			$output .= call_user_func($this->save, $node);
+		}
 		return $output;
 	}
 
@@ -86,13 +90,18 @@ 
 		//Generate the document by taking only the childnodes of the template, ignoring the <template> and </template> tags
 		//TODO: Is there a faster way of doing this without string manipulation on the output or this loop through childnodes?
 		 //Either return a whole DomDocument or return the output HTML
-		if ($document) return $this->document;
+		if ($document) {
+			return $this->document;
+		}
 
 		//Print the doctype... saveHtml inexplicably does not support $doc->doctype as an argument
 		$output = ($this->document->doctype) ? $this->document->saveXml($this->document->doctype) . "\n" : '';
 
-		if ($this->document->documentElement->tagName !== 'template') $output .= call_user_func($this->save, $this->document->documentElement);
-		else $output = $this->printDocument();
+		if ($this->document->documentElement->tagName !== 'template') {
+			$output .= call_user_func($this->save, $this->document->documentElement);
+		} else {
+			$output = $this->printDocument();
+		}
 
 		//repair empty tags. Browsers break on <script /> and <div /> so can't avoid LIBXML_NOEMPTYTAG but they also break on <base></base> so repair them
 		$output = str_replace(['></img>', '></br>', '></meta>', '></base>', '></link>', '></hr>', '></input>'], ' />', $output);

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
 				$this->save = function($content = null) {
 					return $this->document->saveHtml($content);
 				};
-				$this->document->loadHtml('<' . '?xml encoding="UTF-8">' . $doc,  LIBXML_HTML_NODEFDTD | LIBXML_HTML_NOIMPLIED);
+				$this->document->loadHtml('<'.'?xml encoding="UTF-8">'.$doc, LIBXML_HTML_NODEFDTD | LIBXML_HTML_NOIMPLIED);
 
 				if (strpos($doc, '<!') !== 0) {
 					$templateNode = $this->document->getElementsByTagName('template')[0];
@@ -89,7 +89,7 @@ 
 		if ($document) return $this->document;
 
 		//Print the doctype... saveHtml inexplicably does not support $doc->doctype as an argument
-		$output = ($this->document->doctype) ? $this->document->saveXml($this->document->doctype) . "\n" : '';
+		$output = ($this->document->doctype) ? $this->document->saveXml($this->document->doctype)."\n" : '';
 
 		if ($this->document->documentElement->tagName !== 'template') $output .= call_user_func($this->save, $this->document->documentElement);
 		else $output = $this->printDocument();