Level-2 / Transphporm

src/TSSFunction/Template.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	public function run(array $args, \DomElement $element) {
 		$selector = $this->readArray($args, 1);
 		$tss = $this->readArray($args, 2);
-		$newTemplate = new \Transphporm\Builder($this->baseDir . $args[0], $tss ? $this->baseDir . $tss : null);
+		$newTemplate = new \Transphporm\Builder($this->baseDir.$args[0], $tss ? $this->baseDir.$tss : null);
 
 		$doc = $newTemplate->output($this->elementData->getData($element), true)->body;
 		if ($selector != '') return $this->templateSubsection($doc, $selector);

Braces +6 added lines, -2 removed lines

@@ -30,7 +30,9 @@ 
 		$newTemplate = new \Transphporm\Builder($this->baseDir . $args[0], $tss ? $this->baseDir . $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, $tss);
 
@@ -60,7 +62,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

Indentation +12 added lines, -12 removed lines

@@ -1,25 +1,25 @@
 <?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] != '{') {
-                        $path = $this->baseDir . $json;
-                        if (!file_exists($path)) throw new \Exception('File does not exist at: ' . $path);
+				if (trim($json)[0] != '{') {
+						$path = $this->baseDir . $json;
+						if (!file_exists($path)) throw new \Exception('File does not exist at: ' . $path);
 			$json = file_get_contents($json);
 		}
 
 		$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,14 +11,14 @@
                 $json = $args[0];
                 
                 if (trim($json)[0] != '{') {
-                        $path = $this->baseDir . $json;
-                        if (!file_exists($path)) throw new \Exception('File does not exist at: ' . $path);
+                        $path = $this->baseDir.$json;
+                        if (!file_exists($path)) throw new \Exception('File does not exist at: '.$path);
 			$json = file_get_contents($json);
 		}
 
 		$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 +6 added lines, -2 removed lines

@@ -12,13 +12,17 @@
                 
                 if (trim($json)[0] != '{') {
                         $path = $this->baseDir . $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($json);
 		}
 
 		$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/Hook/ElementData.php

Braces +3 added lines, -1 removed lines

@@ -31,7 +31,9 @@
 	/** Returns the data that has been bound to $element, or, if no data is bound to $element climb the DOM tree to find the data bound to a parent node*/
 	public function getData(\DomElement $element = null, $type = 'data') {
 		while ($element) {
-			if (isset($this->elementMap[$element]) && isset($this->elementMap[$element][$type])) return $this->elementMap[$element][$type];
+			if (isset($this->elementMap[$element]) && isset($this->elementMap[$element][$type])) {
+				return $this->elementMap[$element][$type];
+			}
 			$element = $element->parentNode;
 		}
 		return $this->data;

src/Parser/Tokenizer.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
 			$string = $this->extractString($i);
 			$length = strlen($string)+1;
 			$char = $this->getChar($char);
-			$string = str_replace('\\' . $char, $char, $string);
+			$string = str_replace('\\'.$char, $char, $string);
 			$tokens[] = ['type' => self::STRING, 'value' => $string];
 			return $length;
 		}

Braces +25 added lines, -10 removed lines

@@ -76,10 +76,15 @@ 
 				$name .= $this->str[$i+1];
 				$i++;
 			}
-			if (is_numeric($name)) $tokens[] = ['type' => self::NUMERIC, 'value' => $name];
-			else if ($name == 'true') $tokens[] = ['type' => self::BOOL, 'value' => true];
-			else if ($name == 'false') $tokens[] = ['type' => self::BOOL, 'value' => false];
-			else $tokens[] = ['type' => self::NAME, 'value' => $name];
+			if (is_numeric($name)) {
+				$tokens[] = ['type' => self::NUMERIC, 'value' => $name];
+			} else if ($name == 'true') {
+				$tokens[] = ['type' => self::BOOL, 'value' => true];
+			} else if ($name == 'false') {
+				$tokens[] = ['type' => self::BOOL, 'value' => false];
+			} else {
+				$tokens[] = ['type' => self::NAME, 'value' => $name];
+			}
 		}
 	}
 
