Level-2 / Transphporm

src/Parser/ValueResult.php

Braces +5 added lines, -4 removed lines

@@ -31,10 +31,11 @@
 		];
 
 		if ($funcs[$this->mode] === 'concat' && is_numeric($newValue)
-			&& is_numeric($this->result[count($this->result)-1]))
-			$this->add($newValue);
-		else
-			$this->{$funcs[$this->mode]}($newValue);
+			&& is_numeric($this->result[count($this->result)-1])) {
+					$this->add($newValue);
+		} else {
+					$this->{$funcs[$this->mode]}($newValue);
+		}
 	}
 
 	public function arg($value) {

Doc Comments +4 added lines

@@ -91,6 +91,10 @@
 	}
 
 	//Postprocessing - replace values with null where allowed, or override a value at position
+
+	/**
+	 * @param boolean $allowNull
+	 */
 	public function postProcess(ValueData $data, $val, $overrideVal, $allowNull) {
 		foreach ($this->getResult() as $i => $value) {
 			if (is_scalar($value)) {

src/Formatter/HTMLFormatter.php

Doc Comments +3 added lines

@@ -7,6 +7,9 @@
         $this->templateFunction = $templateFunction;
     }
 
+    /**
+     * @param string $val
+     */
     public function html($val) {
 		return $this->templateFunction->run(['<template>' . $val . '</template>']);
 	}

Indentation +5 added lines, -5 removed lines

@@ -1,13 +1,13 @@
 <?php
 namespace Transphporm\Formatter;
 class HTMLFormatter {
-    private $templateFunction;
+	private $templateFunction;
 
-    public function __construct(\Transphporm\TSSFunction\Template $templateFunction) {
-        $this->templateFunction = $templateFunction;
-    }
+	public function __construct(\Transphporm\TSSFunction\Template $templateFunction) {
+		$this->templateFunction = $templateFunction;
+	}
 
-    public function html($val) {
+	public function html($val) {
 		return $this->templateFunction->run(['<template>' . $val . '</template>']);
 	}
 

Spacing +2 added lines, -2 removed lines

@@ -8,12 +8,12 @@
     }
 
     public function html($val) {
-		return $this->templateFunction->run(['<template>' . $val . '</template>']);
+		return $this->templateFunction->run(['<template>'.$val.'</template>']);
 	}
 
 	public function debug($val) {
 		ob_start();
 		var_dump($val);
-		return $this->html('<pre>' . ob_get_clean() . '</pre>');
+		return $this->html('<pre>'.ob_get_clean().'</pre>');
 	}
 }

src/Property/Content.php

Doc Comments +16 added lines

@@ -28,6 +28,9 @@ 
 		}
 	}
 
+	/**
+	 * @param \DOMElement $element
+	 */
 	private function shouldRun($element) {
 		do {
 			if ($element->getAttribute('transphporm') == 'includedtemplate') return false;
@@ -40,6 +43,10 @@ 
 		return (isset($rules['content-mode'])) ? $rules['content-mode']->read() : '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 +108,9 @@ 
 		}
 	}
 
