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/Hook/DataFunction.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
 	}
 
 	public function template($val, $element) {
-		$newTemplate = new \Transphporm\Builder($this->baseDir . $val[0]);
+		$newTemplate = new \Transphporm\Builder($this->baseDir.$val[0]);
 		$newTemplate->setLocale($this->locale);
 
 		$doc = $newTemplate->output([], true)->body;

Doc Comments +3 added lines

@@ -12,6 +12,9 @@
 	private $locale;
 	private $baseDir;
 	
+	/**
+	 * @param string $baseDir
+	 */
 	public function __construct(\SplObjectStorage $objectStorage, $data, $locale, $baseDir) {
 		$this->dataStorage = $objectStorage;
 		$this->data = $data;

Braces +25 added lines, -9 removed lines

@@ -22,7 +22,9 @@ 
 	/** Binds data to an element */
 	public function bind(\DomElement $element, $data, $type = 'data') {
 		//This is a bit of a hack to workaround #24, might need a better way of doing this if it causes a problem
-		if (is_array($data) && $this->isObjectArray($data)) $data = $data[0];
+		if (is_array($data) && $this->isObjectArray($data)) {
+			$data = $data[0];
+		}
 		$content = isset($this->dataStorage[$element]) ? $this->dataStorage[$element] : [];
 		$content[$type] = $data;
 		$this->dataStorage[$element] = $content;
@@ -45,7 +47,9 @@ 
 	/** Returns the data that has been bound to $element, or, if no data is bound to $element climb the DOM tree to find the data bound to a parent node*/
 	private function getData(\DomElement $element, $type = 'data') {
 		while ($element) {
-			if (isset($this->dataStorage[$element]) && isset($this->dataStorage[$element][$type])) return $this->dataStorage[$element][$type];
+			if (isset($this->dataStorage[$element]) && isset($this->dataStorage[$element][$type])) {
+				return $this->dataStorage[$element][$type];
+			}
 			$element = $element->parentNode;
 		}
 		return $this->data;
@@ -62,16 +66,24 @@ 
 		$parts = explode('.', $name[0]);
 		$obj = $data;
 		foreach ($parts as $part) {
-			if ($part === '') continue;
-			if (is_callable([$obj, $part])) $obj = call_user_func([$obj, $part]); 
-			else $obj = $this->ifNull($obj, $part);
+			if ($part === '') {
+				continue;
+			}
+			if (is_callable([$obj, $part])) {
+				$obj = call_user_func([$obj, $part]);
+			} else {
+				$obj = $this->ifNull($obj, $part);
+			}
 		}
 		return $obj;
 	}
 
 	private function ifNull($obj, $key) {
-		if (is_array($obj)) return isset($obj[$key]) ? $obj[$key] : null;
-		else return isset($obj->$key) ? $obj->$key : null;
+		if (is_array($obj)) {
+			return isset($obj[$key]) ? $obj[$key] : null;
+		} else {
+			return isset($obj->$key) ? $obj->$key : null;
+		}
 	}
 
 	public function attr($val, $element) {
@@ -97,14 +109,18 @@ 
 
 		$doc = $newTemplate->output([], true)->body;
 
-		if (isset($val[1])) return $this->templateSubsection($val[1], $doc, $element);
+		if (isset($val[1])) {
+			return $this->templateSubsection($val[1], $doc, $element);
+		}
 		
 		$newNode = $element->ownerDocument->importNode($doc->documentElement, true);
 
 		$result = [];
 
 		if ($newNode->tagName === 'template') {
-			foreach ($newNode->childNodes as $node) $result[] = $node->cloneNode(true);
+			foreach ($newNode->childNodes as $node) {
+				$result[] = $node->cloneNode(true);
+			}
 		}		
 		//else $result[] = $newNode;
 

src/Hook/PseudoMatcher.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 		return false;
 	}
 
-	public function header($element)  {
+	public function header($element) {
 		if ($this->matches($element)) {
 			foreach ($this->pseudo as $pseudo) {
 				if (strpos($pseudo, 'header') === 0) return $this->getBetween($pseudo, '[', ']');

Braces +26 added lines, -10 removed lines

@@ -22,12 +22,16 @@ 
 
 	private function attribute($pseudo, $element) {
 		$pos = strpos($pseudo, '[');
-		if ($pos === false) return true;
+		if ($pos === false) {
+			return true;
+		}
 		$end = strpos($pseudo, ']', $pos);
 
 		$name = substr($pseudo, 0, $pos);
 
-		if (strpos($pseudo, '=') === false) return true;
+		if (strpos($pseudo, '=') === false) {
+			return true;
+		}
 
 		$criteria = substr($pseudo, $pos+1, $end-$pos-1);
 		list ($field, $value) = explode('=', $criteria);
@@ -42,16 +46,21 @@ 
 	}
 
 	private function parseValue($value) {
-		if ($value == 'true') return true;
-		else if ($value == 'false') return false;
-		else return $value;
+		if ($value == 'true') {
+			return true;
+		} else if ($value == 'false') {
+			return false;
+		} else {
+			return $value;
+		}
 	}
 
 	private function getOperator($field) {
 		if ($field[strlen($field)-1] == '!') {
 			return '!';
+		} else {
+			return '';
 		}
-		else return '';
 	}
 
 	private function nth($pseudo, $element) {
@@ -59,8 +68,11 @@ 
 			$criteria = $this->getBetween($pseudo, '(', ')');
 			$num = $this->getBetween($element->getNodePath(), '[', ']');
 			
-			if (is_callable([$this, $criteria])) return $this->$criteria($num);
-			else return $num == $criteria;
+			if (is_callable([$this, $criteria])) {
+				return $this->$criteria($num);
+			} else {
+				return $num == $criteria;
+			}
 			
 		}
 		return true;
@@ -80,7 +92,9 @@ 
 	public function header($element)  {
 		if ($this->matches($element)) {
 			foreach ($this->pseudo as $pseudo) {
-				if (strpos($pseudo, 'header') === 0) return $this->getBetween($pseudo, '[', ']');
+				if (strpos($pseudo, 'header') === 0) {
+					return $this->getBetween($pseudo, '[', ']');
+				}
 			}
 		}
 	}
@@ -95,7 +109,9 @@ 
 
 	private function getBetween($string, $start, $end) {
 		$open = strpos($string, $start);
-		if ($open === false) return false;
+		if ($open === false) {
+			return false;
+		}
 		$close = strpos($string, $end, $open);
 		return substr($string, $open+1, $close-$open-1);
 	}

src/StringExtractor.php

Spacing +2 added lines, -2 removed lines

@@ -17,8 +17,8 @@
 		while (($pos = strpos($str, '"', $pos+1)) !== false) {
 			$end = strpos($str, '"', $pos+1);
 			while ($str[$end-1] == '\\') $end = strpos($str, '"', $end+1);
-			$strings['$+STR' . ++$num] = substr($str, $pos, $end-$pos+1);
-			$str = substr_replace($str, '$+STR' . $num, $pos, $end-$pos+1);
+			$strings['$+STR'.++$num] = substr($str, $pos, $end-$pos+1);
+			$str = substr_replace($str, '$+STR'.$num, $pos, $end-$pos+1);
 		}
 
 		return [$str, $strings];

Braces +3 added lines, -1 removed lines

@@ -16,7 +16,9 @@
 		$strings = [];
 		while (($pos = strpos($str, '"', $pos+1)) !== false) {
 			$end = strpos($str, '"', $pos+1);
-			while ($str[$end-1] == '\\') $end = strpos($str, '"', $end+1);
+			while ($str[$end-1] == '\\') {
+				$end = strpos($str, '"', $end+1);
+			}
 			$strings['$+STR' . ++$num] = substr($str, $pos, $end-$pos+1);
 			$str = substr_replace($str, '$+STR' . $num, $pos, $end-$pos+1);
 		}

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

Doc Comments +18 added lines

@@ -11,6 +11,9 @@ 
 	private $baseDir;
 	private $prefix;
 
+	/**
+	 * @param string $tss
+	 */
 	public function __construct($tss, $baseDir, $prefix = '') {
 		$this->tss = $this->stripComments($tss);
 		$this->baseDir = $baseDir;
@@ -36,12 +39,20 @@ 
 		return $rules;
 	}
 
+	/**
+	 * @param string $selector
+	 * @param integer $index
+	 */
 	private function CssToRule($selector, $index) {
 		$xPath = new CssToXpath($selector, $this->prefix);
 		$rule = new Rule($xPath->getXpath(), $xPath->getPseudo(), $xPath->getDepth(), $index++);
 		return $rule;
 	}
 
+	/**
+	 * @param string $selector
+	 * @param Rule $newRule
+	 */
 	private function writeRule($rules, $selector, $newRule) {
 		if (isset($rules[$selector])) $newRule->properties = array_merge($rules[$selector], $newRule->properties);
 		$rules[$selector] = $newRule;
@@ -49,6 +60,10 @@ 
 		return $rules;
 	}
 
+	/**
+	 * @param integer $pos
+	 * @param integer $next
+	 */
 	private function processingInstructions($tss, $pos, $next) {
 		$rules = [];
 		while (($atPos = strpos($tss, '@', $pos)) !== false) {
@@ -87,6 +102,9 @@ 
 		return $str;
 	}
 
+	/**
+	 * @param string $str
+	 */
 	private function getProperties($str) {
 		$stringExtractor = new \Transphporm\StringExtractor($str);
 		$rules = explode(';', $stringExtractor);

Braces +13 added lines, -6 removed lines

@@ -31,7 +31,9 @@ 
 			$rules = $this->writeRule($rules, $selector, $rule);
 		}
 		//there may be processing instructions at the end
-		if ($processing = $this->processingInstructions($this->tss, $pos, strlen($this->tss))) $rules = array_merge($processing['rules'], $rules);
+		if ($processing = $this->processingInstructions($this->tss, $pos, strlen($this->tss))) {
+			$rules = array_merge($processing['rules'], $rules);
+		}
 		usort($rules, [$this, 'sortRules']);
 		return $rules;
 	}
@@ -43,7 +45,9 @@ 
 	}
 
 	private function writeRule($rules, $selector, $newRule) {
-		if (isset($rules[$selector])) $newRule->properties = array_merge($rules[$selector], $newRule->properties);
+		if (isset($rules[$selector])) {
+			$newRule->properties = array_merge($rules[$selector], $newRule->properties);
+		}
 		$rules[$selector] = $newRule;
 		
 		return $rules;
@@ -58,8 +62,7 @@ 
 				$pos = strpos($tss, ';', $spacePos);
 				$args = substr($tss, $spacePos+1, $pos-$spacePos-1);
 				$rules = array_merge($rules, $this->$funcName($args));
-			}
-			else {
+			} else {
 				break;	
 			} 
 		}
@@ -74,7 +77,9 @@ 
 
 	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;
 	}
@@ -95,7 +100,9 @@ 
 		$return = [];
 
 		foreach ($rules as $rule) {
-			if (trim($rule) === '') continue;
+			if (trim($rule) === '') {
+				continue;
+			}
 			$parts = explode(':', $rule, 2);
 
 			$parts[1] = $stringExtractor->rebuild($parts[1]);

Spacing +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
 
 			$selector = trim(substr($this->tss, $pos, $next-$pos));
 			$rule = $this->cssToRule($selector, count($rules));	
-			$pos =  strpos($this->tss, '}', $next)+1;
+			$pos = strpos($this->tss, '}', $next)+1;
 			$rule->properties = $this->getProperties(trim(substr($this->tss, $next+1, $pos-2-$next)));	
 			$rules = $this->writeRule($rules, $selector, $rule);
 		}
@@ -54,7 +54,7 @@ 
 	private function processingInstructions($tss, $pos, $next) {
 		$rules = [];
 		while (($atPos = strpos($tss, '@', $pos)) !== false) {
-			if ($atPos  <= (int) $next) {
+			if ($atPos <= (int) $next) {
 				$spacePos = strpos($tss, ' ', $atPos);
 				$funcName = substr($tss, $atPos+1, $spacePos-$atPos-1);
 				$pos = strpos($tss, ';', $spacePos);
@@ -70,7 +70,7 @@ 
 	}
 
 	private function import($args) {
-		$sheet = new Sheet(file_get_contents($this->baseDir . trim($args, '\'" ')), $this->baseDir, $this->valueParser, $this->prefix);
+		$sheet = new Sheet(file_get_contents($this->baseDir.trim($args, '\'" ')), $this->baseDir, $this->valueParser, $this->prefix);
 		return $sheet->parse();
 	}
 

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;
 	}