Level-2 / Transphporm

src/Pseudo/Attribute.php

Braces +3 added lines, -1 removed lines

@@ -7,7 +7,9 @@
 namespace Transphporm\Pseudo;
 class Attribute implements \Transphporm\Pseudo {
 	public function match($name, $args, \DomElement $element) {
-		if ($name === null) return true;
+		if ($name === null) {
+			return true;
+		}
 		return $args[0];
 	}
 }

src/Parser/Sheet.php

Indentation +9 added lines, -9 removed lines

@@ -104,15 +104,15 @@
 	}
 
 	private function getProperties($tokens) {
-        $rules = $tokens->splitOnToken(Tokenizer::SEMI_COLON);
+		$rules = $tokens->splitOnToken(Tokenizer::SEMI_COLON);
 
-        $return = [];
-        foreach ($rules as $rule) {
-            $name = $rule->from(Tokenizer::NAME, true)->to(Tokenizer::COLON)->read();
-            $tokens = $rule->from(Tokenizer::COLON)->trim();
-            if (count($tokens) > 0) $return[$name] = $rule->from(Tokenizer::COLON)->trim();
-        }
+		$return = [];
+		foreach ($rules as $rule) {
+			$name = $rule->from(Tokenizer::NAME, true)->to(Tokenizer::COLON)->read();
+			$tokens = $rule->from(Tokenizer::COLON)->trim();
+			if (count($tokens) > 0) $return[$name] = $rule->from(Tokenizer::COLON)->trim();
+		}
 
-        return $return;
-    }
+		return $return;
+	}
 }

Braces +17 added lines, -6 removed lines

@@ -25,7 +25,9 @@ 
 	}
 
 	public function parse($indexStart = 0) {
-		if (!empty($this->rules)) return $this->rules['rules'];
+		if (!empty($this->rules)) {
+			return $this->rules['rules'];
+		}
 		$rules = $this->parseTokens($indexStart);
 		$this->checkError($rules);
 		return $rules;
@@ -36,8 +38,9 @@ 
 		foreach (new TokenFilterIterator($this->tss, [Tokenizer::WHITESPACE]) as $token) {
 			if ($processing = $this->processingInstructions($token, count($this->rules)+$indexStart)) {
 				$this->rules = array_merge($this->rules, $processing);
+			} else if (!in_array($token['type'], [Tokenizer::NEW_LINE, Tokenizer::AT_SIGN])) {
+				$this->addRules($token, $indexStart++);
 			}
-			else if (!in_array($token['type'], [Tokenizer::NEW_LINE, Tokenizer::AT_SIGN])) $this->addRules($token, $indexStart++);
 		}
 
 		return $this->rules;
@@ -47,13 +50,17 @@ 
 		$selector = $this->tss->from($token['type'], true)->to(Tokenizer::OPEN_BRACE);
 
 		$this->tss->skip(count($selector));
-		if (count($selector) === 0) return;
+		if (count($selector) === 0) {
+			return;
+		}
 		$newRules = $this->cssToRules($selector, count($this->rules)+$indexStart, $this->getProperties($this->tss->current()['value']), $token['line']);
 		$this->rules = $this->writeRule($this->rules, $newRules);
 	}
 
 	private function checkError($rules) {
-		if (empty($rules) && count($this->tss) > 0) throw new \Exception('No TSS rules parsed');
+		if (empty($rules) && count($this->tss) > 0) {
+			throw new \Exception('No TSS rules parsed');
+		}
 	}
 
 	private function CssToRules($selector, $index, $properties, $line) {
@@ -80,7 +87,9 @@ 
 	}
 
 	private function processingInstructions($token, $indexStart) {
-		if ($token['type'] !== Tokenizer::AT_SIGN) return false;
+		if ($token['type'] !== Tokenizer::AT_SIGN) {
+			return false;
+		}
 		$tokens = $this->tss->from(Tokenizer::AT_SIGN, false)->to(Tokenizer::SEMI_COLON, false);
 		$funcName = $tokens->from(Tokenizer::NAME, true)->read();
 		$funcToks = $tokens->from(Tokenizer::NAME);
@@ -110,7 +119,9 @@ 
         foreach ($rules as $rule) {
             $name = $rule->from(Tokenizer::NAME, true)->to(Tokenizer::COLON)->read();
             $tokens = $rule->from(Tokenizer::COLON)->trim();
-            if (count($tokens) > 0) $return[$name] = $rule->from(Tokenizer::COLON)->trim();
+            if (count($tokens) > 0) {
+            	$return[$name] = $rule->from(Tokenizer::COLON)->trim();
+            }
         }
 
         return $return;

src/Parser/Tokenizer/Literals.php

Braces +13 added lines, -5 removed lines

@@ -36,8 +36,12 @@ 
 			$n--;
 		}
 
