Level-2 / Transphporm

src/Parser/Value.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 		if ($lastResult) {
 			$this->traversing = true;
 		}
-		else if ($this->last === null)  {
+		else if ($this->last === null) {
 			$this->processString(['value' => '.']);
 			$this->result->setMode(Tokenizer::CONCAT);
 		}

Braces +12 added lines, -14 removed lines

@@ -56,7 +56,9 @@ 
 		$this->last = null;
 		$this->traversing = false;
 
-		if (count($tokens) <= 0) return [$data];
+		if (count($tokens) <= 0) {
+			return [$data];
+		}
 
 		foreach (new TokenFilterIterator($tokens, [Tokenizer::WHITESPACE, Tokenizer::NEW_LINE]) as $token) {
 			$this->{$this->tokenFuncs[$token['type']]}($token);
@@ -84,8 +86,7 @@ 
 		// foo.bar is treated as looking up `bar` in `foo` whereas .foo is treated as the string ".foo"
 		if ($lastResult) {
 			$this->traversing = true;
-		}
-		else if ($this->last === null)  {
+		} else if ($this->last === null)  {
 			$this->processString(['value' => '.']);
 			$this->result->setMode(Tokenizer::CONCAT);
 		}
@@ -101,11 +102,12 @@ 
 		$parser = new Value($this->baseData, $this->autoLookup);
 		if ($this->hasFunction($this->last)) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
+		} else {
 			$this->data->traverse($this->last, $this->result);
 			$this->last = $parser->parseTokens($token['value'], null)[0];
-			if (!is_bool($this->last)) $this->traversing = true;
+			if (!is_bool($this->last)) {
+				$this->traversing = true;
+			}
 		}
 	}
 
@@ -128,8 +130,7 @@ 
 		if ($this->hasFunction($this->last)
 			&& !$this->data->methodExists($this->last)) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
+		} else {
 			$this->processNested($token);
 		}
 	}
@@ -149,8 +150,7 @@ 
 			$parser = new Value($this->data->getData());
 			$parsedVal = $parser->parse($val)[0] ?? null;
 			$this->result->postProcess($this->data, $val, $parsedVal, $this->allowNullResult);
-		}
-		else {
+		} else {
 			$this->result->postProcess($this->data, $val, null, $this->allowNullResult);
 		}
 
@@ -163,8 +163,7 @@ 
 			try {
 				$value = $this->data->extract($this->last, $this->autoLookup, $this->traversing);
 				$this->result->processValue($value);
-			}
-			catch (\UnexpectedValueException $e) {
+			} catch (\UnexpectedValueException $e) {
 				$this->processLastUnexpected();
 			}
 		}
@@ -173,8 +172,7 @@ 
 	private function processLastUnexpected() {
 		if (!($this->autoLookup || $this->traversing)) {
 			$this->result->processValue($this->last);
-		}
-		else {
+		} else {
 			$this->result->clear();
 			$this->result->processValue(false);
 		}

src/Hook/PseudoMatcher.php

Braces +19 added lines, -10 removed lines

@@ -25,7 +25,9 @@ 
 		foreach ($this->pseudo as $tokens) {
 			foreach ($this->functions as $function) {
 				$matches = $this->match($tokens, $function, $element);
-				if ($matches === false) return false;
+				if ($matches === false) {
+					return false;
+				}
 			}
 		}
 		return true;
@@ -35,9 +37,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);
 		}
 	}
@@ -46,31 +49,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/Property/Repeat.php

Doc Comments +12 added lines

@@ -11,6 +11,9 @@ 
 	private $line;
     private $filePath;
 
