Level-2 / Transphporm

src/Hook/Formatter.php

Braces +3 added lines, -1 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();

src/Hook/PseudoMatcher.php

Braces +12 added lines, -6 removed lines

@@ -39,31 +39,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 +1 added lines, -2 removed lines

@@ -20,8 +20,7 @@
 			$tokens = $args[0];
 			$parser = new \Transphporm\Parser\Value($this);
 			$args[0] = $parser->parseTokens($tokens, $this->elementData->getData($this->element));
-		}
-		else if ($args[0] instanceof Parser\Tokens) {
+		} else if ($args[0] instanceof Parser\Tokens) {
 			$args[0] = iterator_to_array($args[0]);
 		}
 		if (isset($this->functions[$name])) {

src/Parser/Tokens.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
 			if ($token['type'] === $tokenType) $i++;
 			else $splitTokens[$i][] = $token;
 		}
-        return array_map(function ($tokens) {
+        return array_map(function($tokens) {
             return new Tokens($tokens);
         }, $splitTokens);
 		//return $splitTokens;

Indentation +74 added lines, -74 removed lines

@@ -6,28 +6,28 @@ 
  * @version         1.0                                                             */
 namespace Transphporm\Parser;
 class Tokens implements \Iterator, \Countable {
-    private $tokens;
-    private $iterator = 0;
+	private $tokens;
+	private $iterator = 0;
 
-    public function __construct(array $tokens) {
-        $this->tokens = $tokens;
-    }
+	public function __construct(array $tokens) {
+		$this->tokens = $tokens;
+	}
 
-    public function count() {
-        return count($this->tokens);
-    }
+	public function count() {
+		return count($this->tokens);
+	}
 
-    // Iterator Functions
-    public function current() {
-        return $this->tokens[$this->iterator];
-    }
+	// Iterator Functions
+	public function current() {
+		return $this->tokens[$this->iterator];
+	}
 
-    public function key() {
-        return $this->iterator;
-    }
+	public function key() {
+		return $this->iterator;
+	}
 
-    public function next() {
-        ++$this->iterator;
+	public function next() {
+		++$this->iterator;
 	}
 
 	public function valid() {
@@ -38,67 +38,67 @@ 
 		$this->iterator = 0;
 	}
 
-    private function getKeysOfTokenType($tokenType) {
-        return array_keys(array_column($this->tokens, 'type'), $tokenType);
-    }
-
-    private function getKeyToSlice($tokenType) {
-        $keys = $this->getKeysOfTokenType($tokenType);
-        if (empty($keys)) return false;
-        $key = $keys[0];
-        for ($i = 0; $key < $this->iterator; $i++) $key = $keys[$i];
-        return $key;
-    }
-
-    public function from($tokenType, $inclusive = false) {
-        $key = $this->getKeyToSlice($tokenType);
-        if ($key === false) return new Tokens([]);
-        if (!$inclusive) $key++;
-        return new Tokens(array_slice($this->tokens, $key));
-    }
-
-    public function to($tokenType, $inclusive = false) {
-        $key = $this->getKeyToSlice($tokenType);
-        if ($key === false) return new Tokens([]);
-        if ($inclusive) $key++;
-        return new Tokens(array_slice($this->tokens, 0, $key));
-    }
-
-    public function skip($count) {
-        $this->iterator += $count;
-    }
-
-    public function splitOnToken($tokenType) {
-        $splitTokens = [];
+	private function getKeysOfTokenType($tokenType) {
+		return array_keys(array_column($this->tokens, 'type'), $tokenType);
+	}
+
+	private function getKeyToSlice($tokenType) {
+		$keys = $this->getKeysOfTokenType($tokenType);
+		if (empty($keys)) return false;
+		$key = $keys[0];
+		for ($i = 0; $key < $this->iterator; $i++) $key = $keys[$i];
+		return $key;
+	}
+
+	public function from($tokenType, $inclusive = false) {
+		$key = $this->getKeyToSlice($tokenType);
+		if ($key === false) return new Tokens([]);
+		if (!$inclusive) $key++;
+		return new Tokens(array_slice($this->tokens, $key));
+	}
+
+	public function to($tokenType, $inclusive = false) {
+		$key = $this->getKeyToSlice($tokenType);
+		if ($key === false) return new Tokens([]);
+		if ($inclusive) $key++;
+		return new Tokens(array_slice($this->tokens, 0, $key));
+	}
+
+	public function skip($count) {
+		$this->iterator += $count;
+	}
+
+	public function splitOnToken($tokenType) {
+		$splitTokens = [];
 		$i = 0;
 		foreach ($this->tokens as $token) {
 			if ($token['type'] === $tokenType) $i++;
 			else $splitTokens[$i][] = $token;
 		}
-        return array_map(function ($tokens) {
-            return new Tokens($tokens);
-        }, $splitTokens);
+		return array_map(function ($tokens) {
+			return new Tokens($tokens);
+		}, $splitTokens);
 		//return $splitTokens;
-    }
-
-    public function trim() {
-        $tokens = $this->tokens;
-        // Remove end whitespace
-        while (end($tokens)['type'] === Tokenizer::WHITESPACE) {
-            array_pop($tokens);
-        }
-        // Remove begining whitespace
-        while (isset($tokens[0]) && $tokens[0]['type'] === Tokenizer::WHITESPACE) {
-            array_shift($tokens);
-        }
-        return new Tokens($tokens);
-    }
-
-    public function read($offset = 0) {
-        return isset($this->tokens[$offset]) ? $this->tokens[$offset]['value'] : false;
-    }
-
-    public function type($offset = 0) {
-        return isset($this->tokens[$offset]) ? $this->tokens[$offset]['type'] : false;
-    }
+	}
+
+	public function trim() {
+		$tokens = $this->tokens;
+		// Remove end whitespace
+		while (end($tokens)['type'] === Tokenizer::WHITESPACE) {
+			array_pop($tokens);
+		}
+		// Remove begining whitespace
+		while (isset($tokens[0]) && $tokens[0]['type'] === Tokenizer::WHITESPACE) {
+			array_shift($tokens);
+		}
+		return new Tokens($tokens);
+	}
+
+	public function read($offset = 0) {
+		return isset($this->tokens[$offset]) ? $this->tokens[$offset]['value'] : false;
+	}
+
+	public function type($offset = 0) {
+		return isset($this->tokens[$offset]) ? $this->tokens[$offset]['type'] : false;
+	}
 }

Braces +23 added lines, -8 removed lines

@@ -44,23 +44,35 @@ 
 
     private function getKeyToSlice($tokenType) {
         $keys = $this->getKeysOfTokenType($tokenType);
-        if (empty($keys)) return false;
+        if (empty($keys)) {
+        	return false;
+        }
         $key = $keys[0];
-        for ($i = 0; $key < $this->iterator; $i++) $key = $keys[$i];
+        for ($i = 0; $key < $this->iterator; $i++) {
+        	$key = $keys[$i];
+        }
         return $key;
     }
 
     public function from($tokenType, $inclusive = false) {
         $key = $this->getKeyToSlice($tokenType);
-        if ($key === false) return new Tokens([]);
-        if (!$inclusive) $key++;
+        if ($key === false) {
+        	return new Tokens([]);
+        }
+        if (!$inclusive) {
+        	$key++;
+        }
         return new Tokens(array_slice($this->tokens, $key));
     }
 
     public function to($tokenType, $inclusive = false) {
         $key = $this->getKeyToSlice($tokenType);
-        if ($key === false) return new Tokens([]);
-        if ($inclusive) $key++;
+        if ($key === false) {
+        	return new Tokens([]);
+        }
+        if ($inclusive) {
+        	$key++;
+        }
         return new Tokens(array_slice($this->tokens, 0, $key));
     }
 
@@ -72,8 +84,11 @@ 
         $splitTokens = [];
 		$i = 0;
 		foreach ($this->tokens as $token) {
-			if ($token['type'] === $tokenType) $i++;
-			else $splitTokens[$i][] = $token;
+			if ($token['type'] === $tokenType) {
+				$i++;
+			} else {
+				$splitTokens[$i][] = $token;
+			}
 		}
         return array_map(function ($tokens) {
             return new Tokens($tokens);

src/Property/Repeat.php

Braces +15 added lines, -5 removed lines

@@ -18,12 +18,16 @@ 
 
 	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;
 
 		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
@@ -36,7 +40,9 @@ 
 	}
 
 	private function fixEmpty($value) {
-		if (empty($value[0])) $value[0] = [];
+		if (empty($value[0])) {
+			$value[0] = [];
+		}
 		return $value;
 	}
 
@@ -52,7 +58,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) {
@@ -61,7 +69,9 @@ 
 
 	private function createHook($newRules, $pseudoMatcher, $properties) {
 		$hook = new \Transphporm\Hook\PropertyHook($newRules, $this->baseDir, $this->baseDir, $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/Value.php

Braces +19 added lines, -15 removed lines

@@ -49,7 +49,9 @@ 
 		$this->data = new ValueData($data ? $data : $this->baseData);
 		$this->last = null;
 
-		if (count($tokens) <= 0) return [$data];
+		if (count($tokens) <= 0) {
+			return [$data];
+		}
 
 		foreach (new TokenFilterIterator($tokens, [Tokenizer::WHITESPACE]) as $token) {
 			$this->{$this->tokenFuncs[$token['type']]}($token);
@@ -71,13 +73,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);
 			}
@@ -90,9 +94,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];
 		}
 	}
@@ -112,8 +117,7 @@ 
 	private function processBrackets($token) {
 		if ($this->baseData instanceof \Transphporm\Functionset && $this->baseData->hasFunction($this->last)) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
+		} else {
 			$this->processNested($token);
 		}
 	}
@@ -130,7 +134,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;
@@ -142,12 +148,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/Config.php

Braces +6 added lines, -2 removed lines

@@ -67,12 +67,16 @@
 	}
 
 	public function loadProperties(Hook\PropertyHook $hook) {
-		foreach ($this->properties as $name => $property) $hook->registerProperty($name, $property);
+		foreach ($this->properties as $name => $property) {
+			$hook->registerProperty($name, $property);
+		}
 	}
 
 	public function createPseudoMatcher($pseudo) {
 		$pseudoMatcher = new Hook\PseudoMatcher($pseudo, $this->valueParser);
-		foreach ($this->pseudo as $pseudoFunction) $pseudoMatcher->registerFunction(clone $pseudoFunction);
+		foreach ($this->pseudo as $pseudoFunction) {
+			$pseudoMatcher->registerFunction(clone $pseudoFunction);
+		}
 		return $pseudoMatcher;
 	}
 

