Level-2 / Transphporm

src/Template.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
 				$this->save = function($content = null) {
 					return $this->document->saveHtml($content);
 				};
-				$this->document->loadHtml('<' . '?xml encoding="UTF-8">' .$doc,  LIBXML_HTML_NODEFDTD | LIBXML_HTML_NOIMPLIED);
+				$this->document->loadHtml('<'.'?xml encoding="UTF-8">'.$doc, LIBXML_HTML_NODEFDTD | LIBXML_HTML_NOIMPLIED);
 
 				if (strpos($doc, '<!') !== 0) {
 					$templateNode = $this->document->getElementsByTagName('template')[0];
@@ -88,7 +88,7 @@ 
 		 //Either return a whole DomDocument or return the output HTML
 		if ($document) return $this->document;
 
-		$output = ($this->document->doctype) ? call_user_func($this->save, $this->document->doctype) . "\n" : '';
+		$output = ($this->document->doctype) ? call_user_func($this->save, $this->document->doctype)."\n" : '';
 
 		if ($this->document->documentElement->tagName !== 'template') $output .= call_user_func($this->save, $this->document->documentElement);
 		else $output = $this->printDocument();

Braces +14 added lines, -5 removed lines

@@ -66,7 +66,9 @@ 
 	/** Loops through all assigned hooks, runs the Xpath query and calls the hook */
 	private function processHooks() {
 		foreach ($this->hooks as list($query, $hook)) {
-			foreach ($this->xpath->query($query) as $element) $hook->run($element);
+			foreach ($this->xpath->query($query) as $element) {
+				$hook->run($element);
+			}
 		}
 		$this->hooks = [];
 	}
@@ -74,7 +76,9 @@ 
 	/** Prints out the current DomDocument as HTML */
 	private function printDocument() {
 		$output = '';
-		foreach ($this->document->documentElement->childNodes as $node) $output .= call_user_func($this->save, $node);
+		foreach ($this->document->documentElement->childNodes as $node) {
+			$output .= call_user_func($this->save, $node);
+		}
 		return $output;
 	}
 
@@ -86,12 +90,17 @@ 
 		//Generate the document by taking only the childnodes of the template, ignoring the <template> and </template> tags
 		//TODO: Is there a faster way of doing this without string manipulation on the output or this loop through childnodes?
 		 //Either return a whole DomDocument or return the output HTML
-		if ($document) return $this->document;
+		if ($document) {
+			return $this->document;
+		}
 
 		$output = ($this->document->doctype) ? call_user_func($this->save, $this->document->doctype) . "\n" : '';
 
-		if ($this->document->documentElement->tagName !== 'template') $output .= call_user_func($this->save, $this->document->documentElement);
-		else $output = $this->printDocument();
+		if ($this->document->documentElement->tagName !== 'template') {
+			$output .= call_user_func($this->save, $this->document->documentElement);
+		} else {
+			$output = $this->printDocument();
+		}
 
 		//repair empty tags. Browsers break on <script /> and <div /> so can't avoid LIBXML_NOEMPTYTAG but they also break on <base></base> so repair them
 		$output = str_replace(['></img>', '></br>', '></meta>', '></base>', '></link>', '></hr>', '></input>'], ' />', $output);

src/Pseudo/Nth.php

Braces +12 added lines, -4 removed lines

@@ -11,25 +11,33 @@
 	private $lastParentNode;
 
 	public function match($name, $args, \DomElement $element) {
-		if ($element->parentNode !== $this->lastParentNode) $this->count = 0;
+		if ($element->parentNode !== $this->lastParentNode) {
+			$this->count = 0;
+		}
 
 		$this->lastParentNode = $element->parentNode;
 
 
 
-		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);
+		if (is_callable([$this, $criteria])) {
+			return $this->$criteria($this->count);
+		}
 		$this->assert(is_numeric($criteria), "Argument passed to 'nth-child' must be 'odd', 'even', or of type int");
 		return $this->count == $criteria;
 	}
 
 	//TODO: Abstract assertions throughout
 	private function assert($condition, $error) {
-		if (!$condition) throw new \Exception($error);
+		if (!$condition) {
+			throw new \Exception($error);
+		}
 	}
 
 	private function odd($num) {

src/Parser/Value.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 		if ($lastResult) {
 			$this->traversing = true;
 		}
-		else if ($this->last === null)  {
+		else if ($this->last === null) {
 			$this->processString(['value' => '.']);
 			$this->result->setMode(Tokenizer::CONCAT);
 		}

Braces +11 added lines, -12 removed lines

@@ -56,7 +56,9 @@ 
 		$this->last = null;
 		$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 $token) {
 			$this->{$this->tokenFuncs[$token['type']]}($token);
@@ -84,8 +86,7 @@ 
 		// foo.bar is treated as looking up `bar` in `foo` whereas .foo is treated as the string ".foo"
 		if ($lastResult) {
 			$this->traversing = true;
-		}
-		else if ($this->last === null)  {
+		} else if ($this->last === null)  {
 			$this->processString(['value' => '.']);
 			$this->result->setMode(Tokenizer::CONCAT);
 		}
@@ -101,11 +102,12 @@ 
 		$parser = new Value($this->baseData, $this->autoLookup);
 		if ($this->hasFunction($this->last)) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
+		} else {
 			$this->data->traverse($this->last, $this->result);
 			$this->last = $parser->parseTokens($token['value'], null)[0];
-			if (!is_bool($this->last)) $this->traversing = true;
+			if (!is_bool($this->last)) {
+				$this->traversing = true;
+			}
 		}
 	}
 