@@ -114,7 +119,9 @@ 
 	private function extractString($pos) {
 		$char = $this->str[$pos];
 		$end = strpos($this->str, $char, $pos+1);
-		while ($end !== false && $this->str[$end-1] == '\\') $end = strpos($this->str, $char, $end+1);
+		while ($end !== false && $this->str[$end-1] == '\\') {
+			$end = strpos($this->str, $char, $end+1);
+		}
 
 		return substr($this->str, $pos+1, $end-$pos-1);
 	}
@@ -123,18 +130,26 @@ 
 		$close = strpos($this->str, $closeBracket, $open);
 
 		$cPos = $open+1;
-		while (($cPos = strpos($this->str, $startBracket, $cPos+1)) !== false && $cPos < $close) $close = strpos($this->str, $closeBracket, $close+1);
+		while (($cPos = strpos($this->str, $startBracket, $cPos+1)) !== false && $cPos < $close) {
+			$close = strpos($this->str, $closeBracket, $close+1);
+		}
 		return substr($this->str, $open+1, $close-$open-1);
 	}
 
 	private function identifyChar($chr) {
-		if (isset($this->chars[$chr])) return $this->chars[$chr];
-		else return self::NAME;
+		if (isset($this->chars[$chr])) {
+			return $this->chars[$chr];
+		} else {
+			return self::NAME;
+		}
 	}
 
 	private function getChar($num) {
 		$chars = array_reverse($this->chars);
-		if (isset($chars[$num])) return $chars[$num];
-		else return false;
+		if (isset($chars[$num])) {
+			return $chars[$num];
+		} else {
+			return false;
+		}
 	}
 }

src/Property/Repeat.php

Braces +15 added lines, -5 removed lines

@@ -15,13 +15,19 @@ 
 	}
 
 	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;
 
-		if (empty($values[0])) $values[0] = [];
+		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
@@ -45,7 +51,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) {
@@ -54,7 +62,9 @@ 
 
 	private function createHook($newRules, $pseudoMatcher, $properties) {
 		$hook = new \Transphporm\Hook\PropertyHook($newRules, $pseudoMatcher, new \Transphporm\Parser\Value($this->functionSet));
-		foreach ($properties as $name => $property) $hook->registerProperty($name, $property);
+		foreach ($properties as $name => $property) {
+			$hook->registerProperty($name, $property);
+		}
 		return $hook;
 	}
 }

src/Property/Display.php

Braces +7 added lines, -3 removed lines

@@ -7,8 +7,12 @@
 namespace Transphporm\Property;
 class Display implements \Transphporm\Property {
 	public function run(array $values, \DomElement $element, array $rules, \Transphporm\Hook\PseudoMatcher $pseudoMatcher, array $properties = []) {
-		if ($pseudoMatcher->hasFunction('attr')) $element->removeAttribute($pseudoMatcher->getFuncArgs('attr'));
-		else if (strtolower($values[0]) === 'none') $element->setAttribute('transphporm', 'remove');
-		else $element->setAttribute('transphporm', 'show');
+		if ($pseudoMatcher->hasFunction('attr')) {
+			$element->removeAttribute($pseudoMatcher->getFuncArgs('attr'));
+		} else if (strtolower($values[0]) === 'none') {
+			$element->setAttribute('transphporm', 'remove');
+		} else {
+			$element->setAttribute('transphporm', 'show');
+		}
 	}
 }
\ No newline at end of file

src/Pseudo/Attribute.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 
 		$valueParser = new \Transphporm\Parser\Value($this->functionSet);
 
-		$criteria = $name . '(' . $criteria;
+		$criteria = $name.'('.$criteria;
 
 		$pos = strpos($pseudo, '!');
 		if ($pos === false) $pos = strpos($pseudo, '=');

Braces +11 added lines, -4 removed lines