src/Pseudo/Nth.php

Braces +8 added lines, -3 removed lines

@@ -11,14 +11,19 @@
 
 	public function match($name, $args, \DomElement $element) {
 		
-		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);
-		else return $this->count == $criteria;
+		if (is_callable([$this, $criteria])) {
+			return $this->$criteria($this->count);
+		} else {
+			return $this->count == $criteria;
+		}
 	}
 
 	private function odd($num) {

src/Parser/TokenFilterIterator.php

Indentation +28 added lines, -28 removed lines

@@ -6,39 +6,39 @@
  * @version         1.0                                                             */
 namespace Transphporm\Parser;
 class TokenFilterIterator implements \Iterator {
-    private $ignore;
-    private $tokens;
+	private $ignore;
+	private $tokens;
 
-    public function __construct(Tokens $tokens, array $ignore) {
-        $this->ignore = $ignore;
-        $this->tokens = $tokens;
-    }
+	public function __construct(Tokens $tokens, array $ignore) {
+		$this->ignore = $ignore;
+		$this->tokens = $tokens;
+	}
 
-    public function current() {
-        return $this->tokens->current();
-    }
+	public function current() {
+		return $this->tokens->current();
+	}
 
-    public function key() {
-        return $this->tokens->key();
-    }
+	public function key() {
+		return $this->tokens->key();
+	}
 
-    public function valid() {
-        return $this->tokens->valid();
-    }
+	public function valid() {
+		return $this->tokens->valid();
+	}
 
-    public function next() {
-        do {
-            $this->tokens->next();
-        }
-        while ($this->shouldContinue());
-    }
+	public function next() {
+		do {
+			$this->tokens->next();
+		}
+		while ($this->shouldContinue());
+	}
 
-    public function rewind() {
-        $this->tokens->rewind();
-        while ($this->shouldContinue()) $this->tokens->next();
-    }
+	public function rewind() {
+		$this->tokens->rewind();
+		while ($this->shouldContinue()) $this->tokens->next();
+	}
 
-    private function shouldContinue() {
-        return $this->tokens->valid() && in_array($this->tokens->current()['type'], $this->ignore);
-    }
+	private function shouldContinue() {
+		return $this->tokens->valid() && in_array($this->tokens->current()['type'], $this->ignore);
+	}
 }

Braces +3 added lines, -1 removed lines

@@ -35,7 +35,9 @@
 
     public function rewind() {
         $this->tokens->rewind();
-        while ($this->shouldContinue()) $this->tokens->next();
+        while ($this->shouldContinue()) {
+        	$this->tokens->next();
+        }
     }
 
     private function shouldContinue() {