Level-2 / Transphporm

src/Formatter/Date.php

Spacing +5 added lines, -5 removed lines

@@ -11,7 +11,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 \DateTime ? $val : new \DateTime($val, $tz);
+		$date = $val instanceof \DateTime ? $val : new \DateTime($val, $tz);
 		$date->setTimeZone($tz);
 		return $date;
 	}
@@ -30,7 +30,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"
@@ -42,7 +42,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);
@@ -68,7 +68,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'],
@@ -87,7 +87,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 '';
 	}
 

Braces +16 added lines, -6 removed lines

@@ -44,8 +44,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 */
@@ -80,15 +83,22 @@ 
 			[-365, -28, $strings['future'], 28, 'months'],
 			[-999999, -365, $strings['future'], 365, 'years'],
 		];
-		if (isset($strings['day_before_yesterday'])) array_unshift($ranges, [2, 2, $strings['day_before_yesterday'], 1, '']);
-		if (isset($strings['day_after_tomorrow'])) array_unshift($ranges, [-2, -2, $strings['day_after_tomorrow'], 1, '']);
+		if (isset($strings['day_before_yesterday'])) {
+			array_unshift($ranges, [2, 2, $strings['day_before_yesterday'], 1, '']);
+		}
+		if (isset($strings['day_after_tomorrow'])) {
+			array_unshift($ranges, [-2, -2, $strings['day_after_tomorrow'], 1, '']);
+		}
 		return $ranges;
 	}
 
 	/** 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/Formatter/Number.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@
 
 	public function currency($num) {
 		$num = $this->decimal($num, $this->locale['currency_decimals']);
-		if ($this->locale['currency_position'] === 'before') return $this->locale['currency'] . $num;
-		else return $num . $this->locale['currency'];
+		if ($this->locale['currency_position'] === 'before') return $this->locale['currency'].$num;
+		else return $num.$this->locale['currency'];
 	}
 }
\ No newline at end of file

Braces +5 added lines, -2 removed lines

@@ -13,7 +13,10 @@
 
 	public function currency($num) {
 		$num = $this->decimal($num, $this->locale['currency_decimals']);
-		if ($this->locale['currency_position'] === 'before') return $this->locale['currency'] . $num;
-		else return $num . $this->locale['currency'];
+		if ($this->locale['currency_position'] === 'before') {
+			return $this->locale['currency'] . $num;
+		} else {
+			return $num . $this->locale['currency'];
+		}
 	}
 }
\ No newline at end of file

src/Template.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 		if ($document) return $this->document;
 
 
-		$output = ($this->document->doctype) ? $this->document->saveXml($this->document->doctype) . "\n" : '';
+		$output = ($this->document->doctype) ? $this->document->saveXml($this->document->doctype)."\n" : '';
 
 		if ($this->document->documentElement->tagName !== 'template') $output .= $this->document->saveXml($this->document->documentElement, LIBXML_NOEMPTYTAG);
 		else $output = $this->printDocument($this->document);

Braces +14 added lines, -5 removed lines

@@ -33,14 +33,18 @@ 
 	/** 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);
+			}
 		}
 	}
 
 	/** Prints out the current DomDocument as HTML */
 	private function printDocument(\DomDocument $doc) {
 		$output = '';
-		foreach ($doc->documentElement->childNodes as $node) $output .= $doc->saveXML($node, LIBXML_NOEMPTYTAG);
+		foreach ($doc->documentElement->childNodes as $node) {
+			$output .= $doc->saveXML($node, LIBXML_NOEMPTYTAG);
+		}
 		return $output;
 	}
 
@@ -52,13 +56,18 @@ 
 		//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) ? $this->document->saveXml($this->document->doctype) . "\n" : '';
 
