Level-2 / Transphporm

src/TSSCache.php

Indentation +13 added lines, -13 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 namespace Transphporm;
 class TSSCache {
-    private $cache;
-    private $prefix;
+	private $cache;
+	private $prefix;
 
-    public function __construct(Cache $cache, $prefix) {
-        $this->cache = $cache;
-        $this->prefix = $prefix;
-    }
+	public function __construct(Cache $cache, $prefix) {
+		$this->cache = $cache;
+		$this->prefix = $prefix;
+	}
 
 	private function getRulesFromCache($file) {
 		//The cache for the key: the filename and template prefix
@@ -28,12 +28,12 @@ 
 		return $file . $this->prefix . dirname(realpath($file)) . DIRECTORY_SEPARATOR;
 	}
 
-    public function load($tss) {
-        return $this->getRulesFromCache($tss);
-    }
+	public function load($tss) {
+		return $this->getRulesFromCache($tss);
+	}
 
-    public function write($file, $rules, $imports = []) {
-        if (is_file($file)) $this->cache->write($this->getCacheKey($file), ['rules' => $rules, 'import' => $imports]);
-        return $rules;
-    }
+	public function write($file, $rules, $imports = []) {
+		if (is_file($file)) $this->cache->write($this->getCacheKey($file), ['rules' => $rules, 'import' => $imports]);
+		return $rules;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 	}
 
 	private function getCacheKey($file) {
-		return $file . $this->prefix . dirname(realpath($file)) . DIRECTORY_SEPARATOR;
+		return $file.$this->prefix.dirname(realpath($file)).DIRECTORY_SEPARATOR;
 	}
 
     public function load($tss) {

Braces +6 added lines, -2 removed lines

@@ -18,7 +18,9 @@ 
 		$rules = $this->cache->load($key, filemtime($file));
 		if ($rules) {
 			foreach ($rules['import'] as $file) {
-				if (!$this->cache->load($this->getCacheKey($file), filemtime($file))) return false;
+				if (!$this->cache->load($this->getCacheKey($file), filemtime($file))) {
+					return false;
+				}
 			}
 		}
 		return $rules;
@@ -33,7 +35,9 @@ 
     }
 
     public function write($file, $rules, $imports = []) {
-        if (is_file($file)) $this->cache->write($this->getCacheKey($file), ['rules' => $rules, 'import' => $imports]);
+        if (is_file($file)) {
+        	$this->cache->write($this->getCacheKey($file), ['rules' => $rules, 'import' => $imports]);
+        }
         return $rules;
     }
 }

src/TSSFunction/Template.php

Doc Comments +3 added lines

@@ -17,6 +17,9 @@
 		$this->xPath = $xPath;
 	}
 
+	/**
+	 * @param integer $index
+	 */
 	private function readArray($array, $index) {
 		return isset($array[$index]) ? $array[$index] : null;
 	}

Indentation +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 		$result = [];
 		if ($newNode->tagName === 'template') {
 			foreach ($newNode->childNodes as $node) {
-                if (isset($node->tagName) && $node->tagName === 'template') $result[] = $this->getTemplateContent($node, $tss);
+				if (isset($node->tagName) && $node->tagName === 'template') $result[] = $this->getTemplateContent($node, $tss);
 				else $result[] = $this->getClonedElement($node, $tss);
 			}
 		}

Braces +16 added lines, -6 removed lines

@@ -25,13 +25,18 @@ 
 		$selector = $this->readArray($args, 1);
 		$tss = $this->readArray($args, 2);
 
-		if (trim($args[0])[0] === '<') $xml = $args[0];
-		else $xml = $this->filePath->getFilePath($args[0]);
+		if (trim($args[0])[0] === '<') {
+			$xml = $args[0];
+		} else {
+			$xml = $this->filePath->getFilePath($args[0]);
+		}
 
 		$newTemplate = new \Transphporm\Builder($xml, $tss ? $this->filePath->getFilePath($tss) : null);
 
 		$doc = $newTemplate->output($this->elementData->getData($element), true)->body;
