Level-2 / Transphporm

src/Parser/ValueData.php

Doc Comments +6 added lines

@@ -34,6 +34,9 @@ 
 		return $this->data->$func(...$args);
 	}
 
+	/**
+	 * @param Value $parser
+	 */
 	public function parseNested($parser, $token, $funcName) {
 		$args = $parser->parseTokens($token['value'], $this->data);
 		if ($args[0] == $this->data) $args = [];
@@ -49,6 +52,9 @@ 
 		else return call_user_func_array([$obj, $func], $args);
 	}
 
+	/**
+	 * @param boolean $autoLookup
+	 */
 	public function extract($last, $autoLookup) {
 		if ($autoLookup && isset($this->data->{$last})) {
 			return $this->data->{$last};

Spacing +1 added lines, -1 removed lines

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

Braces +20 added lines, -8 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) && 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) && isset($this->data[$key])) {
+			$this->data = $this->data[$key];
+		}
 	}
 
 	public function read($value) {
 		if (is_array($this->data)) {
-			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 isFunctionSet() {
@@ -36,7 +43,9 @@ 
 
 	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->callFunc($funcName, $args, $this->data);
 	}
 
@@ -45,8 +54,11 @@ 
 	}
 
 	private function callFuncOnObject($obj, $func, $args) {
-		if (isset($obj->$func) && is_callable($obj->$func)) return call_user_func_array($obj->$func, $args);
-		else return call_user_func_array([$obj, $func], $args);
+		if (isset($obj->$func) && is_callable($obj->$func)) {
+			return call_user_func_array($obj->$func, $args);
+		} else {
+			return call_user_func_array([$obj, $func], $args);
+		}
 	}
 
 	public function extract($last, $autoLookup) {

src/Property/Repeat.php

Braces +12 added lines, -4 removed lines

@@ -15,14 +15,18 @@ 
 	}
 
 	public function run(array $values, \DomElement $element, array $rules, \Transphporm\Hook\PseudoMatcher $pseudoMatcher, array $properties = []) {
-		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;
 
 		//What was this if statement for? removing it breaks nothing
 		//if (empty($values[0])) $values[0] = [];
 		foreach ($values[0] 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
 			//Don't run repeat on the clones element or it will loop forever
@@ -46,7 +50,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) {
@@ -55,7 +61,9 @@ 
 
 	private function createHook($newRules, $pseudoMatcher, $properties) {
 		$hook = new \Transphporm\Hook\PropertyHook($newRules, $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/Pseudo/Attribute.php

Braces +3 added lines, -1 removed lines

@@ -13,7 +13,9 @@
 	}
 
 	public function match($pseudo, \DomElement $element) {
-		if (strpos($pseudo, '[') === false) return true;
+		if (strpos($pseudo, '[') === false) {
+			return true;
+		}
 
 		$this->functionSet->setElement($element);
 		$valueParser = new \Transphporm\Parser\Value($this->functionSet);

src/Hook/PseudoMatcher.php

Braces +3 added lines, -1 removed lines

@@ -31,7 +31,9 @@
 	
 	public function hasFunction($name) {
 		foreach ($this->pseudo as $pseudo) {
-			if (strpos($pseudo, $name) === 0) return true;
+			if (strpos($pseudo, $name) === 0) {
+				return true;
+			}
 		}
 	}
 

src/Hook/Formatter.php

Braces +6 added lines, -2 removed lines

@@ -14,14 +14,18 @@
 	}
 
 	public function format($value, $rules) {
-		if (!isset($rules['format'])) return $value;
+		if (!isset($rules['format'])) {
+			return $value;
+		}
 
 		$tokenizer = new \Transphporm\Parser\Tokenizer($rules['format']);
 		$tokens = $tokenizer->getTokens();
 
 		$functionName = $tokens[0]['value'];
 		$options = [];
-		for ($i = 1; $i < count($tokens); $i++) $options[] = $tokens[$i]['value'];
+		for ($i = 1; $i < count($tokens); $i++) {
+			$options[] = $tokens[$i]['value'];
+		}
 
 		return $this->processFormat($options, $functionName, $value);		
 	}

src/Parser/CssToXpath.php

Spacing +7 added lines, -7 removed lines

@@ -20,12 +20,12 @@ 
 		$this->functionSet = $functionSet;
 
 		$this->translators = [
-			' ' => function($string) use ($prefix) { return '//' . $prefix . $string;	},
-			'' => function($string) use ($prefix) { return '/' . $prefix . $string;	},
-			'>' => function($string) use ($prefix) { return '/' . $prefix  . $string; },
-			'#' => function($string) { return '[@id=\'' . $string . '\']'; },
-			'.' => function($string) { return '[contains(concat(\' \', normalize-space(@class), \' \'), \' ' . $string . ' \')]'; },
-			'[' => function($string) use ($hash) { return '[' .'php:function(\'\Transphporm\Parser\CssToXpath::processAttr\', \'' . $string . '\', ., "' . $hash . '")' . ']';	},
+			' ' => function($string) use ($prefix) { return '//'.$prefix.$string; },
+			'' => function($string) use ($prefix) { return '/'.$prefix.$string; },
+			'>' => function($string) use ($prefix) { return '/'.$prefix.$string; },
+			'#' => function($string) { return '[@id=\''.$string.'\']'; },
+			'.' => function($string) { return '[contains(concat(\' \', normalize-space(@class), \' \'), \' '.$string.' \')]'; },
+			'[' => function($string) use ($hash) { return '['.'php:function(\'\Transphporm\Parser\CssToXpath::processAttr\', \''.$string.'\', ., "'.$hash.'")'.']'; },
 			']' => function() {	return ''; }
 		];
 	}
@@ -85,7 +85,7 @@ 
 	}
 
 	public function getXpath($css) {
-		$this->css = str_replace([' >', '> '],['>', '>'], trim($css));
+		$this->css = str_replace([' >', '> '], ['>', '>'], trim($css));
 		$css = explode(':', $this->css)[0];
 		$selectors = $this->split($css);
 		$xpath = '/';

Braces +10 added lines, -4 removed lines

@@ -63,8 +63,11 @@ 
 	}
 
 	private static function compare($comparator, $a, $b) {
-		if ($comparator == '=') return $a == $b;
-		else if ($comparator == '!=') return $a != $b;
+		if ($comparator == '=') {
+			return $a == $b;
+		} else if ($comparator == '!=') {
+			return $a != $b;
+		}
 	}
 
 	//split the css into indivudal functions
@@ -78,8 +81,9 @@ 
 				$selector = $this->createSelector();
 				$selector->type = $css[$i];
 				$selectors[] = $selector;
+			} else {
+				$selector->string .= $css[$i];
 			}
-			else $selector->string .= $css[$i];
 		}
 		return $selectors;
 	}