-		if ($this->document->documentElement->tagName !== 'template') $output .= $this->document->saveXml($this->document->documentElement, LIBXML_NOEMPTYTAG);
-		else $output = $this->printDocument($this->document);
+		if ($this->document->documentElement->tagName !== 'template') {
+			$output .= $this->document->saveXml($this->document->documentElement, LIBXML_NOEMPTYTAG);
+		} else {
+			$output = $this->printDocument($this->document);
+		}
 
 		//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/Cache.php

Braces +2 added lines, -1 removed lines

@@ -20,7 +20,8 @@
 	public function load($key, $modified = 0) {
 		if (isset($this->cache[$key]) && $this->cache[$key]['timestamp'] >= $modified) {
 			return $this->cache[$key]['content'];
+		} else {
+			return false;
 		}
-		else return false;
 	}
 }
\ No newline at end of file

src/Rule.php

Braces +15 added lines, -6 removed lines

@@ -35,24 +35,33 @@
 	}
 
 	private function timeFrequency($frequency, $time = null) {
-		if ($time === null) $time = time();
+		if ($time === null) {
+			$time = time();
+		}
 		$num = (int) $frequency;
 		$unit = strtoupper(trim(str_replace($num, '', $frequency)));
 			
 		$offset = $num * constant(self::class . '::' . $unit);
 
-		if ($time > $this->lastRun + $offset) return true;
-		else return false;
+		if ($time > $this->lastRun + $offset) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	public function shouldRun($time = null) {
 		if (isset($this->properties['update-frequency']) && $this->lastRun !== 0) {
 			$frequency = $this->properties['update-frequency'];
 			$static = ['always' => true, 'never' => false];
-			if (isset($static[$frequency])) return $static[$frequency];
-			else return $this->timeFrequency($frequency, $time);
+			if (isset($static[$frequency])) {
+				return $static[$frequency];
+			} else {
+				return $this->timeFrequency($frequency, $time);
+			}
 
+		} else {
+			return true;
 		}
-		else return true;
 	}
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -39,9 +39,9 @@
 		$num = (int) $frequency;
 		$unit = strtoupper(trim(str_replace($num, '', $frequency)));
 			
-		$offset = $num * constant(self::class . '::' . $unit);
+		$offset = $num * constant(self::class.'::'.$unit);
 
-		if ($time > $this->lastRun + $offset) return true;
+		if ($time > $this->lastRun+$offset) return true;
 		else return false;
 	}
 

src/Hook/Formatter.php

Braces +6 added lines, -2 removed lines

@@ -8,11 +8,15 @@
 	}
 
 	public function format($value, $rules) {
-		if (!isset($rules['format'])) return $value;
+		if (!isset($rules['format'])) {
+			return $value;
+		}
 		$format = new \Transphporm\StringExtractor($rules['format']);
 		$options = explode(' ', $format);
 		$functionName = array_shift($options);
-		foreach ($options as &$f) $f = trim($format->rebuild($f), '"');
+		foreach ($options as &$f) {
+			$f = trim($format->rebuild($f), '"');
+		}
 
 		return $this->processFormat($options, $functionName, $value);		
 	}

src/Parser/Value.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 		$finalPos = $this->findMatchingPos($str, $marker);
 		$string = substr($str, 1, $finalPos-1);
 		//Now remove escape characters
-		return str_replace('\\' . $marker, $marker, $string);
+		return str_replace('\\'.$marker, $marker, $string);
 	}
 
 	private function parseFunction($function) {

Braces +33 added lines, -18 removed lines

@@ -33,8 +33,9 @@ 
 			$params = $bracketMatcher->match('(', ')');
 			
 			return ['name' => $name, 'params' => $params, 'endPoint' => $bracketMatcher->getClosePos()];
+		} else {
+			return ['name' => null, 'params' => $function, 'endPoint' => strlen($function)];
 		}
