Level-2 / Transphporm

src/Property/Repeat.php

Braces +12 added lines, -4 removed lines

@@ -15,14 +15,18 @@ 
 	}
 
 	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;
 
 		//What was this if statement for? removing it breaks nothing
 		//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
@@ -46,7 +50,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) {
@@ -55,7 +61,9 @@ 
 
 	private function createHook($newRules, $pseudoMatcher, $properties) {
 		$hook = new \Transphporm\Hook\PropertyHook($newRules, $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/Hook/Formatter.php

Braces +6 added lines, -2 removed lines

@@ -14,14 +14,18 @@
 	}
 
 	public function format($value, $rules) {
-		if (!isset($rules['format'])) return $value;
+		if (!isset($rules['format'])) {
+			return $value;
+		}
 
 		$tokenizer = new \Transphporm\Parser\Tokenizer($rules['format']);
 		$tokens = $tokenizer->getTokens();
 
 		$functionName = $tokens[0]['value'];
 		$options = [];
-		for ($i = 1; $i < count($tokens); $i++) $options[] = $tokens[$i]['value'];
+		for ($i = 1; $i < count($tokens); $i++) {
+			$options[] = $tokens[$i]['value'];
+		}
 
 		return $this->processFormat($options, $functionName, $value);		
 	}

src/Parser/CssToXpath.php

Spacing +7 added lines, -7 removed lines

@@ -20,12 +20,12 @@ 
 		$this->functionSet = $functionSet;
 
 		$this->translators = [
-			' ' => function($string) use ($prefix) { return '//' . $prefix . $string;	},
-			'' => function($string) use ($prefix) { return '/' . $prefix . $string;	},
-			'>' => function($string) use ($prefix) { return '/' . $prefix  . $string; },
-			'#' => function($string) { return '[@id=\'' . $string . '\']'; },
-			'.' => function($string) { return '[contains(concat(\' \', normalize-space(@class), \' \'), \' ' . $string . ' \')]'; },
-			'[' => function($string) use ($hash) { return '[' .'php:function(\'\Transphporm\Parser\CssToXpath::processAttr\', \'' . $string . '\', ., "' . $hash . '")' . ']';	},
+			' ' => function($string) use ($prefix) { return '//'.$prefix.$string; },
+			'' => function($string) use ($prefix) { return '/'.$prefix.$string; },
+			'>' => function($string) use ($prefix) { return '/'.$prefix.$string; },
+			'#' => function($string) { return '[@id=\''.$string.'\']'; },
+			'.' => function($string) { return '[contains(concat(\' \', normalize-space(@class), \' \'), \' '.$string.' \')]'; },
+			'[' => function($string) use ($hash) { return '['.'php:function(\'\Transphporm\Parser\CssToXpath::processAttr\', \''.$string.'\', ., "'.$hash.'")'.']'; },
 			']' => function() {	return ''; }
 		];
 	}
@@ -85,7 +85,7 @@ 
 	}
 
 	public function getXpath($css) {
-		$this->css = str_replace([' >', '> '],['>', '>'], trim($css));
+		$this->css = str_replace([' >', '> '], ['>', '>'], trim($css));
 		$css = explode(':', $this->css)[0];
 		$selectors = $this->split($css);
 		$xpath = '/';

Braces +10 added lines, -4 removed lines

@@ -63,8 +63,11 @@ 
 	}
 
 	private static function compare($comparator, $a, $b) {
-		if ($comparator == '=') return $a == $b;
-		else if ($comparator == '!=') return $a != $b;
+		if ($comparator == '=') {
+			return $a == $b;
+		} else if ($comparator == '!=') {
+			return $a != $b;
+		}
 	}
 
 	//split the css into indivudal functions
@@ -78,8 +81,9 @@ 
 				$selector = $this->createSelector();
 				$selector->type = $css[$i];
 				$selectors[] = $selector;
+			} else {
+				$selector->string .= $css[$i];
 			}
-			else $selector->string .= $css[$i];
 		}
 		return $selectors;
 	}
@@ -90,7 +94,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);

src/Parser/Value.php

Braces +20 added lines, -17 removed lines

@@ -50,7 +50,9 @@ 
 		$this->data = new ValueData($data);
 		$this->last = null;
 
