Level-2 / Transphporm

src/FunctionSet.php

Braces +2 added lines, -4 removed lines

@@ -21,15 +21,13 @@
 				$tokens = $args[0];
 				$parser = new \Transphporm\Parser\Value($this);
 				$args[0] = $parser->parseTokens($tokens, $this->elementData->getData($this->element));
-			}
-			else if ($args[0] instanceof Parser\Tokens) {
+			} else if ($args[0] instanceof Parser\Tokens) {
 				$args[0] = iterator_to_array($args[0]);
 			}
 			if (isset($this->functions[$name])) {
 				return $this->functions[$name]->run($args[0], $this->element);
 			}
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 			throw new RunException(Exception::TSS_FUNCTION, $name, $e);
 		}
 		return true;

src/Parser/Tokenizer.php

Braces +35 added lines, -14 removed lines

@@ -70,8 +70,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) {
@@ -94,10 +97,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) {
@@ -131,7 +139,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);
 	}
@@ -140,19 +150,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) {
@@ -170,8 +188,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/Sheet.php

Braces +21 added lines, -9 removed lines

@@ -31,14 +31,15 @@ 
 				$this->tss->skip($processing['skip']+1);
 				$rules = array_merge($rules, $processing['rules']);
 				continue;
-			}
-			else if ($token['type'] === Tokenizer::NEW_LINE) {
+			} else if ($token['type'] === Tokenizer::NEW_LINE) {
 				$line++;
 				continue;
 			}
 			$selector = $this->tss->from($token['type'], true)->to(Tokenizer::OPEN_BRACE);
 			$this->tss->skip(count($selector));
-			if (count($selector) === 0) break;
+			if (count($selector) === 0) {
+				break;
+			}
 
 			$newRules = $this->cssToRules($selector, count($rules)+$indexStart, $this->getProperties($this->tss->current()['value']), $line);
 			$rules = $this->writeRule($rules, $newRules);
@@ -49,7 +50,9 @@ 
 	}
 
 	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) {
@@ -76,7 +79,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();
 		$args = $this->valueParser->parseTokens($tokens->from(Tokenizer::NAME));
@@ -86,15 +91,20 @@ 
 	}
 
 	private function import($args, $indexStart) {
-		if ($this->file !== null) $fileName = dirname(realpath($this->file)) . DIRECTORY_SEPARATOR . $args[0];
-		else $fileName = $args[0];
+		if ($this->file !== null) {
+			$fileName = dirname(realpath($this->file)) . DIRECTORY_SEPARATOR . $args[0];
+		} else {
+			$fileName = $args[0];
+		}
 		$sheet = new Sheet(file_get_contents($fileName), $fileName, $this->xPath, $this->valueParser);
 		return $sheet->parse($indexStart);
 	}
 
 	private function sortRules($a, $b) {
 		//If they have the same depth, compare on index
-		if ($a->depth === $b->depth) return $a->index < $b->index ? -1 : 1;
+		if ($a->depth === $b->depth) {
+			return $a->index < $b->index ? -1 : 1;
+		}
 
 		return ($a->depth < $b->depth) ? -1 : 1;
 	}
@@ -103,7 +113,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/Hook/PseudoMatcher.php

Braces +13 added lines, -8 removed lines

@@ -28,8 +28,7 @@ 
 				try {
 					$parts = $this->getFuncParts($tokens);
 					$matches = $matches && $function->match($parts['name'], $parts['args'], $element);
-				}
-				catch (\Exception $e) {
+				} catch (\Exception $e) {
 					throw new \Transphporm\RunException(\Transphporm\Exception::PSEUDO, $parts['name'], $e);
 				}
 			}
@@ -42,31 +41,37 @@ 
 		$parts['name'] = $this->getFuncName($tokens);
 		if ($parts['name'] === null || in_array($parts['name'], ['data', 'iteration', 'root'])) {
 			$parts['args'] = $this->valueParser->parseTokens($tokens);
-		}
-		else if (count($tokens) > 1) {
+		} else if (count($tokens) > 1) {
 			$tokens->rewind();
 			$tokens->next();
 			$parts['args'] = $this->valueParser->parseTokens($tokens->current()['value']);
+		} else {
+			$parts['args'] = [['']];
 		}
-		else $parts['args'] = [['']];
 		return $parts;
 	}
 
 	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 $tokens) {
 			$parts = $this->getFuncParts($tokens);
-			if ($name === $parts['name']) return $parts['args'];
+			if ($name === $parts['name']) {
+				return $parts['args'];
+			}
 		}
 	}
 }

src/Hook/Formatter.php

Braces +7 added lines, -4 removed lines

@@ -14,7 +14,9 @@ 
 	}
 
 	public function format($value, $rules) {
-		if (!isset($rules['format'])) return $value;
+		if (!isset($rules['format'])) {
+			return $value;
+		}
 		$tokens = $rules['format'];
 
 		$functionName = $tokens->from(\Transphporm\Parser\Tokenizer::NAME, true)->read();
@@ -27,8 +29,7 @@ 
 
 		try {
 			return $this->processFormat($options, $functionName, $value);
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 			throw new \Transphporm\RunException(\Transphporm\Exception::FORMATTER, $functionName, $e);
 		}
 	}