-		if ($n == 0) return false;
-		if (in_array($str->read($n), ['(', "\n", ' ', '['])) return true;
+		if ($n == 0) {
+			return false;
+		}
+		if (in_array($str->read($n), ['(', "\n", ' ', '['])) {
+			return true;
+		}
 
 		return false;
 	}
@@ -51,9 +55,13 @@ 
 	}
 
 	private function processLiterals($tokens, $name, $str) {
-		if (is_numeric($name)) $tokens->add(['type' => Tokenizer::NUMERIC, 'value' => $name]);
-		else if (method_exists($this, $name)) $this->$name($tokens);
-		else $tokens->add(['type' => Tokenizer::NAME, 'value' => $name, 'line' => $str->lineNo()]);
+		if (is_numeric($name)) {
+			$tokens->add(['type' => Tokenizer::NUMERIC, 'value' => $name]);
+		} else if (method_exists($this, $name)) {
+			$this->$name($tokens);
+		} else {
+			$tokens->add(['type' => Tokenizer::NAME, 'value' => $name, 'line' => $str->lineNo()]);
+		}
 	}
 
 	private function true($tokens) {

src/Hook/PseudoMatcher.php

Braces +31 added lines, -14 removed lines

@@ -25,8 +25,12 @@ 
 	public function matches($element) {
 		foreach ($this->pseudo as $i => $tokens) {
 			$parts = $this->getFuncParts($i, $tokens);
-			if ($parts['name'] === null) $parts['name'] = 'data';
-			if (!isset($this->functions[$parts['name']])) continue;
+			if ($parts['name'] === null) {
+				$parts['name'] = 'data';
+			}
+			if (!isset($this->functions[$parts['name']])) {
+				continue;
+			}
 			if ($this->match($parts, $this->functions[$parts['name']], $element) === false) {
 				return false;
 			}
@@ -38,14 +42,17 @@ 
 	private function match($parts, $function, $element) {
 		try {
 			$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);
 		}
 	}
 	private function getFuncParts($i, $tokens) {
-		if (isset($this->funcParts[$i])) return $this->funcParts[$i];
+		if (isset($this->funcParts[$i])) {
+			return $this->funcParts[$i];
+		}
 		$parts = [];
 		$canCache = true;
 		$parts['name'] = $this->getFuncName($tokens);
@@ -53,37 +60,47 @@ 
 			//If the args are dynamic, it can't be cached as it may change between calls
 			$canCache = false;
 			$parts['args'] = $this->valueParser->parseTokens($tokens);
-		}
-		else if (count($tokens) > 1) {
+		} else if (count($tokens) > 1) {
 			$tokens->rewind();
 			$tokens->next();
 			$this->skipWhitespace($tokens);
 			$parts['args'] = $this->valueParser->parseTokens($tokens->current()['value']);
+		} else {
+			$parts['args'] = [['']];
+		}
+		if ($canCache) {
+			$this->funcParts[$i] = $parts;
 		}
-		else $parts['args'] = [['']];
-		if ($canCache) $this->funcParts[$i] = $parts;
 		return $parts;
 	}
 
 	private function skipWhitespace($tokens) {
-		while ($tokens->current()['type'] === 'WHITESPACE' || $tokens->current()['type'] == 'NEWLINE') $tokens->next();
+		while ($tokens->current()['type'] === 'WHITESPACE' || $tokens->current()['type'] == 'NEWLINE') {
+			$tokens->next();
+		}
 	}
 
 	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 $i => $tokens) {
 			$parts = $this->getFuncParts($i, $tokens);
-			if ($name === $parts['name']) return $parts['args'];
+			if ($name === $parts['name']) {
+				return $parts['args'];
+			}
 		}
 	}
 }

src/Parser/TokenFilterIterator.php

Indentation +28 added lines, -28 removed lines

