Level-2 / Transphporm

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/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]);
 		}
 

src/Pseudo/Not.php

Indentation +12 added lines, -12 removed lines

@@ -7,11 +7,11 @@ 
 namespace Transphporm\Pseudo;
 class Not implements \Transphporm\Pseudo {
 	private $cssToXpath;
-    private $config;
+	private $config;
 
 	public function __construct(\Transphporm\Parser\CssToXpath $cssToXpath, \Transphporm\Config $config) {
 		$this->cssToXpath = $cssToXpath;
-        $this->config = $config;
+		$this->config = $config;
 	}
 
 	public function match($name, $args, \DomElement $element) {
@@ -26,19 +26,19 @@ 
 		foreach ($css as $selector) {
 			$tokenizer = new \Transphporm\Parser\Tokenizer($selector);
 			$xpathString = $this->cssToXpath->getXpath($tokenizer->getTokens());
-            $pseudo = $this->cssToXpath->getPseudo($tokenizer->getTokens());
-            $pseudoMatcher = $this->config->createPseudoMatcher($pseudo);
+			$pseudo = $this->cssToXpath->getPseudo($tokenizer->getTokens());
+			$pseudoMatcher = $this->config->createPseudoMatcher($pseudo);
 			if ($this->matches($xpath->query($xpathString), $element, $pseudoMatcher)) return false;
 		}
 		return true;
 	}
 
-    private function matches($foundElements, $element, $pseudoMatcher) {
-        //Find all nodes matched by the expressions in the brackets :not(EXPR)
-        foreach ($foundElements as $matchedElement) {
-            //Check to see whether this node was matched by the not query
-            if ($pseudoMatcher->matches($matchedElement) && $element->isSameNode($matchedElement)) return true;
-        }
-        return false;
-    }
+	private function matches($foundElements, $element, $pseudoMatcher) {
+		//Find all nodes matched by the expressions in the brackets :not(EXPR)
+		foreach ($foundElements as $matchedElement) {
+			//Check to see whether this node was matched by the not query
+			if ($pseudoMatcher->matches($matchedElement) && $element->isSameNode($matchedElement)) return true;
+		}
+		return false;
+	}
 }

Braces +9 added lines, -3 removed lines

@@ -15,7 +15,9 @@ 
 	}
 
 	public function match($name, $args, \DomElement $element) {
-		if ($name !== 'not') return true;
+		if ($name !== 'not') {
+			return true;
+		}
 
 		$xpath = new \DomXpath($element->ownerDocument);
 		return $this->notElement($args, $xpath, $element);
@@ -28,7 +30,9 @@ 
 			$xpathString = $this->cssToXpath->getXpath($tokenizer->getTokens());
             $pseudo = $this->cssToXpath->getPseudo($tokenizer->getTokens());
             $pseudoMatcher = $this->config->createPseudoMatcher($pseudo);
-			if ($this->matches($xpath->query($xpathString), $element, $pseudoMatcher)) return false;
+			if ($this->matches($xpath->query($xpathString), $element, $pseudoMatcher)) {
+				return false;
+			}
 		}
 		return true;
 	}
@@ -37,7 +41,9 @@ 
         //Find all nodes matched by the expressions in the brackets :not(EXPR)
         foreach ($foundElements as $matchedElement) {
             //Check to see whether this node was matched by the not query
-            if ($pseudoMatcher->matches($matchedElement) && $element->isSameNode($matchedElement)) return true;
+            if ($pseudoMatcher->matches($matchedElement) && $element->isSameNode($matchedElement)) {
+            	return true;
+            }
         }
         return false;
     }

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;
@@ -31,7 +31,7 @@ 
 
 	public function run(\DomElement $element) {
 		//Set the baseDir so that all files for this rule are relative to the file it came from
-        if ($this->file !== null) $this->filePath->setBaseDir(dirname(realpath($this->file)));
+		if ($this->file !== null) $this->filePath->setBaseDir(dirname(realpath($this->file)));
 		$this->functionSet->setElement($element);
 		$this->configLine = $this->line;
 		try {

Braces +14 added lines, -8 removed lines

@@ -31,15 +31,18 @@ 
 
 	public function run(\DomElement $element) {
 		//Set the baseDir so that all files for this rule are relative to the file it came from
-        if ($this->file !== null) $this->filePath->setBaseDir(dirname(realpath($this->file)));
+        if ($this->file !== null) {
+        	$this->filePath->setBaseDir(dirname(realpath($this->file)));
+        }
 		$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);
 		}
 	}