+	/**
+	 * @param integer $line
+	 */
 	public function __construct(\Transphporm\FunctionSet $functionSet, \Transphporm\Hook\ElementData $elementData, &$line, \Transphporm\FilePath $filePath) {
 		$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) {
 		$hook = new \Transphporm\Hook\PropertyHook($newRules, $this->line, null, $this->line, $pseudoMatcher, new \Transphporm\Parser\Value($this->functionSet), $this->functionSet, $this->filePath);
 		foreach ($properties as $name => $property) $hook->registerProperty($name, $property);

Indentation +2 added lines, -2 removed lines

@@ -9,13 +9,13 @@
 	private $functionSet;
 	private $elementData;
 	private $line;
-    private $filePath;
+	private $filePath;
 
 	public function __construct(\Transphporm\FunctionSet $functionSet, \Transphporm\Hook\ElementData $elementData, &$line, \Transphporm\FilePath $filePath) {
 		$this->functionSet = $functionSet;
 		$this->elementData = $elementData;
 		$this->line = &$line;
-        $this->filePath = $filePath;
+		$this->filePath = $filePath;
 	}
 
 	public function run(array $values, \DomElement $element, array $rules, \Transphporm\Hook\PseudoMatcher $pseudoMatcher, array $properties = []) {

Braces +18 added lines, -7 removed lines

@@ -20,7 +20,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;
 		$repeat = $this->getRepeatValue($values, $max);
@@ -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) {
@@ -79,7 +88,9 @@ 
 
 	private function createHook($newRules, $pseudoMatcher, $properties) {
 		$hook = new \Transphporm\Hook\PropertyHook($newRules, $this->line, null, $this->line, $pseudoMatcher, new \Transphporm\Parser\Value($this->functionSet), $this->functionSet, $this->filePath);
-		foreach ($properties as $name => $property) $hook->registerProperty($name, $property);
+		foreach ($properties as $name => $property) {
+			$hook->registerProperty($name, $property);
+		}
 		return $hook;
 	}
 }

src/Parser/Last.php

Braces +5 added lines, -6 removed lines

@@ -28,8 +28,9 @@ 
 
 
 	public function traverse() {
-		if ($this->last !== null) $this->data->traverse($this->last);
-		else {
+		if ($this->last !== null) {
+			$this->data->traverse($this->last);
+		} else {
 			$lastResult = $this->result->pop();
 			if ($lastResult) {
 				$this->data = new ValueData($lastResult);
@@ -67,8 +68,7 @@ 
 			try {
 				$value = $this->data->extract($this->last, $this->autoLookup, $this->traversing);
 				$this->result->processValue($value);
-			}
-			catch (\UnexpectedValueException $e) {
+			} catch (\UnexpectedValueException $e) {
 				$this->processLastUnexpected();
 			}
 		}
@@ -77,8 +77,7 @@ 
 	private function processLastUnexpected() {
 		if (!($this->autoLookup || $this->traversing)) {
 			$this->result->processValue($this->last);
-		}
-		else {
+		} else {
 			$this->result->clear();
 			$this->result[0] = false;
 		}

src/Parser/Tokenizer.php

Spacing +1 added lines, -1 removed lines

@@ -145,7 +145,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, 'line' => $this->lineNo];
 			return $length;
 		}

Braces +30 added lines, -12 removed lines

@@ -79,8 +79,11 @@ 
 			$i += $this->doStrings($tokens, $char, $i);
 			$i += $this->doBrackets($tokens, $char, $i);
 		}
-		if ($returnObj) return new Tokens($tokens);
-		else return $tokens;
+		if ($returnObj) {
+			return new Tokens($tokens);
+		} else {
+			return $tokens;
+		}
 	}
 
 	private function doSimpleTokens(&$tokens, $char) {
@@ -117,10 +120,15 @@ 
 	}
 
 	private function processLiterals(&$tokens, $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, 'line' => $this->lineNo];
+		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, 'line' => $this->lineNo];
+		}
 	}
 
 	private function doBrackets(&$tokens, $char, $i) {
@@ -154,7 +162,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);
 	}
@@ -163,18 +173,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/TSSValidator.php

Indentation +34 added lines, -34 removed lines

