Level-2 / Transphporm

src/FilePath.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@
     }
 
     public function getFilePath($filePath = "") {
-		if (isset($filePath[0]) && $filePath[0] == "/") return $this->customBase . $filePath;
-		else return $this->baseDir . $filePath;
+		if (isset($filePath[0]) && $filePath[0] == "/") return $this->customBase.$filePath;
+		else return $this->baseDir.$filePath;
 	}
 }

Braces +10 added lines, -4 removed lines

@@ -7,12 +7,18 @@
 
     public function __construct(&$baseDir, $customBase = null) {
         $this->baseDir = &$baseDir;
-        if ($customBase === null) $this->customBase = getcwd();
-        else $this->customBase = rtrim($customBase, '/');
+        if ($customBase === null) {
+        	$this->customBase = getcwd();
+        } else {
+        	$this->customBase = rtrim($customBase, '/');
+        }
     }
 
     public function getFilePath($filePath = "") {
-		if (isset($filePath[0]) && $filePath[0] == "/") return $this->customBase . $filePath;
-		else return $this->baseDir . $filePath;
+		if (isset($filePath[0]) && $filePath[0] == "/") {
+			return $this->customBase . $filePath;
+		} else {
+			return $this->baseDir . $filePath;
+		}
 	}
 }

Indentation +8 added lines, -8 removed lines