-		else return ['name' => null, 'params' => $function, 'endPoint' => strlen($function)];
 	}
 
 	public function parse($function, \DomElement $element) {
@@ -55,13 +56,15 @@ 
 		if ($function && in_array($function[0], ['\'', '"'])) {
 			$finalPos = $this->findMatchingPos($function, $function[0]);
 			$result[] = $this->extractQuotedString($function[0], $function);
-		}
-		else {
+		} else {
 			$func = $this->parseFunction($function);
 			$finalPos = $func['endPoint'];			
 
-			if (($data = $this->getFunctionValue($func['name'], $func['params'], $element)) !== self::IS_NOT_FUNCTION) $result = $this->appendToArray($result, $data);
-			else $result[] = trim($function);
+			if (($data = $this->getFunctionValue($func['name'], $func['params'], $element)) !== self::IS_NOT_FUNCTION) {
+				$result = $this->appendToArray($result, $data);
+			} else {
+				$result[] = trim($function);
+			}
 		}
 		$remaining = trim(substr($function, $finalPos+1));
 		return $this->parseNextValue($remaining, $result, $element);
@@ -70,23 +73,27 @@ 
 	private function getFunctionValue($name, $params, $element) {
 		if (($data = $this->callFunc($name, $params, $element)) !== self::IS_NOT_FUNCTION) {
 			return $data;
-		}
-		else if ($this->parent != null && ($data = $this->parent->callFunc($name, $params, $element)) !== self::IS_NOT_FUNCTION) {
+		} else if ($this->parent != null && ($data = $this->parent->callFunc($name, $params, $element)) !== self::IS_NOT_FUNCTION) {
 			return $data;
+		} else {
+			return self::IS_NOT_FUNCTION;
 		}
-		else return self::IS_NOT_FUNCTION;
 	}
 
 	private function appendToArray($array, $value) {
-		if (is_array($value)) $array += $value;
-		else $array[] = $value;
+		if (is_array($value)) {
+			$array += $value;
+		} else {
+			$array[] = $value;
+		}
 		return $array;
 	}
 
 	private function callFunc($name, $params, $element) {
 		if ($name && $this->isCallable($this->dataFunction, $name)) {
-			if ($this->callParamsAsArray) return $this->dataFunction->$name($this->parse($params, $element), $element);	
-			else {
+			if ($this->callParamsAsArray) {
+				return $this->dataFunction->$name($this->parse($params, $element), $element);
+			} else {
 				return $this->callFuncOnObject($this->dataFunction, $name, $this->parse($params, $element));
 			}
 		}
@@ -103,18 +110,25 @@ 
 		foreach ($params as $param) {
 			$stringExtractor = new StringExtractor($param);
 			$parts = explode(',', $stringExtractor);
-			foreach ($parts as $part) $args[] = $stringExtractor->rebuild($part);
+			foreach ($parts as $part) {
+				$args[] = $stringExtractor->rebuild($part);
+			}
 		}
 		return $this->callFuncOrClosure($obj, $func, $args);
 	}
 
 	private function callFuncOrClosure($obj, $func, $args) {
-		if (isset($obj->$func) && is_callable($obj->$func)) return call_user_func_array($obj->$func, $args);
-		else return call_user_func_array([$obj, $func], $args);
+		if (isset($obj->$func) && is_callable($obj->$func)) {
+			return call_user_func_array($obj->$func, $args);
+		} else {
+			return call_user_func_array([$obj, $func], $args);
+		}
 	}
 
 	private function parseNextValue($remaining, $result, $element) {
-		if (strlen($remaining) > 0 && $remaining[0] == ',') $result = array_merge($result, $this->parse(trim(substr($remaining, 1)), $element));
+		if (strlen($remaining) > 0 && $remaining[0] == ',') {
+			$result = array_merge($result, $this->parse(trim(substr($remaining, 1)), $element));
+		}
 		return $result;
 	}
 	
@@ -122,8 +136,9 @@ 
 		$pos = $start+1;
 		$end = 0;
 		while ($end = strpos($string, $char, $pos)) {
-			if ($string[$end-1] === $escape) $pos = $end+1;
-			else {
+			if ($string[$end-1] === $escape) {
+				$pos = $end+1;
+			} else {
 				break;
 			}
 		}

src/Parser/CssToXpath.php

Braces +10 added lines, -4 removed lines

@@ -51,8 +51,11 @@ 
 	}
 
 	private static function compare($comparator, $a, $b) {
-		if ($comparator == '=') return $a == $b;
-		else if ($comparator == '!=') return $a != $b;
+		if ($comparator == '=') {
+			return $a == $b;
+		} else if ($comparator == '!=') {
+			return $a != $b;
+		}
 	}
 
 	//split the css into indivudal functions
@@ -66,8 +69,9 @@ 
 				$selector = $this->createSelector();
 				$selector->type = $css[$i];
 				$selectors[] = $selector;
+			} else {
+				$selector->string .= $css[$i];
 			}
-			else $selector->string .= $css[$i];			
 		}
 		return $selectors;
 	}
