Level-2 / Transphporm

src/ValueParser.php

Doc Comments +7 added lines

@@ -63,6 +63,9 @@ 
 		return $array;
 	}
 
+	/**
+	 * @param null|\DOMElement $element
+	 */
 	private function callFunc($name, $params, $element) {
 		if ($name && is_callable([$this->dataFunction, $name])) {
 			return $this->dataFunction->$name($this->parse($params, $element), $element);	
@@ -70,6 +73,10 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $remaining
+	 * @param null|\DOMElement $element
+	 */
 	private function parseNextValue($remaining, $result, $element) {
 		if (strlen($remaining) > 0 && $remaining[0] == ',') $result = array_merge($result, $this->parse(trim(substr($remaining, 1)), $element));
 		return $result;

Braces +20 added lines, -11 removed lines

@@ -27,14 +27,17 @@ 
 
 			//Count the number of fresh opening ( before $close
 			$cPos = $open+1;
-			while (($cPos = strpos($function, '(', $cPos+1)) !== false && $cPos < $close) $close = strpos($function, ')', $close+1);
+			while (($cPos = strpos($function, '(', $cPos+1)) !== false && $cPos < $close) {
+				$close = strpos($function, ')', $close+1);
+			}
 
 			$name = substr($function, 0, $open);
 
 			$params = substr($function, $open+1, $close-$open-1);
 			return ['name' => $name, 'params' => $params, 'endPoint' => $close];
+		} else {
+			return ['name' => null, 'params' => $function, 'endPoint' => strlen($function)];
 		}
-		else return ['name' => null, 'params' => $function, 'endPoint' => strlen($function)];
 		
 	}
 
@@ -43,23 +46,26 @@ 
 		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->callFunc($func['name'], $func['params'], $element)) !== false) {
 				$result = $this->appendToArray($result, $data);
-			} 
-			else $result[] = trim($function);
+			} else {
+				$result[] = trim($function);
+			}
 		}
 		$remaining = trim(substr($function, $finalPos+1));
 		return $this->parseNextValue($remaining, $result, $element);
 	}
 
 	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;
 	}
 
@@ -71,7 +77,9 @@ 
 	}
 
 	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;
 	}
 	
@@ -79,8 +87,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/Builder.php

Braces +25 added lines, -10 removed lines

@@ -41,7 +41,9 @@ 
 
 		//Allow $time to be set via arguments to spoof time passage during tests
 		foreach ($this->getRules($template, $valueParser) as $rule) {
-			if ($rule->shouldRun($this->time)) $this->executeTssRule($rule, $template, $data, $valueParser);			
+			if ($rule->shouldRun($this->time)) {
+				$this->executeTssRule($rule, $template, $data, $valueParser);
+			}
 		}
 		
 		$result = ['body' => $template->output($document), 'headers' => array_merge($cachedOutput['headers'], $headers)];
@@ -58,7 +60,9 @@ 
 		$formatter->register(new Formatter\Date($locale));
 		$formatter->register(new Formatter\StringFormatter());
 		
-		foreach ($this->formatters as $format) $formatter->register($format);
+		foreach ($this->formatters as $format) {
+			$formatter->register($format);
+		}
 
 		$this->registerProperty('content', new Property\Content($data, $headers, $formatter));
 		$this->registerProperty('repeat', new Property\Repeat($data));
@@ -76,7 +80,9 @@ 
 	private function executeTssRule($rule, $template, $data, $valueParser) {
 		$rule->touch();
 		$hook = new Hook\Rule($rule->properties, new Hook\PseudoMatcher($rule->pseudo, $data), $valueParser);
-		foreach ($this->registeredProperties as $name => $property) $hook->registerProperty($name, $property);
+		foreach ($this->registeredProperties as $name => $property) {
+			$hook->registerProperty($name, $property);
+		}
 		$template->addHook($rule->query, $hook);
 	}
 
@@ -85,8 +91,9 @@ 
 		if (trim($this->template)[0] !== '<') {			
 			$xml = $this->cache->load($this->template, filemtime($this->template));
 			return $xml ? $xml : ['body' => file_get_contents($this->template), 'headers' => []];
+		} else {
+			return ['body' => $this->template, 'headers' => []];
 		}
-		else return ['body' => $this->template, 'headers' => []];	
 	}
 
 	//Load the TSS rules either from a file or as a string
@@ -100,10 +107,14 @@ 
 			$key = $this->tss . $template->getPrefix() . $this->baseDir;
 			//Try to load the cached rules, if not set in the cache (or expired) parse the supplied sheet
 			$rules = $this->cache->load($key, filemtime($this->tss));