@@ -2,16 +2,16 @@
 namespace Transphporm;
 
 class FilePath {
-    private $baseDir;
-    private $customBase;
+	private $baseDir;
+	private $customBase;
 
-    public function __construct(&$baseDir, $customBase = null) {
-        $this->baseDir = &$baseDir;
-        if ($customBase === null) $this->customBase = getcwd();
-        else $this->customBase = rtrim($customBase, '/');
-    }
+	public function __construct(&$baseDir, $customBase = null) {
+		$this->baseDir = &$baseDir;
+		if ($customBase === null) $this->customBase = getcwd();
+		else $this->customBase = rtrim($customBase, '/');
+	}
 
-    public function getFilePath($filePath = "") {
+	public function getFilePath($filePath = "") {
 		if (isset($filePath[0]) && $filePath[0] == "/") return $this->customBase . $filePath;
 		else return $this->baseDir . $filePath;
 	}

src/Property/Repeat.php

Doc Comments +12 added lines

@@ -10,6 +10,9 @@ 
 	private $elementData;
 	private $line;
 
+	/**
+	 * @param integer $line
+	 */
 	public function __construct(\Transphporm\FunctionSet $functionSet, \Transphporm\Hook\ElementData $elementData, &$line) {
 		$this->functionSet = $functionSet;
 		$this->elementData = $elementData;
@@ -58,6 +61,12 @@ 
 		return $value;
 	}
 
+	/**
+	 * @param \DOMElement $element
+	 * @param integer $count
+	 *
+	 * @return \DOMElement
+	 */
 	private function cloneElement($element, $iteration, $key, $count) {
 		$clone = $element->cloneNode(true);
 		$this->tagElement($clone, $count);
@@ -77,6 +86,9 @@ 
 		return isset($values[1]) ? $values[1] : PHP_INT_MAX;
 	}
 
+	/**
+	 * @param \Transphporm\Hook\PseudoMatcher $pseudoMatcher
+	 */
 	private function createHook($newRules, $pseudoMatcher, $properties) {
 		$var = ""; // PropertyHook requires that baseDir be passed by refrence
 		// and there is no reason to pass it so create $var to avoid errors

Braces +18 added lines, -7 removed lines

@@ -18,7 +18,9 @@ 
 
 	public function run(array $values, \DomElement $element, array $rules, \Transphporm\Hook\PseudoMatcher $pseudoMatcher, array $properties = []) {
 		$values = $this->fixEmpty($values);
-		if ($element->getAttribute('transphporm') === 'added') return $element->parentNode->removeChild($element);
+		if ($element->getAttribute('transphporm') === 'added') {
+			return $element->parentNode->removeChild($element);
+		}
 		$max = $this->getMax($values);
 		$count = 0;
 
@@ -29,7 +31,9 @@ 
 		$hook = $this->createHook($rules, $pseudoMatcher, $properties);
 
 		foreach ($repeat as $key => $iteration) {
-			if ($count+1 > $max) break;
+			if ($count+1 > $max) {
+				break;
+			}
 			$clone = $this->cloneElement($element, $iteration, $key, $count++);
 			//Re-run the hook on the new element, but use the iterated data
 			$hook->run($clone);
@@ -41,8 +45,9 @@ 
 
 	private function getRepeatValue($values, &$max) {
 		$mode = $this->getMode($values);
-		if ($mode === 'each') $repeat = $values[0];
-		else if ($mode === 'loop') {
+		if ($mode === 'each') {
+			$repeat = $values[0];
+		} else if ($mode === 'loop') {
 			$repeat = range($values[0], $max);
 			$max++;
 		}
@@ -54,7 +59,9 @@ 
 	}
 
 	private function fixEmpty($value) {
-		if (empty($value[0])) $value[0] = [];
+		if (empty($value[0])) {
+			$value[0] = [];
+		}
 		return $value;
 	}
 
@@ -70,7 +77,9 @@ 
 
 	private function tagElement($element, $count) {
 		//Mark all but one of the nodes as having been added by transphporm, when the hook is run again, these are removed
-		if ($count > 0) $element->setAttribute('transphporm', 'added');
+		if ($count > 0) {
+			$element->setAttribute('transphporm', 'added');
+		}
 	}
 
 	private function getMax($values) {
@@ -81,7 +90,9 @@ 
 		$var = ""; // PropertyHook requires that baseDir be passed by refrence
 		// and there is no reason to pass it so create $var to avoid errors
 		$hook = new \Transphporm\Hook\PropertyHook($newRules, $var, $this->line, "", $this->line, $pseudoMatcher, new \Transphporm\Parser\Value($this->functionSet), $this->functionSet);
-		foreach ($properties as $name => $property) $hook->registerProperty($name, $property);
+		foreach ($properties as $name => $property) {
+			$hook->registerProperty($name, $property);
+		}
 		return $hook;
 	}
 }

src/Parser/ValueData.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 
 	public function extract($last, $autoLookup, $traversing) {
 		$value = $this->read($last);
-		if ($value && ($autoLookup || $traversing) ) {
+		if ($value && ($autoLookup || $traversing)) {
 			return $value;
 		}
 		throw new \UnexpectedValueException('Not found');

Braces +22 added lines, -9 removed lines

@@ -14,8 +14,11 @@ 
 	}
 
 	public function traverse($key) {
-		if (isset($this->data->{$key})) $this->data = $this->data->{$key};
-		else if ($this->isArray() && isset($this->data[$key])) $this->data = $this->data[$key];
+		if (isset($this->data->{$key})) {
+			$this->data = $this->data->{$key};
+		} else if ($this->isArray() && isset($this->data[$key])) {
+			$this->data = $this->data[$key];
+		}
 	}
 
 	private function isArray() {
@@ -24,10 +27,14 @@ 
 
 	public function read($value) {
 		if ($this->isArray()) {
-			if (isset($this->data[$value])) return $this->data[$value];
+			if (isset($this->data[$value])) {
+				return $this->data[$value];
+			}
+		} else if (isset($this->data->$value)) {
+			return $this->data->$value;
+		} else {
+			return false;
 		}
-		else if (isset($this->data->$value)) return $this->data->$value;
-		else return false;
 	}
 
 	public function call($func, $args) {
@@ -40,14 +47,20 @@ 
 
 	public function parseNested($parser, $token, $funcName) {
 		$args = $parser->parseTokens($token['value'], $this->data);
-		if ($args[0] == $this->data) $args = [];
+		if ($args[0] == $this->data) {
+			$args = [];
+		}
 		return $this->callFuncOnObject($this->data, $funcName, $args);
 	}
 
 	private function callFuncOnObject($obj, $func, $args) {
-		if (isset($obj->$func) && is_callable($obj->$func)) return call_user_func_array($obj->$func, $args);
-		else if (is_callable([$obj, $func])) return call_user_func_array([$obj, $func], $args);
-		else return false;
+		if (isset($obj->$func) && is_callable($obj->$func)) {
+			return call_user_func_array($obj->$func, $args);
+		} else if (is_callable([$obj, $func])) {
+			return call_user_func_array([$obj, $func], $args);
+		} else {
+			return false;
+		}
 	}
 
 	public function extract($last, $autoLookup, $traversing) {

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

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