@@ -43,7 +44,9 @@ 
 				}
 			}
 		}
-		if (!$functionExists) throw new \Exception("Formatter '$functionName' does not exist");
+		if (!$functionExists) {
+			throw new \Exception("Formatter '$functionName' does not exist");
+		}
 		return $value;
 	}
 }

src/Hook/PropertyHook.php

Braces +14 added lines, -8 removed lines

@@ -30,11 +30,15 @@ 
 
 	public function run(\DomElement $element) {
 		$this->functionSet->setElement($element);
-		if ($this->file !== null) $this->baseDir = dirname(realpath($this->file)) . DIRECTORY_SEPARATOR;
+		if ($this->file !== null) {
+			$this->baseDir = dirname(realpath($this->file)) . DIRECTORY_SEPARATOR;
+		}
 		$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;
+			}
 
 			// TODO: Have all rule values parsed before running them so that things like `content-append` are not expecting tokens
 			// problem with this is that anything in data changed by run properties is not shown
@@ -42,10 +46,11 @@ 
 
 			foreach ($this->rules as $name => $value) {
 				$result = $this->callProperty($name, $element, $this->getArgs($value));
-				if ($result === false) break;
+				if ($result === false) {
+					break;
+				}
 			}
-		}
-		catch (\Transphporm\RunException $e) {
+		} catch (\Transphporm\RunException $e) {
 			throw new \Transphporm\Exception($e, $this->file, $this->line);
 		}
 	}
@@ -62,9 +67,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/Pseudo/Nth.php

Braces +10 added lines, -4 removed lines

@@ -11,14 +11,20 @@
 
 	public function match($name, $args, \DomElement $element) {
 
-		if ($name !== 'nth-child') return true;
+		if ($name !== 'nth-child') {
+			return true;
+		}
 
 		$this->count++;
 		$criteria = $args[0];
 
-		if (is_callable([$this, $criteria])) return $this->$criteria($this->count);
-		else if (!is_numeric($criteria)) throw new \Exception("Argument passed to 'nth-child' must be 'odd', 'even', or of type int");
-		else return $this->count == $criteria;
+		if (is_callable([$this, $criteria])) {
+			return $this->$criteria($this->count);
+		} else if (!is_numeric($criteria)) {
+			throw new \Exception("Argument passed to 'nth-child' must be 'odd', 'even', or of type int");
+		} else {
+			return $this->count == $criteria;
+		}
 	}
 
 	private function odd($num) {

src/Builder.php

Braces +18 added lines, -7 removed lines

@@ -26,7 +26,9 @@ 
 		$this->cache = new Cache(new \ArrayObject());
 
 		$modules = is_array($modules) ? $modules : $this->defaultModules;
-		foreach ($modules as $module) $this->loadModule(new $module);
+		foreach ($modules as $module) {
+			$this->loadModule(new $module);
+		}
 	}
 
 	//Allow setting the time used by Transphporm for caching. This is for testing purposes
@@ -51,7 +53,9 @@ 
 		$valueParser = new Parser\Value($data);
 		$config = new Config($data, $valueParser, $elementData, new Hook\Formatter(), new Parser\CssToXpath($data, $template->getPrefix()), $headers, $this->baseDir);
 
-		foreach ($this->modules as $module) $module->load($config);
+		foreach ($this->modules as $module) {
+			$module->load($config);
+		}
 
 		$this->processRules($template, $config);
 
@@ -66,7 +70,9 @@ 
 		$rules = $this->getRules($template, $config);
 
 		foreach ($rules as $rule) {
-			if ($rule->shouldRun($this->time)) $this->executeTssRule($rule, $template, $config);
+			if ($rule->shouldRun($this->time)) {
+				$this->executeTssRule($rule, $template, $config);
+			}
 		}
 	}
 
@@ -91,8 +97,9 @@ 
 		if (trim($this->template)[0] !== '<') {
 			$xml = $this->cache->load($this->template, filemtime($this->template));
 			return $xml ? $xml : ['body' => file_get_contents($this->template), 'headers' => []];
+		} else {
+			return ['body' => $this->template, 'headers' => []];
 		}
-		else return ['body' => $this->template, 'headers' => []];
 	}
 
 	//Load the TSS rules either from a file or as a string
@@ -107,10 +114,14 @@ 
 			//Try to load the cached rules, if not set in the cache (or expired) parse the supplied sheet
 			$rules = $this->cache->load($key, filemtime($this->tss));
 
-			if (!$rules) return $this->cache->write($key, (new Parser\Sheet(file_get_contents($this->tss), $this->tss, $config->getCssToXpath(), $config->getValueParser()))->parse());
-			else return $rules;
+			if (!$rules) {
+				return $this->cache->write($key, (new Parser\Sheet(file_get_contents($this->tss), $this->tss, $config->getCssToXpath(), $config->getValueParser()))->parse());
+			} else {
+				return $rules;
+			}
+		} else {
+			return (new Parser\Sheet($this->tss, $this->baseDir, $config->getCssToXpath(), $config->getValueParser()))->parse();
 		}
-		else return (new Parser\Sheet($this->tss, $this->baseDir, $config->getCssToXpath(), $config->getValueParser()))->parse();
 	}
 
 	public function setCache(\ArrayAccess $cache) {