@@ -6,39 +6,39 @@
  * @version         1.2                                                             */
 namespace Transphporm\Parser;
 class TokenFilterIterator implements \Iterator {
-    private $ignore;
-    private $tokens;
+	private $ignore;
+	private $tokens;
 
-    public function __construct(Tokens $tokens, array $ignore) {
-        $this->ignore = $ignore;
-        $this->tokens = $tokens;
-    }
+	public function __construct(Tokens $tokens, array $ignore) {
+		$this->ignore = $ignore;
+		$this->tokens = $tokens;
+	}
 
-    public function current(): array {
-        return $this->tokens->current();
-    }
+	public function current(): array {
+		return $this->tokens->current();
+	}
 
-    public function key(): int {
-        return $this->tokens->key();
-    }
+	public function key(): int {
+		return $this->tokens->key();
+	}
 
-    public function valid(): bool {
-        return $this->tokens->valid();
-    }
+	public function valid(): bool {
+		return $this->tokens->valid();
+	}
 
-    public function next(): void {
-        do {
-            $this->tokens->next();
-        }
-        while ($this->shouldContinue());
-    }
+	public function next(): void {
+		do {
+			$this->tokens->next();
+		}
+		while ($this->shouldContinue());
+	}
 
-    public function rewind(): void {
-        $this->tokens->rewind();
-        while ($this->shouldContinue()) $this->tokens->next();
-    }
+	public function rewind(): void {
+		$this->tokens->rewind();
+		while ($this->shouldContinue()) $this->tokens->next();
+	}
 
-    private function shouldContinue() {
-        return $this->tokens->valid() && in_array($this->tokens->current()['type'], $this->ignore);
-    }
+	private function shouldContinue() {
+		return $this->tokens->valid() && in_array($this->tokens->current()['type'], $this->ignore);
+	}
 }

Braces +3 added lines, -1 removed lines

@@ -35,7 +35,9 @@
 
     public function rewind(): void {
         $this->tokens->rewind();
-        while ($this->shouldContinue()) $this->tokens->next();
+        while ($this->shouldContinue()) {
+        	$this->tokens->next();
+        }
     }
 
     private function shouldContinue() {

src/Module/Format.php

Spacing +2 added lines, -2 removed lines

@@ -15,8 +15,8 @@
 
 	private function getLocale() {
 		if (is_array($this->locale)) return $this->locale;
-		else if (strlen((string)$this->locale) > 0) return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . $this->locale . '.json'), true);
-		else return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . 'enGB.json'), true);
+		else if (strlen((string) $this->locale) > 0) return json_decode(file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'../Formatter'.DIRECTORY_SEPARATOR.'Locale'.DIRECTORY_SEPARATOR.$this->locale.'.json'), true);
+		else return json_decode(file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'../Formatter'.DIRECTORY_SEPARATOR.'Locale'.DIRECTORY_SEPARATOR.'enGB.json'), true);
 	}
 
 	public function load(\Transphporm\Config $config) {

Braces +7 added lines, -3 removed lines

@@ -14,9 +14,13 @@
 	}
 
 	private function getLocale() {
-		if (is_array($this->locale)) return $this->locale;
-		else if (strlen((string)$this->locale) > 0) return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . $this->locale . '.json'), true);
-		else return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . 'enGB.json'), true);
+		if (is_array($this->locale)) {
+			return $this->locale;
+		} else if (strlen((string)$this->locale) > 0) {
+			return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . $this->locale . '.json'), true);
+		} else {
+			return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . 'enGB.json'), true);
+		}
 	}
 
 	public function load(\Transphporm\Config $config) {

src/Property/Content.php

Braces +19 added lines, -10 removed lines

@@ -14,7 +14,9 @@ 
 	}
 
 	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);
 
@@ -25,14 +27,17 @@ 
 			if ($this->getContentMode($rules) === 'replace') {
 				$contentReplace = new ContentReplace($this);
 				$contentReplace->replaceContent($element, $values);
+			} else {
+				$this->appendContent($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;
@@ -59,9 +64,10 @@ 
 	public 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);
 			}
 		}
@@ -70,9 +76,10 @@ 
 	private function convertNode($node, $document) {
 		if ($node instanceof \DomElement || $node instanceof \DOMComment) {
 			$new = $document->importNode($node, true);
-		}
-		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 !== null ? $node : ''));
@@ -89,6 +96,8 @@ 
 	}
 
 	private function removeAllChildren($element) {
-		while ($element->hasChildNodes()) $element->removeChild($element->firstChild);
+		while ($element->hasChildNodes()) {
+			$element->removeChild($element->firstChild);
+		}
 	}
 }