@@ -2,55 +2,55 @@
 namespace Transphporm;
 use Transphporm\Parser\Tokenizer;
 class TSSValidator {
-    private $error;
+	private $error;
 
-    public function validate($tss) {
-        $this->error = null;
-        $tokens = $this->tokenize($tss);
+	public function validate($tss) {
+		$this->error = null;
+		$tokens = $this->tokenize($tss);
 
-        foreach ($tokens as $token)
-            if (!$this->validateRule($token)) return false;
+		foreach ($tokens as $token)
+			if (!$this->validateRule($token)) return false;
 
-        return true;
-    }
+		return true;
+	}
 
-    public function getLastError() {
-        return $this->error;
-    }
+	public function getLastError() {
+		return $this->error;
+	}
 
-    private function validateRule($token) {
-        if ($token['type'] !== Tokenizer::OPEN_BRACE) return true;
+	private function validateRule($token) {
+		if ($token['type'] !== Tokenizer::OPEN_BRACE) return true;
 
-        return $this->checkBraces($token) && $this->checkSemicolons($token)
-            && $this->checkParenthesis($token);
-    }
+		return $this->checkBraces($token) && $this->checkSemicolons($token)
+			&& $this->checkParenthesis($token);
+	}
 
-    private function checkBraces($token) {
-        return strpos($token['string'], '{') === false;
-    }
+	private function checkBraces($token) {
+		return strpos($token['string'], '{') === false;
+	}
 
-    private function checkSemicolons($braceToken) {
-        $splitTokens = $braceToken['value']->splitOnToken(Tokenizer::COLON);
-        array_shift($splitTokens); array_pop($splitTokens);
-        foreach ($splitTokens as $tokens)
-            if (!in_array(Tokenizer::SEMI_COLON, array_column(iterator_to_array($tokens), 'type'))) return false;
+	private function checkSemicolons($braceToken) {
+		$splitTokens = $braceToken['value']->splitOnToken(Tokenizer::COLON);
+		array_shift($splitTokens); array_pop($splitTokens);
+		foreach ($splitTokens as $tokens)
+			if (!in_array(Tokenizer::SEMI_COLON, array_column(iterator_to_array($tokens), 'type'))) return false;
 
-        return true;
-    }
+		return true;
+	}
 
-    private function checkParenthesis($token) {
-        return substr_count($token['string'], '(') === substr_count($token['string'], ')');
-    }
+	private function checkParenthesis($token) {
+		return substr_count($token['string'], '(') === substr_count($token['string'], ')');
+	}
 
-    private function tokenize($tss) {
-        if (is_file($tss)) $tss = file_get_contents($tss);
-        $tss = $this->stripComments($tss, '//', "\n");
+	private function tokenize($tss) {
+		if (is_file($tss)) $tss = file_get_contents($tss);
+		$tss = $this->stripComments($tss, '//', "\n");
 		$tss = $this->stripComments($tss, '/*', '*/');
 		$tokenizer = new Tokenizer($tss);
 		return $tokenizer->getTokens();
-    }
+	}
 
-    private function stripComments($str, $open, $close) {
+	private function stripComments($str, $open, $close) {
 		$pos = 0;
 		while (($pos = strpos($str, $open, $pos)) !== false) {
 			$end = strpos($str, $close, $pos);

Braces +15 added lines, -7 removed lines

@@ -8,8 +8,9 @@ 
         $this->error = null;
         $tokens = $this->tokenize($tss);
 
-        foreach ($tokens as $token)
-            if (!$this->validateRule($token)) return false;
+        foreach ($tokens as $token) {
+                    if (!$this->validateRule($token)) return false;
+        }
 
         return true;
     }
@@ -19,7 +20,9 @@ 
     }
 
     private function validateRule($token) {
-        if ($token['type'] !== Tokenizer::OPEN_BRACE) return true;
+        if ($token['type'] !== Tokenizer::OPEN_BRACE) {
+        	return true;
+        }
 
         return $this->checkBraces($token) && $this->checkSemicolons($token)
             && $this->checkParenthesis($token);
@@ -32,8 +35,9 @@ 
     private function checkSemicolons($braceToken) {
         $splitTokens = $braceToken['value']->splitOnToken(Tokenizer::COLON);
         array_shift($splitTokens); array_pop($splitTokens);
-        foreach ($splitTokens as $tokens)
-            if (!in_array(Tokenizer::SEMI_COLON, array_column(iterator_to_array($tokens), 'type'))) return false;
+        foreach ($splitTokens as $tokens) {
+                    if (!in_array(Tokenizer::SEMI_COLON, array_column(iterator_to_array($tokens), 'type'))) return false;
+        }
 
         return true;
     }
@@ -43,7 +47,9 @@ 
     }
 
     private function tokenize($tss) {
-        if (is_file($tss)) $tss = file_get_contents($tss);
+        if (is_file($tss)) {
+        	$tss = file_get_contents($tss);
+        }
         $tss = $this->stripComments($tss, '//', "\n");
 		$tss = $this->stripComments($tss, '/*', '*/');
 		$tokenizer = new Tokenizer($tss);
@@ -54,7 +60,9 @@ 
 		$pos = 0;
 		while (($pos = strpos($str, $open, $pos)) !== false) {
 			$end = strpos($str, $close, $pos);
-			if ($end === false) break;
+			if ($end === false) {
+				break;
+			}
 			$str = substr_replace($str, '', $pos, $end-$pos+strlen($close));
 		}
 

src/Hook/PropertyHook.php

Indentation +4 added lines, -4 removed lines

@@ -10,7 +10,7 @@ 
 	private $rules;
 	private $configLine;
 	private $file;
-    private $filePath;
+	private $filePath;
 	private $line;
 	private $valueParser;
 	private $pseudoMatcher;
@@ -18,11 +18,11 @@ 
 	private $functionSet;
 
 	public function __construct(array $rules, &$configLine, $file, $line, PseudoMatcher $pseudoMatcher,
-            \Transphporm\Parser\Value $valueParser, \Transphporm\FunctionSet $functionSet, \Transphporm\FilePath $filePath) {
+			\Transphporm\Parser\Value $valueParser, \Transphporm\FunctionSet $functionSet, \Transphporm\FilePath $filePath) {
 		$this->rules = $rules;
 		$this->configLine = &$configLine;
 		$this->file = $file;
-        $this->filePath = $filePath;
+		$this->filePath = $filePath;
 		$this->line = $line;
 		$this->valueParser = $valueParser;
 		$this->pseudoMatcher = $pseudoMatcher;
@@ -30,7 +30,7 @@ 
 	}
 
 	public function run(\DomElement $element) {
-        if ($this->file !== null) $this->filePath->setBaseDir(dirname(realpath($this->file)) . DIRECTORY_SEPARATOR);
+		if ($this->file !== null) $this->filePath->setBaseDir(dirname(realpath($this->file)) . DIRECTORY_SEPARATOR);
 		$this->functionSet->setElement($element);
 		$this->configLine = $this->line;
 		try {

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 	}
 
 	public function run(\DomElement $element) {
-        if ($this->file !== null) $this->filePath->setBaseDir(dirname(realpath($this->file)) . DIRECTORY_SEPARATOR);
+        if ($this->file !== null) $this->filePath->setBaseDir(dirname(realpath($this->file)).DIRECTORY_SEPARATOR);
 		$this->functionSet->setElement($element);
 		$this->configLine = $this->line;
 		try {

Braces +14 added lines, -8 removed lines

@@ -30,15 +30,18 @@ 
 	}
 
 	public function run(\DomElement $element) {
-        if ($this->file !== null) $this->filePath->setBaseDir(dirname(realpath($this->file)) . DIRECTORY_SEPARATOR);
+        if ($this->file !== null) {
+        	$this->filePath->setBaseDir(dirname(realpath($this->file)) . DIRECTORY_SEPARATOR);
+        }
 		$this->functionSet->setElement($element);
 		$this->configLine = $this->line;
 		try {
 			//Don't run if there's a pseudo element like nth-child() and this element doesn't match it
-			if (!$this->pseudoMatcher->matches($element)) return;
+			if (!$this->pseudoMatcher->matches($element)) {
+				return;
+			}
 			$this->callProperties($element);
-		}
-		catch (\Transphporm\RunException $e) {
+		} catch (\Transphporm\RunException $e) {
 			throw new \Transphporm\Exception($e, $this->file, $this->line);
 		}
 	}
@@ -49,7 +52,9 @@ 
 	private function callProperties($element) {
 		foreach ($this->rules as $name => $value) {
 			$result = $this->callProperty($name, $element, $this->getArgs($value));
-			if ($result === false) break;
+			if ($result === false) {
+				break;
+			}
 		}
 	}
 	private function getArgs($value) {
@@ -64,9 +69,10 @@ 
 		if (isset($this->properties[$name])) {
 			try {
 				return $this->properties[$name]->run($value, $element, $this->rules, $this->pseudoMatcher, $this->properties);
-			}
-			catch (\Exception $e) {
-				if ($e instanceof \Transphporm\RunException) throw $e;
+			} catch (\Exception $e) {
+				if ($e instanceof \Transphporm\RunException) {
+					throw $e;
+				}
 				throw new \Transphporm\RunException(\Transphporm\Exception::PROPERTY, $name, $e);
 			}
 		}

src/FunctionSet.php

Braces +2 added lines, -4 removed lines

@@ -20,8 +20,7 @@ 
 			if (isset($this->functions[$name])) {
 				return $this->functions[$name]->run($this->getArgs0($name, $args), $this->element);
 			}
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 			throw new RunException(Exception::TSS_FUNCTION, $name, $e);
 		}
 		return false;
@@ -32,8 +31,7 @@ 
 			$tokens = $args[0];
 			$parser = new \Transphporm\Parser\Value($this);
 			return $parser->parseTokens($tokens, $this->elementData->getData($this->element));
-		}
-		else if ($args[0] instanceof Parser\Tokens) {
+		} else if ($args[0] instanceof Parser\Tokens) {
 			return iterator_to_array($args[0]);
 		}