@@ -50,7 +53,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) {
@@ -65,9 +70,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/Parser/ValueData.php

Spacing +1 added lines, -1 removed lines

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

Braces +25 added lines, -11 removed lines

@@ -15,13 +15,17 @@ 
 
 	//Read $key from array, $this->data = $this->data[$key] but also works for objects
 	private function traverseInto($key) {
-		if (isset($this->data->{$key})) $this->data = $this->data->{$key};
-		else if ($this->isArray() && isset($this->data[$key])) $this->data = $this->data[$key];
+		if (isset($this->data->{$key})) {
+			$this->data = $this->data->{$key};
+		} else if ($this->isArray() && isset($this->data[$key])) {
+			$this->data = $this->data[$key];
+		}
 	}
 
 	public function traverse($key, $result) {
-		if ($key !== null) $this->traverseInto($key);
-		else {
+		if ($key !== null) {
+			$this->traverseInto($key);
+		} else {
 			//But if the key is null, replace the data structure with the result of the last function call
 			$lastResult = $result->pop();
 			if ($lastResult) {
@@ -41,10 +45,14 @@ 
 
 	public function read($value) {
 		if ($this->isArray()) {
-			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 null;
 		}
-		else if (isset($this->data->$value)) return $this->data->$value;
-		else return null;
 	}
 
 	public function call($func, $args) {
@@ -57,14 +65,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/FilePath.php

Spacing +3 added lines, -3 removed lines

@@ -14,15 +14,15 @@
 
 	public function getFilePath($filePath) {
 		if (is_file($filePath)) return $filePath;
-		else if (is_file($this->baseDir . DIRECTORY_SEPARATOR . $filePath)) return $this->baseDir . DIRECTORY_SEPARATOR . $filePath;
+		else if (is_file($this->baseDir.DIRECTORY_SEPARATOR.$filePath)) return $this->baseDir.DIRECTORY_SEPARATOR.$filePath;
 		else return $this->loadFromPaths($filePath);
 	}
 
 	private function loadFromPaths($filePath) {
 		foreach ($this->paths as $path) {
-			if (is_file($path . DIRECTORY_SEPARATOR . $filePath)) return $path . DIRECTORY_SEPARATOR . $filePath;
+			if (is_file($path.DIRECTORY_SEPARATOR.$filePath)) return $path.DIRECTORY_SEPARATOR.$filePath;
 		}
 
-		throw new \Exception($filePath . ' not found in include path: ' . implode(';', $this->paths));
+		throw new \Exception($filePath.' not found in include path: '.implode(';', $this->paths));
 	}
 }

Braces +10 added lines, -4 removed lines

@@ -13,14 +13,20 @@
 	}
 
 	public function getFilePath($filePath) {
-		if (is_file($filePath)) return $filePath;
-		else if (is_file($this->baseDir . DIRECTORY_SEPARATOR . $filePath)) return $this->baseDir . DIRECTORY_SEPARATOR . $filePath;
-		else return $this->loadFromPaths($filePath);
+		if (is_file($filePath)) {
+			return $filePath;
+		} else if (is_file($this->baseDir . DIRECTORY_SEPARATOR . $filePath)) {
+			return $this->baseDir . DIRECTORY_SEPARATOR . $filePath;
+		} else {
+			return $this->loadFromPaths($filePath);
+		}
 	}
 
 	private function loadFromPaths($filePath) {
 		foreach ($this->paths as $path) {
-			if (is_file($path . DIRECTORY_SEPARATOR . $filePath)) return $path . DIRECTORY_SEPARATOR . $filePath;
+			if (is_file($path . DIRECTORY_SEPARATOR . $filePath)) {
+				return $path . DIRECTORY_SEPARATOR . $filePath;
+			}
 		}
 
 		throw new \Exception($filePath . ' not found in include path: ' . implode(';', $this->paths));

src/Parser/Last.php

Indentation +3 added lines, -3 removed lines

@@ -53,9 +53,9 @@
 		$this->last = $value;
 	}
 
-    public function makeTraversing() {
-        $this->traversing = true;
-    }
+	public function makeTraversing() {
+		$this->traversing = true;
+	}
 
 	//Applies the current operation to whatever is in $last based on $mode
 	public function process() {

Braces +2 added lines, -4 removed lines

@@ -63,8 +63,7 @@ 
 			try {
 				$value = $this->data->extract($this->last, $this->autoLookup, $this->traversing);
 				$this->result->processValue($value);
-			}
-			catch (\UnexpectedValueException $e) {
+			} catch (\UnexpectedValueException $e) {
 				$this->processLastUnexpected();
 			}
 		}
@@ -73,8 +72,7 @@ 
 	private function processLastUnexpected() {
 		if (!($this->autoLookup || $this->traversing)) {
 			$this->result->processValue($this->last);
-		}
-		else {
+		} else {
 			$this->result->clear();
 			$this->result->processValue(false);
 		}

src/Parser/Value.php

Indentation +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
 		}
 		else $parsedVal = null;
         
-        $this->result->postProcess($this->data, $val, $parsedVal, $this->allowNullResult);
+		$this->result->postProcess($this->data, $val, $parsedVal, $this->allowNullResult);
 
 		$this->last->clear();
 	}

Spacing +1 added lines, -1 removed lines

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

Braces +11 added lines, -9 removed lines

@@ -56,7 +56,9 @@ 
 		$this->last = new Last($this->data, $this->result, $this->autoLookup);
 		$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->last->makeTraversing();
-		}
-		else if ($this->last->isEmpty())  {
+		} else if ($this->last->isEmpty())  {
 			$this->processString(['value' => '.']);
 			$this->result->setMode(Tokenizer::CONCAT);
 		}
@@ -100,11 +101,12 @@ 
 	private function processSquareBracket($token) {
 		if ($this->hasFunction($this->last->read())) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
+		} else {
 			$this->last->traverse();
 			$this->last->set($this->getNewParser()->parseTokens($token['value'], null)[0]);
-			if (!is_bool($this->last->read())) $this->last->makeTraversing();
+			if (!is_bool($this->last->read())) {
+				$this->last->makeTraversing();
+			}
 		}
 	}
 
@@ -127,8 +129,7 @@ 
 		if ($this->hasFunction($this->last->read())
 			&& !$this->data->methodExists($this->last->read())) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
+		} else {
 			$this->last->processNested($this->getNewParser(), $token);
 		}
 	}
@@ -145,8 +146,9 @@ 
 			$parser = new Value($this->data->getData());
 			$parsedArr = $parser->parse($val);
 			$parsedVal = isset($parsedArr[0]) ? $parsedArr[0] : null;
+		} else {
+			$parsedVal = null;
 		}
-		else $parsedVal = null;
         
         $this->result->postProcess($this->data, $val, $parsedVal, $this->allowNullResult);