@@ -125,8 +127,7 @@ 
 		if ($this->hasFunction($this->last)
 			&& !$this->data->methodExists($this->last)) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
+		} else {
 			$this->processNested($token);
 		}
 	}
@@ -156,8 +157,7 @@ 
 			try {
 				$value = $this->data->extract($this->last, $this->autoLookup, $this->traversing);
 				$this->result->processValue($value);
-			}
-			catch (\UnexpectedValueException $e) {
+			} catch (\UnexpectedValueException $e) {
 				$this->processLastUnexpected();
 			}
 		}
@@ -166,8 +166,7 @@ 
 	private function processLastUnexpected() {
 		if (!($this->autoLookup || $this->traversing)) {
 			$this->result->processValue($this->last);
-		}
-		else {
+		} else {
 			$this->result->clear();
 			$this->result->write(0, false);
 		}

src/Hook/PseudoMatcher.php

Braces +19 added lines, -10 removed lines

@@ -25,7 +25,9 @@ 
 		foreach ($this->pseudo as $tokens) {
 			foreach ($this->functions as $function) {
 				$matches = $this->match($tokens, $function, $element);
-				if ($matches === false) return false;
+				if ($matches === false) {
+					return false;
+				}
 			}
 		}
 		return true;
@@ -35,9 +37,10 @@ 
 		try {
 			$parts = $this->getFuncParts($tokens);
 			$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);
 		}
 	}
@@ -46,31 +49,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/Property/Repeat.php

Doc Comments +12 added lines

@@ -11,6 +11,9 @@ 
 	private $line;
     private $filePath;
 
+	/**
+	 * @param integer $line
+	 */
 	public function __construct(\Transphporm\FunctionSet $functionSet, \Transphporm\Hook\ElementData $elementData, &$line, \Transphporm\FilePath $filePath) {
 		$this->functionSet = $functionSet;
 		$this->elementData = $elementData;
@@ -58,6 +61,12 @@ 
 		return $value;
 	}
 
+	/**
+	 * @param \DOMElement $element
+	 * @param integer $count
+	 *
+	 * @return \DOMElement
+	 */
 	private function cloneElement($element, $iteration, $key, $count) {
 		$clone = $element->cloneNode(true);
 		$this->tagElement($clone, $count);
@@ -77,6 +86,9 @@ 
 		return isset($values[1]) ? $values[1] : PHP_INT_MAX;
 	}
 
