Level-2 / Transphporm

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/TSSFunction/Template.php

Indentation +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 	private function getTemplateContent($newNode, $tss) {
 		$result = [];
 		foreach ($newNode->childNodes as $node) {
-            if (isset($node->tagName) && $node->tagName === 'template') $result[] = $this->getTemplateContent($node, $tss);
+			if (isset($node->tagName) && $node->tagName === 'template') $result[] = $this->getTemplateContent($node, $tss);
 			else $result[] = $this->getClonedElement($node, $tss);
 		}
 		return $result;

Braces +16 added lines, -6 removed lines

@@ -25,13 +25,18 @@ 
 		$selector = $this->readArray($args, 1);
 		$tss = $this->readArray($args, 2);
 
-		if (trim($args[0])[0] === '<') $xml = $args[0];
-		else $xml = $this->filePath->getFilePath($args[0]);
+		if (trim($args[0])[0] === '<') {
+			$xml = $args[0];
+		} else {
+			$xml = $this->filePath->getFilePath($args[0]);
+		}
 
 		$newTemplate = new \Transphporm\Builder($xml, $tss ? $this->filePath->getFilePath($tss) : null);
 
 		$doc = $newTemplate->output($this->elementData->getData($element), true)->body;
-		if ($selector != '') return $this->templateSubsection($doc, $selector);
+		if ($selector != '') {
+			return $this->templateSubsection($doc, $selector);
+		}
 
 		return $this->getTemplateContent($doc->documentElement, $tss);
 	}
@@ -39,8 +44,11 @@ 
 	private function getTemplateContent($newNode, $tss) {
 		$result = [];
 		foreach ($newNode->childNodes as $node) {
-            if (isset($node->tagName) && $node->tagName === 'template') $result[] = $this->getTemplateContent($node, $tss);
-			else $result[] = $this->getClonedElement($node, $tss);
+            if (isset($node->tagName) && $node->tagName === 'template') {
+            	$result[] = $this->getTemplateContent($node, $tss);
+            } else {
+				$result[] = $this->getClonedElement($node, $tss);
+			}
 		}
 		return $result;
 	}
@@ -59,7 +67,9 @@ 
 
 	private function getClonedElement($node, $tss) {
 		$clone = $node->cloneNode(true);
-		if ($tss != null && $clone instanceof \DomElement) $clone->setAttribute('transphporm', 'includedtemplate');
+		if ($tss != null && $clone instanceof \DomElement) {
+			$clone->setAttribute('transphporm', 'includedtemplate');
+		}
 		return $clone;
 	}
 }

src/TSSFunction/Data.php

Braces +5 added lines, -2 removed lines

