Level-2 / Transphporm

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/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

@@ -58,7 +58,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 $name => $token) {
 			$this->{$this->tokenFuncs[$token['type']]}($token);
@@ -86,8 +88,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);
 		}
@@ -102,11 +103,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();
+			}
 		}
 	}
 
@@ -129,8 +131,7 @@ 
 		if ($this->hasFunction($this->last->read())
 			&& !$this->data->methodExists($this->last->read())) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
+		} else {
 			$this->last->processNested($this->getNewParser(), $token);
 		}
 	}
@@ -147,8 +148,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);
 

src/Config.php

Braces +9 added lines, -3 removed lines

@@ -68,7 +68,9 @@ 
 	}
 
     public function registerContentPseudo($name, Property\ContentPseudo $pseudo) {
-        if (isset($this->properties['content'])) $this->properties['content']->addContentPseudo($name, $pseudo);
+        if (isset($this->properties['content'])) {
+        	$this->properties['content']->addContentPseudo($name, $pseudo);
+        }
     }
 
 	public function registerPseudo(Pseudo $pseudo) {
@@ -76,12 +78,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;
 	}
 

Indentation +4 added lines, -4 removed lines

@@ -40,7 +40,7 @@ 
 	}
 
 	public function &getLine() {
-        $line = &$this->line;
+		$line = &$this->line;
 		return $line;
 	}
 
@@ -68,9 +68,9 @@ 
 		$this->properties[$name] = $property;
 	}
 
-    public function registerContentPseudo($name, Property\ContentPseudo $pseudo) {
-        if (isset($this->properties['content'])) $this->properties['content']->addContentPseudo($name, $pseudo);
-    }
+	public function registerContentPseudo($name, Property\ContentPseudo $pseudo) {
+		if (isset($this->properties['content'])) $this->properties['content']->addContentPseudo($name, $pseudo);
+	}
 
 	public function registerPseudo(Pseudo $pseudo) {
 		$this->pseudo[] = $pseudo;

src/Parser/CssToXpath.php

Doc Comments +3 added lines

@@ -13,6 +13,9 @@
 	private $functionSet;
 	private $id;
 
+	/**
+	 * @param string $id
+	 */
 	public function __construct(\Transphporm\FunctionSet $functionSet, $prefix = '', $id = null) {
 		$this->id = $id;
 		self::$instances[$this->id] = $this;

Braces +12 added lines, -4 removed lines

@@ -70,7 +70,9 @@ 
 				$selector->type = $token['type'];
 				$selectors[] = $selector;
 			}
-			if (isset($token['value'])) $selectors[count($selectors)-1]->string = $token['value'];
+			if (isset($token['value'])) {
+				$selectors[count($selectors)-1]->string = $token['value'];
+			}
 		}
 		return $selectors;
 	}
@@ -80,7 +82,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);
@@ -92,11 +96,15 @@ 
 		$tokens = new Tokens;
 		$split = $css->splitOnToken(Tokenizer::GREATER_THAN);
 
-		if (count($split) <= 1) return $css;
+		if (count($split) <= 1) {
+			return $css;
+		}
 
 		for ($i = 0; $i < count($split); $i++) {
 			$tokens->add($split[$i]->trim());
-			if (isset($split[$i+1])) $tokens->add(['type' => Tokenizer::GREATER_THAN]);
+			if (isset($split[$i+1])) {
+				$tokens->add(['type' => Tokenizer::GREATER_THAN]);
+			}
 		}
 		
 		return $tokens;

Spacing +8 added lines, -8 removed lines

@@ -19,13 +19,13 @@ 
 		$this->functionSet = $functionSet;
 
 		$this->translators = [
-			Tokenizer::WHITESPACE => function($string) use ($prefix) { return '//' . $prefix . $string;	},
-			Tokenizer::MULTIPLY => function () { return '*'; },
-			'' => function($string) use ($prefix) { return '/' . $prefix . $string;	},
-			Tokenizer::GREATER_THAN => function($string) use ($prefix) { return '/' . $prefix  . $string; },
-			Tokenizer::NUM_SIGN => function($string) { return '[@id=\'' . $string . '\']'; },
-			Tokenizer::DOT => function($string) { return '[contains(concat(\' \', normalize-space(@class), \' \'), \' ' . $string . ' \')]'; },
-			Tokenizer::OPEN_SQUARE_BRACKET => function($string) { return '[' .'php:function(\'\Transphporm\Parser\CssToXpath::processAttr\', \'' . base64_encode(serialize($string)) . '\', ., "' .  $this->id . '")' . ']';	}
+			Tokenizer::WHITESPACE => function($string) use ($prefix) { return '//'.$prefix.$string; },
+			Tokenizer::MULTIPLY => function() { return '*'; },
+			'' => function($string) use ($prefix) { return '/'.$prefix.$string; },
+			Tokenizer::GREATER_THAN => function($string) use ($prefix) { return '/'.$prefix.$string; },
+			Tokenizer::NUM_SIGN => function($string) { return '[@id=\''.$string.'\']'; },
+			Tokenizer::DOT => function($string) { return '[contains(concat(\' \', normalize-space(@class), \' \'), \' '.$string.' \')]'; },
+			Tokenizer::OPEN_SQUARE_BRACKET => function($string) { return '['.'php:function(\'\Transphporm\Parser\CssToXpath::processAttr\', \''.base64_encode(serialize($string)).'\', ., "'.$this->id.'")'.']'; }
 		];
 	}
 