-		if ($selector != '') return $this->templateSubsection($doc, $selector);
+		if ($selector != '') {
+			return $this->templateSubsection($doc, $selector);
+		}
 
 		return $this->getTemplateContent($doc->documentElement, $tss);
 
@@ -41,8 +46,11 @@ 
 		$result = [];
 		if ($newNode->tagName === 'template') {
 			foreach ($newNode->childNodes as $node) {
-                if (isset($node->tagName) && $node->tagName === 'template') $result[] = $this->getTemplateContent($node, $tss);
-				else $result[] = $this->getClonedElement($node, $tss);
+                if (isset($node->tagName) && $node->tagName === 'template') {
+                	$result[] = $this->getTemplateContent($node, $tss);
+                } else {
+					$result[] = $this->getClonedElement($node, $tss);
+				}
 			}
 		}
 		return $result;
@@ -62,7 +70,9 @@ 
 
 	private function getClonedElement($node, $tss) {
 		$clone = $node->cloneNode(true);
-		if ($tss != null && $clone instanceof \DomElement) $clone->setAttribute('transphporm', 'includedtemplate');
+		if ($tss != null && $clone instanceof \DomElement) {
+			$clone->setAttribute('transphporm', 'includedtemplate');
+		}
 		return $clone;
 	}
 }

src/TSSFunction/Json.php

Spacing +2 added lines, -2 removed lines

@@ -12,13 +12,13 @@
 
         if ($this->isJsonFile($json)) {
             $path = $this->filePath->getFilePath($json);
-            if (!file_exists($path)) throw new \Exception('File does not exist at: ' . $path);
+            if (!file_exists($path)) throw new \Exception('File does not exist at: '.$path);
             $json = file_get_contents($path);
         }
 
         $map = json_decode($json, true);
 
-        if (!is_array($map)) throw new \Exception('Could not decode json: ' . json_last_error_msg());
+        if (!is_array($map)) throw new \Exception('Could not decode json: '.json_last_error_msg());
 
         return $map;
     }

Indentation +18 added lines, -18 removed lines

@@ -1,29 +1,29 @@
 <?php
 namespace Transphporm\TSSFunction;
 class Json implements \Transphporm\TSSFunction {
-    private $filePath;
+	private $filePath;
 
-    public function __construct(\Transphporm\FilePath $filePath) {
-        $this->filePath = $filePath;
-    }
+	public function __construct(\Transphporm\FilePath $filePath) {
+		$this->filePath = $filePath;
+	}
 
-    public function run(array $args, \DomElement $element = null) {
-        $json = $args[0];
+	public function run(array $args, \DomElement $element = null) {
+		$json = $args[0];
 
-        if ($this->isJsonFile($json)) {
-            $path = $this->filePath->getFilePath($json);
-            if (!file_exists($path)) throw new \Exception('File does not exist at: ' . $path);
-            $json = file_get_contents($path);
-        }
+		if ($this->isJsonFile($json)) {
+			$path = $this->filePath->getFilePath($json);
+			if (!file_exists($path)) throw new \Exception('File does not exist at: ' . $path);
+			$json = file_get_contents($path);
+		}
 
-        $map = json_decode($json, true);
+		$map = json_decode($json, true);
 
-        if (!is_array($map)) throw new \Exception('Could not decode json: ' . json_last_error_msg());
+		if (!is_array($map)) throw new \Exception('Could not decode json: ' . json_last_error_msg());
 
-        return $map;
-    }
+		return $map;
+	}
 
-    private function isJsonFile($json) {
-        return trim($json)[0] != '{' && trim($json)[0] != '[';
-    }
+	private function isJsonFile($json) {
+		return trim($json)[0] != '{' && trim($json)[0] != '[';
+	}
 }

Braces +6 added lines, -2 removed lines

@@ -12,13 +12,17 @@
 
         if ($this->isJsonFile($json)) {
             $path = $this->filePath->getFilePath($json);
-            if (!file_exists($path)) throw new \Exception('File does not exist at: ' . $path);
+            if (!file_exists($path)) {
+            	throw new \Exception('File does not exist at: ' . $path);
+            }
             $json = file_get_contents($path);
         }
 
         $map = json_decode($json, true);
 