@@ -78,7 +82,9 @@ 
 		$this->depth = count($selectors);
 		$xpath = '/';
 		foreach ($selectors as $selector) {
-			if (isset($this->translators[$selector->type])) $xpath .= $this->translators[$selector->type]($selector->string, $xpath);
+			if (isset($this->translators[$selector->type])) {
+				$xpath .= $this->translators[$selector->type]($selector->string, $xpath);
+			}
 		}
 
 		$xpath = str_replace('/[', '/*[', $xpath);

Spacing +7 added lines, -7 removed lines

@@ -17,14 +17,14 @@
 	public function __construct($css, Value $valueParser, $prefix = '') {
 		$hash = $this->registerInstance();
 		$this->valueParser = $valueParser;
-		$this->css = str_replace([' >', '> '],['>', '>'], trim($css));
+		$this->css = str_replace([' >', '> '], ['>', '>'], trim($css));
 		$this->translators = [
-			' ' => function($string) use ($prefix) { return '//' . $prefix . $string;	},
-			'' => function($string) use ($prefix) { return '/' . $prefix . $string;	},
-			'>' => function($string) use ($prefix) { return '/' . $prefix  . $string; },
-			'#' => function($string) { return '[@id=\'' . $string . '\']'; },
-			'.' => function($string) { return '[contains(concat(\' \', normalize-space(@class), \' \'), \' ' . $string . ' \')]'; }, 
-			'[' => function($string) use ($hash) { return '[' .'php:function(\'\Transphporm\Parser\CssToXpath::processAttr\', \'' . $string . '\', ., "' . $hash . '")' . ']';	},
+			' ' => function($string) use ($prefix) { return '//'.$prefix.$string; },
+			'' => function($string) use ($prefix) { return '/'.$prefix.$string; },
+			'>' => function($string) use ($prefix) { return '/'.$prefix.$string; },
+			'#' => function($string) { return '[@id=\''.$string.'\']'; },
+			'.' => function($string) { return '[contains(concat(\' \', normalize-space(@class), \' \'), \' '.$string.' \')]'; }, 
+			'[' => function($string) use ($hash) { return '['.'php:function(\'\Transphporm\Parser\CssToXpath::processAttr\', \''.$string.'\', ., "'.$hash.'")'.']'; },
 			']' => function() {	return ''; }
 		];
 	}

src/Hook/PostProcess.php

Braces +7 added lines, -3 removed lines

@@ -9,9 +9,13 @@
 class PostProcess implements \Transphporm\Hook {
 	public function run(\DomElement $element) {
 		$transphporm = $element->getAttribute('transphporm');
-		if ($transphporm === 'remove') $element->parentNode->removeChild($element);
-		else if ($transphporm === 'text') $element->parentNode->replaceChild($element->firstChild, $element);
-		else $element->removeAttribute('transphporm');
+		if ($transphporm === 'remove') {
+			$element->parentNode->removeChild($element);
+		} else if ($transphporm === 'text') {
+			$element->parentNode->replaceChild($element->firstChild, $element);
+		} else {
+			$element->removeAttribute('transphporm');
+		}
 	}
 
 }
\ No newline at end of file