+	/**
+	 * @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.
 		foreach ($this->getNode($content, $element->ownerDocument) as $node) {
@@ -109,12 +119,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 +22 added lines, -11 removed lines

@@ -15,7 +15,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);
 
@@ -23,14 +25,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;
@@ -54,9 +61,10 @@ 
 	private 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);
 			}
 		}
@@ -67,9 +75,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));
@@ -116,6 +125,8 @@ 
 	}
 
 	private function removeAllChildren($element) {
-		while ($element->hasChildNodes()) $element->removeChild($element->firstChild);
+		while ($element->hasChildNodes()) {
+			$element->removeChild($element->firstChild);
+		}
 	}
 }

src/Module/Format.php

Spacing +2 added lines, -2 removed lines

@@ -15,8 +15,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\Config $config) {

Braces +7 added lines, -3 removed lines

@@ -14,9 +14,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\Config $config) {

src/Pseudo/Attribute.php

Braces +3 added lines, -1 removed lines

@@ -7,7 +7,9 @@
 namespace Transphporm\Pseudo;
 class Attribute implements \Transphporm\Pseudo {
 	public function match($name, $args, \DomElement $element) {
-		if (!($name === null || in_array($name, ['data', 'iteration', 'root'])))  return true;
+		if (!($name === null || in_array($name, ['data', 'iteration', 'root']))) {
+			return true;
+		}
 		return $args[0];
 	}
 }

src/Cache.php

Braces +2 added lines, -1 removed lines

@@ -21,7 +21,8 @@
 		$key = md5($key);
 		if (isset($this->cache[$key]) && $this->cache[$key]['timestamp'] >= $modified) {
 			return $this->cache[$key]['content'];
+		} else {
+			return false;
 		}
-		else return false;
 	}
 }
\ No newline at end of file

src/Hook/Formatter.php

Braces +7 added lines, -4 removed lines

@@ -14,7 +14,9 @@ 
 	}
 
 	public function format($value, $rules) {
-		if (!isset($rules['format'])) return $value;
+		if (!isset($rules['format'])) {
+			return $value;
+		}
 		$tokens = $rules['format'];
 
 		$functionName = $tokens->from(\Transphporm\Parser\Tokenizer::NAME, true)->read();
@@ -27,15 +29,16 @@ 
 
 		try {
 			return $this->processFormat($options, $functionName, $value);
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 			throw new \Transphporm\RunException(\Transphporm\Exception::FORMATTER, $functionName, $e);
 		}
 	}
 
 	//TODO: Abstract all error reporting externally with a method for turning it on/off
 	private function assert($condition, $error) {
-		if (!$condition) throw new \Exception($error);
+		if (!$condition) {
+			throw new \Exception($error);
+		}
 	}
 
 	private function processFormat($format, $functionName, $value) {

src/Template.php

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];
@@ -88,7 +88,7 @@ 
 		 //Either return a whole DomDocument or return the output HTML
 		if ($document) return $this->document;
 
-		$output = ($this->document->doctype) ? call_user_func($this->save, $this->document->doctype) . "\n" : '';
+		$output = ($this->document->doctype) ? call_user_func($this->save, $this->document->doctype)."\n" : '';
 
 		if ($this->document->documentElement->tagName !== 'template') $output .= call_user_func($this->save, $this->document->documentElement);
 		else $output = $this->printDocument();

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,12 +90,17 @@ 
 		//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;
+		}
 
 		$output = ($this->document->doctype) ? call_user_func($this->save, $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);

src/Pseudo/Nth.php

Braces +12 added lines, -4 removed lines

@@ -11,25 +11,33 @@
 	private $lastParentNode;
 
 	public function match($name, $args, \DomElement $element) {
-		if ($element->parentNode !== $this->lastParentNode) $this->count = 0;
+		if ($element->parentNode !== $this->lastParentNode) {
+			$this->count = 0;
+		}
 
 		$this->lastParentNode = $element->parentNode;
 
 
 
-		if ($name !== 'nth-child') return true;
+		if ($name !== 'nth-child') {
+			return true;
+		}
 
 		$this->count++;
 		$criteria = $args[0];
 
-		if (is_callable([$this, $criteria])) return $this->$criteria($this->count);
+		if (is_callable([$this, $criteria])) {
+			return $this->$criteria($this->count);
+		}
 		$this->assert(is_numeric($criteria), "Argument passed to 'nth-child' must be 'odd', 'even', or of type int");
 		return $this->count == $criteria;
 	}
 
 	//TODO: Abstract assertions throughout
 	private function assert($condition, $error) {
-		if (!$condition) throw new \Exception($error);
+		if (!$condition) {
+			throw new \Exception($error);
+		}
 	}
 
 	private function odd($num) {