-        if (!is_array($map)) throw new \Exception('Could not decode json: ' . json_last_error_msg());
+        if (!is_array($map)) {
+        	throw new \Exception('Could not decode json: ' . json_last_error_msg());
+        }
 
         return $map;
     }

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/Hook/PseudoMatcher.php

Braces +16 added lines, -9 removed lines

@@ -27,9 +27,10 @@ 
 				try {
 					$parts = $this->getFuncParts($tokens);
 					$matches = $function->match($parts['name'], $parts['args'], $element);
-					if ($matches === false) return false;
-				}
-				catch (\Exception $e) {
+					if ($matches === false) {
+						return false;
+					}
+				} catch (\Exception $e) {
 					throw new \Transphporm\RunException(\Transphporm\Exception::PSEUDO, $parts['name'], $e);
 				}
 			}
@@ -42,31 +43,37 @@ 
 		$parts['name'] = $this->getFuncName($tokens);
 		if ($parts['name'] === null || in_array($parts['name'], ['data', 'iteration', 'root'])) {
 			$parts['args'] = $this->valueParser->parseTokens($tokens);
-		}
-		else if (count($tokens) > 1) {
+		} else if (count($tokens) > 1) {
 			$tokens->rewind();
 			$tokens->next();
 			$parts['args'] = $this->valueParser->parseTokens($tokens->current()['value']);
+		} else {
+			$parts['args'] = [['']];
 		}
-		else $parts['args'] = [['']];
 		return $parts;
 	}
 
 	private function getFuncName($tokens) {
-		if ($tokens->type() === Tokenizer::NAME) return $tokens->read();
+		if ($tokens->type() === Tokenizer::NAME) {
+			return $tokens->read();
+		}
 		return null;
 	}
 
 	public function hasFunction($name) {
 		foreach ($this->pseudo as $tokens) {
-			if ($name === $this->getFuncName($tokens)) return true;
+			if ($name === $this->getFuncName($tokens)) {
+				return true;
+			}
 		}
 	}
 
 	public function getFuncArgs($name) {
 		foreach ($this->pseudo as $tokens) {
 			$parts = $this->getFuncParts($tokens);
-			if ($name === $parts['name']) return $parts['args'];
+			if ($name === $parts['name']) {
+				return $parts['args'];
+			}
 		}
 	}
 }

src/FunctionSet.php

Braces +2 added lines, -4 removed lines

@@ -21,15 +21,13 @@
 				$tokens = $args[0];
 				$parser = new \Transphporm\Parser\Value($this);
 				$args[0] = $parser->parseTokens($tokens, $this->elementData->getData($this->element));
-			}
-			else if (isset($args[0]) && $args[0] instanceof Parser\Tokens) {
+			} else if (isset($args[0]) && $args[0] instanceof Parser\Tokens) {
 				$args[0] = iterator_to_array($args[0]);
 			}
 			if (isset($this->functions[$name])) {
 				return $this->functions[$name]->run($args[0], $this->element);
 			}
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 			throw new RunException(Exception::TSS_FUNCTION, $name, $e);
 		}
 		return true;

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,16 +14,23 @@ 
 	}
 
 	public function traverse($key) {
-		if (isset($this->data->{$key})) $this->data = $this->data->{$key};
-		else if ((is_array($this->data) || $this->data instanceof \ArrayAccess) && isset($this->data[$key])) $this->data = $this->data[$key];
+		if (isset($this->data->{$key})) {
+			$this->data = $this->data->{$key};
+		} else if ((is_array($this->data) || $this->data instanceof \ArrayAccess) && isset($this->data[$key])) {
+			$this->data = $this->data[$key];
+		}
 	}
 
 	public function read($value) {
 		if ((is_array($this->data) || $this->data instanceof \ArrayAccess)) {
-			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) {
@@ -36,14 +43,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) {