@@ -90,7 +94,9 @@ 
 		$selectors = $this->split($css);
 		$xpath = '/';
 		foreach ($selectors as $selector) {
-			if (isset($this->translators[$selector->type])) $xpath .= $this->translators[$selector->type]($selector->string, $xpath);
+			if (isset($this->translators[$selector->type])) {
+				$xpath .= $this->translators[$selector->type]($selector->string, $xpath);
+			}
 		}
 
 		$xpath = str_replace('/[', '/*[', $xpath);

src/Parser/Value.php

Braces +20 added lines, -17 removed lines

@@ -50,7 +50,9 @@ 
 		$this->data = new ValueData($data);
 		$this->last = null;
 
-		if (empty($tokens)) return [$data];
+		if (empty($tokens)) {
+			return [$data];
+		}
 
 		foreach ($tokens as $token) {
 			$this->{$this->tokenFuncs[$token['type']]}($token);
@@ -65,8 +67,7 @@ 
 
 		if ($this->result->getMode() == Tokenizer::NOT && $token['type'] == Tokenizer::EQUALS) {
 			$this->result->setMode(Tokenizer::NOT);
-		}
-		else {
+		} else {
 			$this->result->setMode($token['type']);
 			$this->last = null;
 		}
@@ -75,13 +76,15 @@ 
 	//Reads the last selected value from $data regardless if it's an array or object and overrides $this->data with the new value
 	//Dot moves $data to the next object in $data foo.bar moves the $data pointer from `foo` to `bar`
 	private function processDot($token) {
-		if ($this->last !== null) $this->data->traverse($this->last);
-		else {
+		if ($this->last !== null) {
+			$this->data->traverse($this->last);
+		} else {
 			//When . is not preceeded by anything, treat it as part of the string instead of an operator
 			// foo.bar is treated as looking up `bar` in `foo` whereas .foo is treated as the string ".foo"
 			$lastResult = $this->result->pop();
-			if ($lastResult) $this->data = new ValueData($lastResult);
-			else {
+			if ($lastResult) {
+				$this->data = new ValueData($lastResult);
+			} else {
 				$this->processString(['value' => '.']);
 				$this->result->setMode(Tokenizer::CONCAT);
 			}
@@ -94,9 +97,10 @@ 
 		$parser = new Value($this->baseData, $this->autoLookup);
 		if ($this->baseData instanceof \Transphporm\Functionset && $this->baseData->hasFunction($this->last)) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
-			if ($this->last !== null) $this->data->traverse($this->last);
+		} else {
+			if ($this->last !== null) {
+				$this->data->traverse($this->last);
+			}
 			$this->last = $parser->parseTokens($token['value'], null)[0];
 		}
 	}
@@ -118,8 +122,7 @@ 
 	private function processBrackets($token) {
 		if ($this->baseData instanceof \Transphporm\Functionset && $this->baseData->hasFunction($this->last)) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
+		} else {
 			$this->processNested($token);
 		}
 	}
@@ -136,7 +139,9 @@ 
 		foreach ($this->result->getResult() as $i => $value) {
 			if (is_scalar($value)) {
 				$val = $this->data->read($value);
-				if ($val) $this->result[$i] = $val;
+				if ($val) {
+					$this->result[$i] = $val;
+				}
 			}
 		}
 		$this->last = null;
@@ -148,12 +153,10 @@ 
 			try {
 				$value = $this->data->extract($this->last, $this->autoLookup);
 				$this->result->processValue($value);
-			}
-			catch (\UnexpectedValueException $e) {
+			} catch (\UnexpectedValueException $e) {
 				if (!$this->autoLookup) {
 					$this->result->processValue($this->last);
-				}
-				else {
+				} else {
 					$this->result->clear();
 					$this->result[0] = false;
 				}

src/TSSFunction/Json.php

Indentation +16 added lines, -16 removed lines

@@ -1,27 +1,27 @@
 <?php
 namespace Transphporm\TSSFunction;
 class Json implements \Transphporm\TSSFunction {
-    private $baseDir;
+	private $baseDir;
 
-    public function __construct(&$baseDir) {
-        $this->baseDir = &$baseDir;
-    }
+	public function __construct(&$baseDir) {
+		$this->baseDir = &$baseDir;
+	}
 
-    public function run(array $args, \DomElement $element = null) {
-        $json = $args[0];
+	public function run(array $args, \DomElement $element = null) {
+		$json = $args[0];
 
-        if (trim($json)[0] != '{') {
-            if (is_file($this->baseDir . $args[0])) $jsonFile = $this->baseDir . $json;
-    		elseif (is_file($args[0])) $jsonFile = $json;
-    		else throw new \Exception('JSON File "' . $json .'" does not exist');
+		if (trim($json)[0] != '{') {
+			if (is_file($this->baseDir . $args[0])) $jsonFile = $this->baseDir . $json;
+			elseif (is_file($args[0])) $jsonFile = $json;
+			else throw new \Exception('JSON File "' . $json .'" does not exist');
 
-            $json = file_get_contents($jsonFile);
-        }
+			$json = file_get_contents($jsonFile);
+		}
 
-        $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;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -11,16 +11,16 @@
         $json = $args[0];
 
         if (trim($json)[0] != '{') {
-            if (is_file($this->baseDir . $args[0])) $jsonFile = $this->baseDir . $json;
+            if (is_file($this->baseDir.$args[0])) $jsonFile = $this->baseDir.$json;
     		elseif (is_file($args[0])) $jsonFile = $json;
-    		else throw new \Exception('JSON File "' . $json .'" does not exist');
+    		else throw new \Exception('JSON File "'.$json.'" does not exist');
 
             $json = file_get_contents($jsonFile);
         }
 
         $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;
     }

Braces +10 added lines, -4 removed lines

@@ -11,16 +11,22 @@
         $json = $args[0];
 
         if (trim($json)[0] != '{') {
-            if (is_file($this->baseDir . $args[0])) $jsonFile = $this->baseDir . $json;
-    		elseif (is_file($args[0])) $jsonFile = $json;
-    		else throw new \Exception('JSON File "' . $json .'" does not exist');
+            if (is_file($this->baseDir . $args[0])) {
+            	$jsonFile = $this->baseDir . $json;
+            } elseif (is_file($args[0])) {
+    			$jsonFile = $json;
+    		} else {
+    			throw new \Exception('JSON File "' . $json .'" does not exist');
+    		}
 
             $json = file_get_contents($jsonFile);
         }
 
         $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/TSSFunction/Template.php

Spacing +4 added lines, -4 removed lines

@@ -27,14 +27,14 @@
 		$selector = $this->readArray($args, 1);
 		$tss = $this->readArray($args, 2);
 
-		if (is_file($this->baseDir . $args[0])) $xmlFile = $this->baseDir . $args[0];
+		if (is_file($this->baseDir.$args[0])) $xmlFile = $this->baseDir.$args[0];
 		elseif (is_file($args[0])) $xmlFile = $args[0];
-		else throw new \Exception('XML File "' . $args[0] .'" does not exist');
+		else throw new \Exception('XML File "'.$args[0].'" does not exist');
 
 		if ($tss) {
-			if (is_file($this->baseDir . $tss)) $tssFile = $this->baseDir . $tss;
+			if (is_file($this->baseDir.$tss)) $tssFile = $this->baseDir.$tss;
 			elseif (is_file($args[0])) $tssFile = $tss;
-			else throw new \Exception('TSS File "' . $tss .'" does not exist');
+			else throw new \Exception('TSS File "'.$tss.'" does not exist');
 		}
 		else $tssFile = null;
 

Braces +22 added lines, -9 removed lines

@@ -27,21 +27,32 @@ 
 		$selector = $this->readArray($args, 1);
 		$tss = $this->readArray($args, 2);
 
-		if (is_file($this->baseDir . $args[0])) $xmlFile = $this->baseDir . $args[0];
-		elseif (is_file($args[0])) $xmlFile = $args[0];
-		else throw new \Exception('XML File "' . $args[0] .'" does not exist');
+		if (is_file($this->baseDir . $args[0])) {
+			$xmlFile = $this->baseDir . $args[0];
+		} elseif (is_file($args[0])) {
+			$xmlFile = $args[0];
+		} else {
+			throw new \Exception('XML File "' . $args[0] .'" does not exist');
+		}
 
 		if ($tss) {
-			if (is_file($this->baseDir . $tss)) $tssFile = $this->baseDir . $tss;
-			elseif (is_file($args[0])) $tssFile = $tss;
-			else throw new \Exception('TSS File "' . $tss .'" does not exist');
+			if (is_file($this->baseDir . $tss)) {
+				$tssFile = $this->baseDir . $tss;
+			} elseif (is_file($args[0])) {
+				$tssFile = $tss;
+			} else {
+				throw new \Exception('TSS File "' . $tss .'" does not exist');
+			}
+		} else {
+			$tssFile = null;
 		}
-		else $tssFile = null;
 
 		$newTemplate = new \Transphporm\Builder($xmlFile, $tssFile);
 
 		$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, $tss);
 
@@ -71,7 +82,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;
 	}
 }