@@ -15,10 +15,14 @@ 
 	public function match($pseudo, \DomElement $element) {
 
 		$pos = strpos($pseudo, '[');
-		if ($pos === false) return true;
+		if ($pos === false) {
+			return true;
+		}
 
 		$name = substr($pseudo, 0, $pos);
-		if (!is_callable([$this->functionSet, $name])) return true;
+		if (!is_callable([$this->functionSet, $name])) {
+			return true;
+		}
 
 		$bracketMatcher = new \Transphporm\Parser\BracketMatcher($pseudo);
 		$criteria = $bracketMatcher->match('[', ']');
@@ -28,11 +32,14 @@ 
 		$criteria = $name . '(' . $criteria;
 
 		$pos = strpos($pseudo, '!');
-		if ($pos === false) $pos = strpos($pseudo, '=');
+		if ($pos === false) {
+			$pos = strpos($pseudo, '=');
+		}
 		if ($pos === false) {
 			$criteria .= ')=true';
+		} else {
+			$criteria = substr_replace($criteria, ')', $pos, 0);
 		}
-		else $criteria = substr_replace($criteria, ')', $pos, 0);
 
 		return $valueParser->parse($criteria, $element)[0];
 	}

src/TSSFunction/Data.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
  * @version         1.0                                                             */
 namespace Transphporm\TSSFunction;
 /* Handles data() and iteration() function calls from the stylesheet */
