Level-2 / Transphporm

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/FilePath.php

Spacing +3 added lines, -3 removed lines

@@ -14,15 +14,15 @@
 
 	public function getFilePath($filePath) {
 		if (is_file($filePath)) return $filePath;
-		else if (is_file($this->baseDir . DIRECTORY_SEPARATOR . $filePath)) return $this->baseDir . DIRECTORY_SEPARATOR . $filePath;
+		else if (is_file($this->baseDir.DIRECTORY_SEPARATOR.$filePath)) return $this->baseDir.DIRECTORY_SEPARATOR.$filePath;
 		else return $this->loadFromPaths($filePath);
 	}
 
 	private function loadFromPaths($filePath) {
 		foreach ($this->paths as $path) {
-			if (is_file($path . DIRECTORY_SEPARATOR . $filePath)) return $path . DIRECTORY_SEPARATOR . $filePath;
+			if (is_file($path.DIRECTORY_SEPARATOR.$filePath)) return $path.DIRECTORY_SEPARATOR.$filePath;
 		}
 
-		throw new \Exception($filePath . ' not found in include path: ' . implode(';', $this->paths));
+		throw new \Exception($filePath.' not found in include path: '.implode(';', $this->paths));
 	}
 }

Braces +10 added lines, -4 removed lines

@@ -13,14 +13,20 @@
 	}
 
 	public function getFilePath($filePath) {
-		if (is_file($filePath)) return $filePath;
-		else if (is_file($this->baseDir . DIRECTORY_SEPARATOR . $filePath)) return $this->baseDir . DIRECTORY_SEPARATOR . $filePath;
-		else return $this->loadFromPaths($filePath);
+		if (is_file($filePath)) {
+			return $filePath;
+		} else if (is_file($this->baseDir . DIRECTORY_SEPARATOR . $filePath)) {
+			return $this->baseDir . DIRECTORY_SEPARATOR . $filePath;
+		} else {
+			return $this->loadFromPaths($filePath);
+		}
 	}
 
 	private function loadFromPaths($filePath) {
 		foreach ($this->paths as $path) {
-			if (is_file($path . DIRECTORY_SEPARATOR . $filePath)) return $path . DIRECTORY_SEPARATOR . $filePath;
+			if (is_file($path . DIRECTORY_SEPARATOR . $filePath)) {
+				return $path . DIRECTORY_SEPARATOR . $filePath;
+			}
 		}
 
 		throw new \Exception($filePath . ' not found in include path: ' . implode(';', $this->paths));

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

@@ -56,7 +56,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 $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->last->makeTraversing();
-		}
-		else if ($this->last->isEmpty())  {
+		} else if ($this->last->isEmpty())  {
 			$this->processString(['value' => '.']);
 			$this->result->setMode(Tokenizer::CONCAT);
 		}
@@ -100,11 +101,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();
+			}
 		}
 	}
 
@@ -127,8 +129,7 @@ 
 		if ($this->hasFunction($this->last->read())
 			&& !$this->data->methodExists($this->last->read())) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
+		} else {
 			$this->last->processNested($this->getNewParser(), $token);
 		}
 	}
@@ -145,8 +146,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);
 

src/Property/ContentPseudo.php

Indentation +1 added lines, -1 removed lines

@@ -2,5 +2,5 @@
 namespace Transphporm\Property;
 
 interface ContentPseudo {
-    public function run($value, $pseudoArgs, $element);
+	public function run($value, $pseudoArgs, $element);
 }

src/Property/Content.php

Indentation +3 added lines, -3 removed lines

@@ -39,9 +39,9 @@
 		return (isset($rules['content-mode'])) ? $rules['content-mode']->read() : 'append';
 	}
 
-    public function addContentPseudo($name, ContentPseudo $contentPseudo) {
-        $this->contentPseudo[$name] = $contentPseudo;
-    }
+	public function addContentPseudo($name, ContentPseudo $contentPseudo) {
+		$this->contentPseudo[$name] = $contentPseudo;
+	}
     
 	private function processPseudo($value, $element, $pseudoMatcher) {
 		foreach ($this->contentPseudo as $pseudoName => $pseudoFunction) {

Braces +22 added lines, -11 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);
 
@@ -22,14 +24,19 @@ 
 			//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;
@@ -56,9 +63,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);
 			}
 		}
@@ -69,9 +77,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));
@@ -95,6 +104,8 @@ 
 	}
 
 	private function removeAllChildren($element) {
-		while ($element->hasChildNodes()) $element->removeChild($element->firstChild);
+		while ($element->hasChildNodes()) {
+			$element->removeChild($element->firstChild);
+		}
 	}
 }

src/Property/ContentPseudo/Attr.php

Indentation +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@
 <?php
 namespace Transphporm\Property\ContentPseudo;
 class Attr implements \Transphporm\Property\ContentPseudo {
-    public function run($value, $pseudoArgs, $element) {
-        $element->setAttribute($pseudoArgs, implode('', $value));
-    }
+	public function run($value, $pseudoArgs, $element) {
+		$element->setAttribute($pseudoArgs, implode('', $value));
+	}
 }

src/Property/ContentPseudo/BeforeAfter.php

Indentation +8 added lines, -8 removed lines

@@ -1,18 +1,18 @@
 <?php
 namespace Transphporm\Property\ContentPseudo;
 class BeforeAfter implements \Transphporm\Property\ContentPseudo {
-    private $insertLocation;
-    private $content;
+	private $insertLocation;
+	private $content;
 
-    public function __construct($insertLocation, \Transphporm\Property\Content $content) {
-        $this->insertLocation = $insertLocation;
+	public function __construct($insertLocation, \Transphporm\Property\Content $content) {
+		$this->insertLocation = $insertLocation;
 		$this->content = $content;
 	}
 
-    public function run($value, $pseudoArgs, $element) {
-        foreach ($this->content->getNode($value, $element->ownerDocument) as $node) {
+	public function run($value, $pseudoArgs, $element) {
+		foreach ($this->content->getNode($value, $element->ownerDocument) as $node) {
 			if ($this->insertLocation === "before") $element->insertBefore($node, $element->firstChild);
-            else if ($this->insertLocation === "after") $element->appendChild($node);
+			else if ($this->insertLocation === "after") $element->appendChild($node);
 		}
-    }
+	}
 }

Braces +5 added lines, -2 removed lines

@@ -11,8 +11,11 @@
 
     public function run($value, $pseudoArgs, $element) {
         foreach ($this->content->getNode($value, $element->ownerDocument) as $node) {
-			if ($this->insertLocation === "before") $element->insertBefore($node, $element->firstChild);
-            else if ($this->insertLocation === "after") $element->appendChild($node);
+			if ($this->insertLocation === "before") {
+				$element->insertBefore($node, $element->firstChild);
+			} else if ($this->insertLocation === "after") {
+            	$element->appendChild($node);
+            }
 		}
     }
 }