-		if (empty($tokens)) return [$data];
+		if (empty($tokens)) {
+			return [$data];
+		}
 
 		foreach ($tokens as $token) {
 			$this->{$this->tokenFuncs[$token['type']]}($token);
@@ -65,8 +67,7 @@ 
 
 		if ($this->result->getMode() == Tokenizer::NOT && $token['type'] == Tokenizer::EQUALS) {
 			$this->result->setMode(Tokenizer::NOT);
-		}
-		else {
+		} else {
 			$this->result->setMode($token['type']);
 			$this->last = null;
 		}
@@ -75,13 +76,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);
 			}
@@ -94,9 +97,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];
 		}
 	}
@@ -118,8 +122,7 @@ 
 	private function processBrackets($token) {
 		if ($this->baseData instanceof \Transphporm\Functionset && $this->baseData->hasFunction($this->last)) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
+		} else {
 			$this->processNested($token);
 		}
 	}
@@ -136,7 +139,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;
@@ -148,12 +153,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/Pseudo/Nth.php

Braces +8 added lines, -3 removed lines

@@ -9,7 +9,9 @@ 
 class Nth implements \Transphporm\Pseudo {
 
 	public function match($name, $args, \DomElement $element) {
-		if ($name !== 'nth-child') return true;
+		if ($name !== 'nth-child') {
+			return true;
+		}
 
 		$criteria = $args[0];
 
@@ -18,8 +20,11 @@ 
 		$pseudo = $tokenizer->getTokens();
 		$num = end($pseudo)['value'][0]['value'];
 
-		if (is_callable([$this, $criteria])) return $this->$criteria($num);
-		else return $num == $criteria;
+		if (is_callable([$this, $criteria])) {
+			return $this->$criteria($num);
+		} else {
+			return $num == $criteria;
+		}
 	}
 
 	private function odd($num) {

src/Pseudo/Not.php

Braces +6 added lines, -2 removed lines

@@ -16,7 +16,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);
@@ -29,7 +31,9 @@ 
 			//Find all nodes matched by the expressions in the brackets :not(EXPR)
 			foreach ($xpath->query($xpathString) as $matchedElement) {
 				//Check to see whether this node was matched by the not query
-				if ($element->isSameNode($matchedElement)) return false;
+				if ($element->isSameNode($matchedElement)) {
+					return false;
+				}
 			}
 		}
 		return true;

src/Hook/PseudoMatcher.php

Braces +13 added lines, -5 removed lines

@@ -41,20 +41,26 @@ 
 		$parts['name'] = $this->getFuncName($tokens);
 		if ($parts['name'] === null || in_array($parts['name'], ['data', 'iteration', 'root'])) {
 			$parts['args'] = $this->valueParser->parseTokens($tokens, $this->functionSet);
+		} elseif (isset($tokens[1])) {
+			$parts['args'] = $this->valueParser->parseTokens($tokens[1]['value'], $this->functionSet);
+		} else {
+			$parts['args'] = [['']];
 		}
-		elseif (isset($tokens[1])) $parts['args'] = $this->valueParser->parseTokens($tokens[1]['value'], $this->functionSet);
-		else $parts['args'] = [['']];
 		return $parts;
 	}
 
 	private function getFuncName($tokens) {
-		if ($tokens[0]['type'] === Tokenizer::NAME) return $tokens[0]['value'];
+		if ($tokens[0]['type'] === Tokenizer::NAME) {
+			return $tokens[0]['value'];
+		}
 		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;
+			}
 		}
 	}
 
@@ -64,7 +70,9 @@ 
 
 		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/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', $element)[0]);
-		else if (strtolower($values[0]) === 'none') $element->setAttribute('transphporm', 'remove');
-		else $element->setAttribute('transphporm', 'show');
+		if ($pseudoMatcher->hasFunction('attr')) {
+			$element->removeAttribute($pseudoMatcher->getFuncArgs('attr', $element)[0]);
+		} else if (strtolower($values[0]) === 'none') {
+			$element->setAttribute('transphporm', 'remove');
+		} else {
+			$element->setAttribute('transphporm', 'show');
+		}
 	}
 }

src/Pseudo/Attribute.php

Braces +3 added lines, -1 removed lines

@@ -14,7 +14,9 @@
 	}
 
 	public function match($name, $args, \DomElement $element) {
-		if (!($name === null || in_array($name, ['data', 'iteration', 'root'])))  return true;
+		if (!($name === null || in_array($name, ['data', 'iteration', 'root']))) {
+			return true;
+		}
 		return $args[0];
 	}
 }