-class Data implements \Transphporm\TSSFunction{
+class Data implements \Transphporm\TSSFunction {
 	private $data;
 	private $dataKey;
 	private $functionSet;

src/Parser/Value.php

Braces +48 added lines, -30 removed lines

@@ -52,7 +52,9 @@ 
 	public function parse($str, $element = null, $returnTokens = false) {
 		$tokenizer = new Tokenizer($str);
 		$tokens = $tokenizer->getTokens();
-		if ($returnTokens) return $tokens;
+		if ($returnTokens) {
+			return $tokens;
+		}
 		$this->result = $this->parseTokens($tokens, $element, $this->baseData);
 		return $this->result;
 	}
@@ -64,7 +66,9 @@ 
 		$this->last = null;
 		$this->element = $element;
 
-		if (empty($tokens)) return [$this->data];
+		if (empty($tokens)) {
+			return [$this->data];
+		}
 		
 		foreach ($tokens as $token) {
 			$this->{$this->tokenFuncs[$token['type']]}($token);	
@@ -78,27 +82,36 @@ 
 
 		if ($this->mode == Tokenizer::NOT && $token['type'] == Tokenizer::EQUALS) {
 			$this->mode = Tokenizer::NOT;
+		} else {
+			$this->mode = $token['type'];
 		}
-		else $this->mode = $token['type'];
 	}
 
 
 	//Reads the last selected value from $data regardless if it's an array or object and overrides $this->data with the new value
 	private function moveLastToData() {
-		if (isset($this->data->{$this->last})) $this->data = $this->data->{$this->last};
-		else if (is_array($this->data) && isset($this->data[$this->last])) $this->data = $this->data[$this->last];
+		if (isset($this->data->{$this->last})) {
+			$this->data = $this->data->{$this->last};
+		} else if (is_array($this->data) && isset($this->data[$this->last])) {
+			$this->data = $this->data[$this->last];
+		}
 	}
 
 	//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->moveLastToData();
-		else $this->data = array_pop($this->result);
+		if ($this->last !== null) {
+			$this->moveLastToData();
+		} else {
+			$this->data = array_pop($this->result);
+		}
 
 		$this->last = null;
 	}
 
 	private function processSquareBracket($token) {
-		if ($this->last !== null) $this->moveLastToData();
+		if ($this->last !== null) {
+			$this->moveLastToData();
+		}
 
 		$parser = new Value($this->baseData, $this->autoLookup);
 		$this->last = $parser->parseTokens($token['value'], $this->element, null)[0];
@@ -121,15 +134,15 @@ 
 	private function processBrackets($token) {
 		if ($this->baseData instanceof \Transphporm\Functionset && $this->baseData->hasFunction($this->last)) {
 			$this->callTransphpormFunctions($token);
-		}
-		else if ($this->data instanceof \Transphporm\Functionset) {
+		} else if ($this->data instanceof \Transphporm\Functionset) {
 			$this->result = $this->processValue($this->data->{$this->last}($token['value'], $this->element));
 			$this->last = null;
-		}
-		else {
+		} else {
 			$parser = new Value($this->baseData, $this->autoLookup);
 			$args = $parser->parseTokens($token['value'], $this->element, $this->data);
-			if ($args[0] == $this->data) $args = [];
+			if ($args[0] == $this->data) {
+				$args = [];
+			}
 			$funcResult = $this->callFunc($this->last, $args, $this->element, $this->data);
 			$this->result = $this->processValue($funcResult);
 			$this->last = null;
@@ -140,9 +153,12 @@ 
 		$this->result = $this->processValue($this->baseData->{$this->last}($token['value'], $this->element));
 		foreach ($this->result as $i => $value) {
 			if (is_array($this->data)) {
-				if (isset($this->data[$value])) $this->result[$i] = $this->data[$value];
+				if (isset($this->data[$value])) {
+					$this->result[$i] = $this->data[$value];
+				}
+			} else if (is_scalar($value) && isset($this->data->$value)) {
+				$this->result[$i] = $this->data->$value;
 			}
-			else if (is_scalar($value) && isset($this->data->$value)) $this->result[$i] = $this->data->$value;
 		}
 		$this->last = null;
 	}
@@ -152,12 +168,12 @@ 
 		if ($this->last !== null) {
 			try {
 				$this->result = $this->extractLast($this->result);
-			}
-			catch (\UnexpectedValueException $e) {
+			} catch (\UnexpectedValueException $e) {
 				if (!$this->autoLookup) {
 					$this->result = $this->processValue($this->last);
+				} else {
+					$this->result = [false];
 				}
-				else $this->result = [false];			
 			}			
 		}
 		return $this->result;
@@ -169,8 +185,7 @@ 
 	private function extractLast($result) {
 		if ($this->autoLookup && isset($this->data->{$this->last})) {
 			return $this->processValue($this->data->{$this->last});
-		}
-		else if (is_array($this->data) && isset($this->data[$this->last])) {
+		} else if (is_array($this->data) && isset($this->data[$this->last])) {
 			return $this->processValue($this->data[$this->last]);
 		}
 		throw new \UnexpectedValueException('Not found');
@@ -181,14 +196,11 @@ 
 	private function processValue($newValue) {
 		if ($this->mode == Tokenizer::ARG) {
 			$this->result[] = $newValue;
-		}
-		else if ($this->mode == Tokenizer::CONCAT) {
+		} else if ($this->mode == Tokenizer::CONCAT) {
 				$this->result[count($this->result)-1] .= $newValue;
-		}
-		else if ($this->mode == Tokenizer::NOT) {
+		} else if ($this->mode == Tokenizer::NOT) {
 			$this->result[count($this->result)-1] = $this->result[count($this->result)-1] != $newValue;
-		}
-		else if ($this->mode == Tokenizer::EQUALS) {
+		} else if ($this->mode == Tokenizer::EQUALS) {
 			$this->result[count($this->result)-1] = $this->result[count($this->result)-1] == $newValue;
 		}
 
@@ -196,12 +208,18 @@ 
 	}
 
 	private function callFunc($name, $args, $element, $data) {
-		if ($this->data instanceof \Transphporm\FunctionSet) return $this->data->$name($args, $element);
-		else return $this->callFuncOnObject($this->data, $name, $args, $element);
+		if ($this->data instanceof \Transphporm\FunctionSet) {
+			return $this->data->$name($args, $element);
+		} else {
+			return $this->callFuncOnObject($this->data, $name, $args, $element);
+		}
 	}
 
 	private function callFuncOnObject($obj, $func, $args, $element) {
-		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);
+		}
 	}
 }