Level-2 / Transphporm

src/Hook/PropertyHook.php

Braces +9 added lines, -3 removed lines

@@ -20,11 +20,15 @@ 
 
 	public function run(\DomElement $element) {	
 		//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;
+		}
 
 		foreach ($this->rules as $name => $value) {
 			$result = $this->callProperty($name, $element, $this->valueParser->parse(trim($value), $element));
-			if ($result === false) break;
+			if ($result === false) {
+				break;
+			}
 		}
 	}
 
@@ -45,7 +49,9 @@ 
 	}
 
 	private function callProperty($name, $element, $value) {
-		if (isset($this->properties[$name])) return $this->properties[$name]->run($value, $element, $this->rules, $this->pseudoMatcher, $this->properties);
+		if (isset($this->properties[$name])) {
+			return $this->properties[$name]->run($value, $element, $this->rules, $this->pseudoMatcher, $this->properties);
+		}
 		return false;
 	}
 }

src/Parser/Tokenizer.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,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];
 			return $length;
 		}

Braces +35 added lines, -14 removed lines

@@ -69,8 +69,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) {
@@ -93,10 +96,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];
+		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];
+		}
 	}
 
 	private function doBrackets(&$tokens, $char, $i) {
@@ -130,7 +138,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);
 	}
@@ -139,19 +149,27 @@ 
 		$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;
+		}
 	}
 
 	public function serialize($tokens) {
@@ -169,8 +187,11 @@ 
 
 	private function serializeValue($token) {
 		if (isset($token['value'])) {
-			if ($token['value'] instanceof Tokens) return $this->serialize($token['value']);
-			else return $token['value'];	
+			if ($token['value'] instanceof Tokens) {
+				return $this->serialize($token['value']);
+			} else {
+				return $token['value'];
+			}
 		}			
 	}
 }

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/Parser/CssToXpath.php

Braces +9 added lines, -3 removed lines

@@ -69,7 +69,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;
 	}
@@ -79,7 +81,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);
@@ -90,7 +94,9 @@ 
 	private function removeSpacesFromDirectDecend($css) {
 		$tokens = [];
 		foreach ($css->splitOnToken(Tokenizer::GREATER_THAN) as $token) {
-			foreach ($token->trim() as $t) $tokens[]  = $t;
+			foreach ($token->trim() as $t) {
+				$tokens[]  = $t;
+			}
 			$tokens[] = ['type' => Tokenizer::GREATER_THAN];
 		}
 		return new Tokens(array_slice($tokens, 0, -1));

src/Property/Content.php

Braces +22 added lines, -11 removed lines

@@ -15,21 +15,28 @@ 
 	}
 
 	public function run(array $values, \DomElement $element, array $rules, \Transphporm\Hook\PseudoMatcher $pseudoMatcher, array $properties = []) {
-		if (!$this->shouldRun($element)) return false;
+		if (!$this->shouldRun($element)) {
+			return false;
+		}
 		$values = $this->formatter->format($values, $rules);
 
 		if (!$this->processPseudo($values, $element, $pseudoMatcher)) {
 			//Remove the current contents
 			$this->removeAllChildren($element);
 			//Now make a text node
-			if ($this->getContentMode($rules) === 'replace') $this->replaceContent($element, $values);
-			else $this->appendContent($element, $values);
+			if ($this->getContentMode($rules) === 'replace') {
+				$this->replaceContent($element, $values);
+			} else {
+				$this->appendContent($element, $values);
+			}
 		}
 	}
 
 	private function shouldRun($element) {
 		do {
-			if ($element->getAttribute('transphporm') == 'includedtemplate') return false;
+			if ($element->getAttribute('transphporm') == 'includedtemplate') {
+				return false;
+			}
 		}
 		while (($element = $element->parentNode) instanceof \DomElement);
 		return true;
@@ -53,9 +60,10 @@ 
 	private function getNode($node, $document) {
 		foreach ($node as $n) {
 			if (is_array($n)) {
-				foreach ($this->getNode($n, $document) as $new) yield $new;
-			}
-			else {
+				foreach ($this->getNode($n, $document) as $new) {
+					yield $new;
+				}
+			} else {
 				yield $this->convertNode($n, $document);
 			}
 		}
@@ -66,9 +74,10 @@ 
 			$new = $document->importNode($node, true);
 			//Removing this might cause problems with caching...
 			//$new->setAttribute('transphporm', 'added');
-		}
-		else {
-			if ($node instanceof \DomText) $node = $node->nodeValue;
+		} else {
+			if ($node instanceof \DomText) {
+				$node = $node->nodeValue;
+			}
 			$new = $document->createElement('text');
 
 			$new->appendChild($document->createTextNode($node));
@@ -114,6 +123,8 @@ 
 	}
 
 	private function removeAllChildren($element) {
-		while ($element->hasChildNodes()) $element->removeChild($element->firstChild);
+		while ($element->hasChildNodes()) {
+			$element->removeChild($element->firstChild);
+		}
 	}
 }