-			if (!$rules) return $this->cache->write($key, (new Sheet(file_get_contents($this->tss), $this->baseDir, $valueParser, $template->getPrefix()))->parse());
-			else return $rules;
+			if (!$rules) {
+				return $this->cache->write($key, (new Sheet(file_get_contents($this->tss), $this->baseDir, $valueParser, $template->getPrefix()))->parse());
+			} else {
+				return $rules;
+			}
+		} else {
+			return (new Sheet($this->tss, $this->baseDir, $valueParser, $template->getPrefix()))->parse();
 		}
-		else return (new Sheet($this->tss, $this->baseDir, $valueParser, $template->getPrefix()))->parse();
 	}
 
 	public function setCache(\ArrayAccess $cache) {
@@ -111,9 +122,13 @@ 
 	}
 
 	private function getLocale() {
-		if (is_array($this->locale)) return $this->locale;
-		else if (strlen($this->locale) > 0) return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . $this->locale . '.json'), true);
-		else return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . 'enGB.json'), true);
+		if (is_array($this->locale)) {
+			return $this->locale;
+		} else if (strlen($this->locale) > 0) {
+			return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . $this->locale . '.json'), true);
+		} else {
+			return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . 'enGB.json'), true);
+		}
 	}
 
 	public function registerProperty($name, Property $property) {

src/CssToXpath.php

Spacing +8 added lines, -8 removed lines

@@ -13,15 +13,15 @@ 
 	private $valueParser;
 
 	public function __construct($css, ValueParser $valueParser, $prefix = '') {
-		$this->css = str_replace([' >', '> '],['>', '>'], trim($css));
+		$this->css = str_replace([' >', '> '], ['>', '>'], trim($css));
 		$this->valueParser = $valueParser;
 		$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) { return '[@' . $this->parseAttr($string) . ']';	},
+			' ' => 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) { return '[@'.$this->parseAttr($string).']'; },
 			']' => function() {	return ''; }
 		];
 	}
@@ -40,7 +40,7 @@ 
 				$parts = explode($comparator, $attr);
 
 				foreach ($parts as &$part) $part = implode('', $this->valueParser->parse($part));
-				if (isset($parts[1])) $parts[1] = '"' . $parts[1] . '"';
+				if (isset($parts[1])) $parts[1] = '"'.$parts[1].'"';
 				return implode($comparator, $parts);
 			}
 		}

Braces +11 added lines, -4 removed lines

@@ -39,8 +39,12 @@ 
 			if (strpos($attr, $comparator) !== false) {
 				$parts = explode($comparator, $attr);
 
-				foreach ($parts as &$part) $part = implode('', $this->valueParser->parse($part));
-				if (isset($parts[1])) $parts[1] = '"' . $parts[1] . '"';
+				foreach ($parts as &$part) {
+					$part = implode('', $this->valueParser->parse($part));
+				}
+				if (isset($parts[1])) {
+					$parts[1] = '"' . $parts[1] . '"';
+				}
 				return implode($comparator, $parts);
 			}
 		}
@@ -59,8 +63,9 @@ 
 				$selector = $this->createSelector();
 				$selector->type = $css[$i];
 				$selectors[] = $selector;
+			} else {
+				$selector->string .= $css[$i];
 			}
-			else $selector->string .= $css[$i];			
 		}
 		return $selectors;
 	}
@@ -71,7 +76,9 @@ 
 		$this->depth = count($selectors);
 		$xpath = '/';
 		foreach ($selectors as $selector) {
-			if (isset($this->translators[$selector->type])) $xpath .= $this->translators[$selector->type]($selector->string);
+			if (isset($this->translators[$selector->type])) {
+				$xpath .= $this->translators[$selector->type]($selector->string);
+			}
 		}
 
 		$xpath = str_replace('/[', '/*[', $xpath);

src/Hook/Rule.php

Braces +9 added lines, -3 removed lines

@@ -20,11 +20,15 @@ 
 
 	public function run(\DomElement $element) {	
 		//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;
+		}
 
 		foreach ($this->rules as $name => $value) {
 			$result = $this->callProperty($name, $element, $this->valueParser->parse(trim($value), $element));
-			if ($result === false) break;
+			if ($result === false) {
+				break;
+			}
 		}
 	}
 
@@ -45,7 +49,9 @@ 
 	}
 
 	private function callProperty($name, $element, $value) {
-		if (isset($this->properties[$name])) return $this->properties[$name]->run($value, $element, $this);
+		if (isset($this->properties[$name])) {
+			return $this->properties[$name]->run($value, $element, $this);
+		}
 		return false;
 	}
 

src/Sheet.php

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