@@ -44,7 +44,7 @@ 
 		$functionSet->setElement($element[0]);
 
 		$attributes = [];
-		foreach($element[0]->attributes as $name => $node) {
+		foreach ($element[0]->attributes as $name => $node) {
 			$attributes[$name] = $node->nodeValue;
 		}
 

src/Parser/Tokens.php

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,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;

Braces +30 added lines, -11 removed lines

@@ -39,8 +39,11 @@ 
 	}
 
 	public function add($token) {
-		if ($token instanceof Tokens) $this->tokens = array_merge($token->tokens);
-		else $this->tokens[] = $token;
+		if ($token instanceof Tokens) {
+			$this->tokens = array_merge($token->tokens);
+		} else {
+			$this->tokens[] = $token;
+		}
 	}
 
 
@@ -54,9 +57,13 @@ 
 
 	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 && isset($keys[$i]); $i++) $key = $keys[$i];
+		for ($i = 0; $key < $this->iterator && isset($keys[$i]); $i++) {
+			$key = $keys[$i];
+		}
 		return $key;
 	}
 
@@ -70,10 +77,17 @@ 
 
 	private function sliceTokens($tokenType, $type, $increment = false) {
 		$key = $this->getKeyToSlice($tokenType);
-		if ($key === false) return new Tokens([]);
-		if ($increment) $key++;
-		if ($type === "from") return new Tokens(array_slice($this->tokens, $key));
-		else return new Tokens(array_slice($this->tokens, $this->iterator, $key));
+		if ($key === false) {
+			return new Tokens([]);
+		}
+		if ($increment) {
+			$key++;
+		}
+		if ($type === "from") {
+			return new Tokens(array_slice($this->tokens, $key));
+		} else {
+			return new Tokens(array_slice($this->tokens, $this->iterator, $key));
+		}
 	}
 
 	public function skip($count) {
@@ -84,8 +98,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);
@@ -109,7 +126,9 @@ 
 
 	public function removeLine() {
 		$tokens = $this->tokens;
-		foreach ($tokens as &$token) unset($token['line']);
+		foreach ($tokens as &$token) {
+			unset($token['line']);
+		}
 		return new Tokens($tokens);
 	}
 

src/Parser/Tokenizer/TokenizedString.php

Spacing +5 added lines, -5 removed lines

@@ -55,21 +55,21 @@ 
 	}
 
 	public function read($offset = 0) {
-		return $this->str[$this->pos + $offset];
+		return $this->str[$this->pos+$offset];
 	}
 
 	public function identifyChar($offset = 0) {
-		$chr = $this->str[$this->pos + $offset];
+		$chr = $this->str[$this->pos+$offset];
 		if (!empty($this->chars[$chr])) return $this->chars[$chr];
 		else return Tokenizer::NAME;
 	}
 
 	public function has($offset = 0) {
-		return isset($this->str[$this->pos + $offset]);
+		return isset($this->str[$this->pos+$offset]);
 	}
 
 	public function pos($str) {
-		$pos = strpos($this->str,  $str, $this->pos);
+		$pos = strpos($this->str, $str, $this->pos);
 		return $pos ? $pos-$this->pos : false;
 	}
 
@@ -82,7 +82,7 @@ 
 	}
 
 	public function extractString($offset = 0) {
-		$pos = $this->pos + $offset;
+		$pos = $this->pos+$offset;
 		$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);

Braces +16 added lines, -6 removed lines

@@ -40,8 +40,11 @@ 
 	}
 
 	public function move($n) {
-		if ($n === false) $this->pos = strlen($this->str)-1;
-		else $this->pos += $n;
+		if ($n === false) {
+			$this->pos = strlen($this->str)-1;
+		} else {
+			$this->pos += $n;
+		}
 	}
 
 	public function next() {
@@ -60,8 +63,11 @@ 
 
 	public function identifyChar($offset = 0) {
 		$chr = $this->str[$this->pos + $offset];
-		if (!empty($this->chars[$chr])) return $this->chars[$chr];
-		else return Tokenizer::NAME;
+		if (!empty($this->chars[$chr])) {
+			return $this->chars[$chr];
+		} else {
+			return Tokenizer::NAME;
+		}
 	}
 
 	public function has($offset = 0) {
@@ -85,7 +91,9 @@ 
 		$pos = $this->pos + $offset;
 		$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);
 	}
@@ -95,7 +103,9 @@ 
 		$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);
 	}
 

src/Parser/Tokenizer/Brackets.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 
 class Brackets implements \Transphporm\Parser\Tokenize {
 
-	private $types =  [
+	private $types = [
 			Tokenizer::OPEN_BRACKET => ['(', ')'],
 			Tokenizer::OPEN_BRACE => ['{', '}'],
 			Tokenizer::OPEN_SQUARE_BRACKET => ['[', ']']

src/Parser/Tokenizer/Strings.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 			$chr = $str->read();
 			$string = $str->extractString();
 			$length = strlen($string)+1;
-			$string = str_replace('\\' . $chr, $chr, $string);
+			$string = str_replace('\\'.$chr, $chr, $string);
 			$tokens->add(['type' => Tokenizer::STRING, 'value' => $string, 'line' => $str->lineNo()]);
 			$str->move($length);
 		}