+	/**
+	 * @param \Transphporm\Hook\PseudoMatcher $pseudoMatcher
+	 */
 	private function createHook($newRules, $pseudoMatcher, $properties) {
 		$hook = new \Transphporm\Hook\PropertyHook($newRules, $this->line, null, $this->line, $pseudoMatcher, new \Transphporm\Parser\Value($this->functionSet), $this->functionSet, $this->filePath);
 		foreach ($properties as $name => $property) $hook->registerProperty($name, $property);

Indentation +2 added lines, -2 removed lines

@@ -9,13 +9,13 @@
 	private $functionSet;
 	private $elementData;
 	private $line;
-    private $filePath;
+	private $filePath;
 
 	public function __construct(\Transphporm\FunctionSet $functionSet, \Transphporm\Hook\ElementData $elementData, &$line, \Transphporm\FilePath $filePath) {
 		$this->functionSet = $functionSet;
 		$this->elementData = $elementData;
 		$this->line = &$line;
-        $this->filePath = $filePath;
+		$this->filePath = $filePath;
 	}
 
 	public function run(array $values, \DomElement $element, array $rules, \Transphporm\Hook\PseudoMatcher $pseudoMatcher, array $properties = []) {

Braces +18 added lines, -7 removed lines

@@ -20,7 +20,9 @@ 
 
 	public function run(array $values, \DomElement $element, array $rules, \Transphporm\Hook\PseudoMatcher $pseudoMatcher, array $properties = []) {
 		$values = $this->fixEmpty($values);
-		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;
 		$repeat = $this->getRepeatValue($values, $max);
@@ -29,7 +31,9 @@ 
 		$hook = $this->createHook($rules, $pseudoMatcher, $properties);
 
 		foreach ($repeat 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
 			$hook->run($clone);
@@ -41,8 +45,9 @@ 
 
 	private function getRepeatValue($values, &$max) {
 		$mode = $this->getMode($values);
-		if ($mode === 'each') $repeat = $values[0];
-		else if ($mode === 'loop') {
+		if ($mode === 'each') {
+			$repeat = $values[0];
+		} else if ($mode === 'loop') {
 			$repeat = range($values[0], $max);
 			$max++;
 		}
@@ -54,7 +59,9 @@ 
 	}
 
 	private function fixEmpty($value) {
-		if (empty($value[0])) $value[0] = [];
+		if (empty($value[0])) {
+			$value[0] = [];
+		}
 		return $value;
 	}
 
@@ -70,7 +77,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) {
@@ -79,7 +88,9 @@ 
 
 	private function createHook($newRules, $pseudoMatcher, $properties) {
 		$hook = new \Transphporm\Hook\PropertyHook($newRules, $this->line, null, $this->line, $pseudoMatcher, new \Transphporm\Parser\Value($this->functionSet), $this->functionSet, $this->filePath);
-		foreach ($properties as $name => $property) $hook->registerProperty($name, $property);
+		foreach ($properties as $name => $property) {
+			$hook->registerProperty($name, $property);
+		}
 		return $hook;
 	}
 }

src/Hook/PropertyHook.php

Indentation +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 	private $functionSet;
 
 	public function __construct(array $rules, &$configLine, $file, $line, PseudoMatcher $pseudoMatcher,
-            \Transphporm\Parser\Value $valueParser, \Transphporm\FunctionSet $functionSet, \Transphporm\FilePath $filePath) {
+			\Transphporm\Parser\Value $valueParser, \Transphporm\FunctionSet $functionSet, \Transphporm\FilePath $filePath) {
 		$this->rules = $rules;
 		$this->configLine = &$configLine;
 		$this->file = $file;

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 		$this->valueParser = $valueParser;
 		$this->pseudoMatcher = $pseudoMatcher;
 		$this->functionSet = $functionSet;
-		if ($this->file !== null) $filePath->setBaseDir(dirname(realpath($this->file)) . DIRECTORY_SEPARATOR);
+		if ($this->file !== null) $filePath->setBaseDir(dirname(realpath($this->file)).DIRECTORY_SEPARATOR);
 	}
 
 	public function run(\DomElement $element) {

Braces +14 added lines, -8 removed lines

@@ -25,7 +25,9 @@ 
 		$this->valueParser = $valueParser;
 		$this->pseudoMatcher = $pseudoMatcher;
 		$this->functionSet = $functionSet;
-		if ($this->file !== null) $filePath->setBaseDir(dirname(realpath($this->file)) . DIRECTORY_SEPARATOR);
+		if ($this->file !== null) {
+			$filePath->setBaseDir(dirname(realpath($this->file)) . DIRECTORY_SEPARATOR);
+		}
 	}
 
 	public function run(\DomElement $element) {
@@ -33,10 +35,11 @@ 
 		$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;
+			}
 			$this->callProperties($element);
-		}
-		catch (\Transphporm\RunException $e) {
+		} catch (\Transphporm\RunException $e) {
 			throw new \Transphporm\Exception($e, $this->file, $this->line);
 		}
 	}
@@ -47,7 +50,9 @@ 
 	private function callProperties($element) {
 		foreach ($this->rules as $name => $value) {
 			$result = $this->callProperty($name, $element, $this->getArgs($value));
-			if ($result === false) break;
+			if ($result === false) {
+				break;
+			}
 		}
 	}
 	private function getArgs($value) {
@@ -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/Parser/Last.php

Braces +5 added lines, -6 removed lines

@@ -28,8 +28,9 @@ 
 
 
 	public function traverse() {
-		if ($this->last !== null) $this->data->traverse($this->last);
-		else {
+		if ($this->last !== null) {
+			$this->data->traverse($this->last);
+		} else {
 			$lastResult = $this->result->pop();
 			if ($lastResult) {
 				$this->data = new ValueData($lastResult);
@@ -67,8 +68,7 @@ 
 			try {
 				$value = $this->data->extract($this->last, $this->autoLookup, $this->traversing);
 				$this->result->processValue($value);
-			}
-			catch (\UnexpectedValueException $e) {
+			} catch (\UnexpectedValueException $e) {
 				$this->processLastUnexpected();
 			}
 		}
@@ -77,8 +77,7 @@ 
 	private function processLastUnexpected() {
 		if (!($this->autoLookup || $this->traversing)) {
 			$this->result->processValue($this->last);
-		}
-		else {
+		} else {
 			$this->result->clear();
 			$this->result[0] = false;
 		}