@@ -18,8 +18,11 @@
 	}
 
 	public function run(array $args, \DomElement $element = null) {
-		if ($this->dataKey === "root") $data = $this->data->getData(null, 'data');
-		else $data = $this->data->getData($element, $this->dataKey);
+		if ($this->dataKey === "root") {
+			$data = $this->data->getData(null, 'data');
+		} else {
+			$data = $this->data->getData($element, $this->dataKey);
+		}
 		$parser = new \Transphporm\Parser\Value($this->functionSet, true, true);
 		$return = $parser->parseTokens(new \Transphporm\Parser\Tokens($args), $data);
 		return $return[0];

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
  * @version         1.2                                                             */
 namespace Transphporm\TSSFunction;
 /* Handles data() and iteration() function calls from the stylesheet */
-class Data implements \Transphporm\TSSFunction{
+class Data implements \Transphporm\TSSFunction {
 	private $data;
 	private $dataKey;
 	private $functionSet;

src/Pseudo/Not.php

Indentation +12 added lines, -12 removed lines

@@ -7,11 +7,11 @@ 
 namespace Transphporm\Pseudo;
 class Not implements \Transphporm\Pseudo {
 	private $cssToXpath;
-    private $config;
+	private $config;
 
 	public function __construct(\Transphporm\Parser\CssToXpath $cssToXpath, \Transphporm\Config $config) {
 		$this->cssToXpath = $cssToXpath;
-        $this->config = $config;
+		$this->config = $config;
 	}
 
 	public function match($name, $args, \DomElement $element) {
@@ -26,19 +26,19 @@ 
 		foreach ($css as $selector) {
 			$tokenizer = new \Transphporm\Parser\Tokenizer($selector);
 			$xpathString = $this->cssToXpath->getXpath($tokenizer->getTokens());
-            $pseudo = $this->cssToXpath->getPseudo($tokenizer->getTokens());
-            $pseudoMatcher = $this->config->createPseudoMatcher($pseudo);
+			$pseudo = $this->cssToXpath->getPseudo($tokenizer->getTokens());
+			$pseudoMatcher = $this->config->createPseudoMatcher($pseudo);
 			if ($this->matches($xpath->query($xpathString), $element, $pseudoMatcher)) return false;
 		}
 		return true;
 	}
 
-    private function matches($foundElements, $element, $pseudoMatcher) {
-        //Find all nodes matched by the expressions in the brackets :not(EXPR)
-        foreach ($foundElements as $matchedElement) {
-            //Check to see whether this node was matched by the not query
-            if ($pseudoMatcher->matches($matchedElement) && $element->isSameNode($matchedElement)) return true;
-        }
-        return false;
-    }
+	private function matches($foundElements, $element, $pseudoMatcher) {
+		//Find all nodes matched by the expressions in the brackets :not(EXPR)
+		foreach ($foundElements as $matchedElement) {
+			//Check to see whether this node was matched by the not query
+			if ($pseudoMatcher->matches($matchedElement) && $element->isSameNode($matchedElement)) return true;
+		}
+		return false;
+	}
 }

Braces +9 added lines, -3 removed lines

@@ -15,7 +15,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);
@@ -28,7 +30,9 @@ 
 			$xpathString = $this->cssToXpath->getXpath($tokenizer->getTokens());
             $pseudo = $this->cssToXpath->getPseudo($tokenizer->getTokens());
             $pseudoMatcher = $this->config->createPseudoMatcher($pseudo);
-			if ($this->matches($xpath->query($xpathString), $element, $pseudoMatcher)) return false;
+			if ($this->matches($xpath->query($xpathString), $element, $pseudoMatcher)) {
+				return false;
+			}
 		}
 		return true;
 	}
@@ -37,7 +41,9 @@ 
         //Find all nodes matched by the expressions in the brackets :not(EXPR)
         foreach ($foundElements as $matchedElement) {
             //Check to see whether this node was matched by the not query
-            if ($pseudoMatcher->matches($matchedElement) && $element->isSameNode($matchedElement)) return true;
+            if ($pseudoMatcher->matches($matchedElement) && $element->isSameNode($matchedElement)) {
+            	return true;
+            }
         }
         return false;
     }

src/Hook/PropertyHook.php

Indentation +4 added lines, -4 removed lines

@@ -10,7 +10,7 @@ 
 	private $rules;
 	private $configLine;
 	private $file;
-    private $filePath;
+	private $filePath;
 	private $line;
 	private $valueParser;
 	private $pseudoMatcher;
@@ -18,11 +18,11 @@ 
 	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;
-        $this->filePath = $filePath;
+		$this->filePath = $filePath;
 		$this->line = $line;
 		$this->valueParser = $valueParser;
 		$this->pseudoMatcher = $pseudoMatcher;
@@ -31,7 +31,7 @@ 
 
 	public function run(\DomElement $element) {
 		//Set the baseDir so that all files for this rule are relative to the file it came from
-        if ($this->file !== null) $this->filePath->setBaseDir(dirname(realpath($this->file)));
+		if ($this->file !== null) $this->filePath->setBaseDir(dirname(realpath($this->file)));
 		$this->functionSet->setElement($element);
 		$this->configLine = $this->line;
 		try {

Braces +14 added lines, -8 removed lines

@@ -31,15 +31,18 @@ 
 
 	public function run(\DomElement $element) {
 		//Set the baseDir so that all files for this rule are relative to the file it came from
-        if ($this->file !== null) $this->filePath->setBaseDir(dirname(realpath($this->file)));
+        if ($this->file !== null) {
+        	$this->filePath->setBaseDir(dirname(realpath($this->file)));
+        }
 		$this->functionSet->setElement($element);
 		$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);
 		}
 	}
@@ -50,7 +53,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) {
@@ -65,9 +70,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/Formatter/Date.php

Spacing +5 added lines, -5 removed lines

@@ -16,7 +16,7 @@ 
 	/** Converts $val into a \DateTime object if it's not already */
 	private function getDate($val) {
 		$tz = new \DateTimeZone($this->locale['timezone']);
-		$date =  $val instanceof \DateTimeInterface ? $val : new \DateTime($val, $tz);
+		$date = $val instanceof \DateTimeInterface ? $val : new \DateTime($val, $tz);
 		$date->setTimeZone($tz);
 		return $date;
 	}
@@ -35,7 +35,7 @@ 
 
 	/** Formats \DateTime as Date and Time using formats from $locale */
 	public function dateTime($val) {
-		return $this->date($val, $this->locale['date_format'] . ' ' . $this->locale['time_format']);
+		return $this->date($val, $this->locale['date_format'].' '.$this->locale['time_format']);
 	}
 
 	/** Generates relative time offsets based on system clock. e.g "10 minutes ago" or "In 6 months"
@@ -47,7 +47,7 @@ 
 		$diff = $now->diff($date);
 
 
-		$diffDays = $diff->invert === 1 ? $diff->days : 0- $diff->days;
+		$diffDays = $diff->invert === 1 ? $diff->days : 0-$diff->days;
 
 		if ($diffDays !== 0) return $this->dayOffset($diffDays);
 		else return $this->timeOffset($diff);
@@ -75,7 +75,7 @@ 
 
 	/** Gets date ranges to represent uses of weeks/months/days/etc */
 	private function getRanges($strings) {
-		$ranges =  [
+		$ranges = [
 			[1, 1, $strings['yesterday'], 1, ''],
 			[1, 13, $strings['past'], 1, 'days'],
 			[13, 28, $strings['past'], 7, 'weeks'],
@@ -94,7 +94,7 @@ 
 
 	/** Converts "week" to "weeks", "month" to "months" etc when plural is required using language from $locale */
 	private function getPlural($strings, $num, $interval) {
-		if ($interval !== '') return $num == 1 ? $strings[$interval . '_singular'] : $strings[$interval . '_plural'];
+		if ($interval !== '') return $num == 1 ? $strings[$interval.'_singular'] : $strings[$interval.'_plural'];
 		else return '';
 	}
 

Indentation +4 added lines, -4 removed lines

@@ -92,10 +92,10 @@
 		return $ranges;
 	}
 
-    private function add2DayRanges(&$ranges, $property, $when) {
-        $rangeVal = $when === "before" ? 2 : -2;
-        array_unshift($ranges, [$rangeVal, $rangeVal, $property, 1, '']);
-    }
+	private function add2DayRanges(&$ranges, $property, $when) {
+		$rangeVal = $when === "before" ? 2 : -2;
+		array_unshift($ranges, [$rangeVal, $rangeVal, $property, 1, '']);
+	}
 
 	/** Converts "week" to "weeks", "month" to "months" etc when plural is required using language from $locale */
 	private function getPlural($strings, $num, $interval) {

Braces +16 added lines, -6 removed lines

@@ -49,8 +49,11 @@ 
 
 		$diffDays = $diff->invert === 1 ? $diff->days : 0- $diff->days;
 
-		if ($diffDays !== 0) return $this->dayOffset($diffDays);
-		else return $this->timeOffset($diff);
+		if ($diffDays !== 0) {
+			return $this->dayOffset($diffDays);
+		} else {
+			return $this->timeOffset($diff);
+		}
 	}
 
 	/** Calculates offset in hours/minutes/seconds */
@@ -87,8 +90,12 @@ 
 			[-365, -28, $strings['future'], 28, 'months'],
 			[-999999, -365, $strings['future'], 365, 'years'],
 		];
-		if (isset($strings['day_before_yesterday'])) $this->add2DayRanges($ranges, $strings['day_before_yesterday'], "before");
-		if (isset($strings['day_after_tomorrow'])) $this->add2DayRanges($ranges, $strings['day_after_tomorrow'], "after");
+		if (isset($strings['day_before_yesterday'])) {
+			$this->add2DayRanges($ranges, $strings['day_before_yesterday'], "before");
+		}
+		if (isset($strings['day_after_tomorrow'])) {
+			$this->add2DayRanges($ranges, $strings['day_after_tomorrow'], "after");
+		}
 		return $ranges;
 	}
 
@@ -99,8 +106,11 @@ 
 
 	/** Converts "week" to "weeks", "month" to "months" etc when plural is required using language from $locale */
 	private function getPlural($strings, $num, $interval) {
-		if ($interval !== '') return $num == 1 ? $strings[$interval . '_singular'] : $strings[$interval . '_plural'];
-		else return '';
+		if ($interval !== '') {
+			return $num == 1 ? $strings[$interval . '_singular'] : $strings[$interval . '_plural'];
+		} else {
+			return '';
+		}
 	}
 
 	/** Calculates offset in days/weeks/month/years */

src/Parser/ValueData.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 
 	public function extract($last, $autoLookup, $traversing) {
 		$value = $this->read($last);
-		if ($value !== null && ($autoLookup || $traversing) ) {
+		if ($value !== null && ($autoLookup || $traversing)) {
 			return $value;
 		}
 		throw new \UnexpectedValueException('Not found');

Braces +25 added lines, -11 removed lines

@@ -15,13 +15,17 @@ 
 
 	//Read $key from array, $this->data = $this->data[$key] but also works for objects
 	private function traverseInto($key) {
-		if (isset($this->data->{$key})) $this->data = $this->data->{$key};
-		else if ($this->isArray() && isset($this->data[$key])) $this->data = $this->data[$key];
+		if (isset($this->data->{$key})) {
+			$this->data = $this->data->{$key};
+		} else if ($this->isArray() && isset($this->data[$key])) {
+			$this->data = $this->data[$key];
+		}
 	}
 
 	public function traverse($key, $result) {
-		if ($key !== null) $this->traverseInto($key);
-		else {
+		if ($key !== null) {
+			$this->traverseInto($key);
+		} else {
 			//But if the key is null, replace the data structure with the result of the last function call
 			$lastResult = $result->pop();
 			if ($lastResult) {
@@ -41,10 +45,14 @@ 
 
 	public function read($value) {
 		if ($this->isArray()) {
-			if (isset($this->data[$value])) return $this->data[$value];
+			if (isset($this->data[$value])) {
+				return $this->data[$value];
+			}
+		} else if (isset($this->data->$value)) {
+			return $this->data->$value;
+		} else {
+			return null;
 		}
-		else if (isset($this->data->$value)) return $this->data->$value;
-		else return null;
 	}
 
 	public function call($func, $args) {
@@ -57,14 +65,20 @@ 
 
 	public function parseNested($parser, $token, $funcName) {
 		$args = $parser->parseTokens($token['value'], $this->data);
-		if ($args[0] === $this->data) $args = [];
+		if ($args[0] === $this->data) {
+			$args = [];
+		}
 		return $this->callFuncOnObject($this->data, $funcName, $args);
 	}
 
 	private function callFuncOnObject($obj, $func, $args) {
-		if (isset($obj->$func) && is_callable($obj->$func)) return call_user_func_array($obj->$func, $args);
-		else if (is_callable([$obj, $func])) return call_user_func_array([$obj, $func], $args);
-		else return false;
+		if (isset($obj->$func) && is_callable($obj->$func)) {
+			return call_user_func_array($obj->$func, $args);
+		} else if (is_callable([$obj, $func])) {
+			return call_user_func_array([$obj, $func], $args);
+		} else {
+			return false;
+		}
 	}
 
 	public function extract($last, $autoLookup, $traversing) {

src/Parser/Last.php

Indentation +3 added lines, -3 removed lines

@@ -53,9 +53,9 @@
 		$this->last = $value;
 	}
 
-    public function makeTraversing() {
-        $this->traversing = true;
-    }
+	public function makeTraversing() {
+		$this->traversing = true;
+	}
 
 	//Applies the current operation to whatever is in $last based on $mode
 	public function process() {

Braces +2 added lines, -4 removed lines

@@ -63,8 +63,7 @@ 
 			try {
 				$value = $this->data->extract($this->last, $this->autoLookup, $this->traversing);
 				$this->result->processValue($value);
-			}
-			catch (\UnexpectedValueException $e) {
+			} catch (\UnexpectedValueException $e) {
 				$this->processLastUnexpected();
 			}
 		}
@@ -73,8 +72,7 @@ 
 	private function processLastUnexpected() {
 		if (!($this->autoLookup || $this->traversing)) {
 			$this->result->processValue($this->last);
-		}
-		else {
+		} else {
 			$this->result->clear();
 			$this->result->processValue(false);
 		}

src/Parser/Value.php

Indentation +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
 		}
 		else $parsedVal = null;
         
-        $this->result->postProcess($this->data, $val, $parsedVal, $this->allowNullResult);
+		$this->result->postProcess($this->data, $val, $parsedVal, $this->allowNullResult);
 
 		$this->last->clear();
 	}

Spacing +1 added lines, -1 removed lines

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

Braces +11 added lines, -9 removed lines

@@ -58,7 +58,9 @@ 
 		$this->last = new Last($this->data, $this->result, $this->autoLookup);
 		$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 $name => $token) {
 			$this->{$this->tokenFuncs[$token['type']]}($token);
@@ -86,8 +88,7 @@ 
 		// foo.bar is treated as looking up `bar` in `foo` whereas .foo is treated as the string ".foo"
 		if ($lastResult) {
 			$this->last->makeTraversing();
-		}
-		else if ($this->last->isEmpty())  {
+		} else if ($this->last->isEmpty())  {
 			$this->processString(['value' => '.']);
 			$this->result->setMode(Tokenizer::CONCAT);
 		}
@@ -102,11 +103,12 @@ 
 	private function processSquareBracket($token) {
 		if ($this->hasFunction($this->last->read())) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
+		} else {
 			$this->last->traverse();
 			$this->last->set($this->getNewParser()->parseTokens($token['value'], null)[0]);
-			if (!is_bool($this->last->read())) $this->last->makeTraversing();
+			if (!is_bool($this->last->read())) {
+				$this->last->makeTraversing();
+			}
 		}
 	}
 
@@ -129,8 +131,7 @@ 
 		if ($this->hasFunction($this->last->read())
 			&& !$this->data->methodExists($this->last->read())) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
+		} else {
 			$this->last->processNested($this->getNewParser(), $token);
 		}
 	}
@@ -147,8 +148,9 @@ 
 			$parser = new Value($this->data->getData());
 			$parsedArr = $parser->parse($val);
 			$parsedVal = isset($parsedArr[0]) ? $parsedArr[0] : null;
+		} else {
+			$parsedVal = null;
 		}
-		else $parsedVal = null;
         
         $this->result->postProcess($this->data, $val, $parsedVal, $this->allowNullResult);