Level-2 / Transphporm

src/Builder.php

Braces +18 added lines, -7 removed lines

@@ -26,7 +26,9 @@ 
 		$this->cache = new Cache(new \ArrayObject());
 
 		$modules = is_array($modules) ? $modules : $this->defaultModules;
-		foreach ($modules as $module) $this->loadModule(new $module);
+		foreach ($modules as $module) {
+			$this->loadModule(new $module);
+		}
 	}
 
 	//Allow setting the time used by Transphporm for caching. This is for testing purposes
@@ -51,7 +53,9 @@ 
 		$valueParser = new Parser\Value($data);
 		$config = new Config($data, $valueParser, $elementData, new Hook\Formatter(), new Parser\CssToXpath($valueParser, $data, $template->getPrefix()), $headers, $this->baseDir);
 
-		foreach ($this->modules as $module) $module->load($config);
+		foreach ($this->modules as $module) {
+			$module->load($config);
+		}
 
 		$this->processRules($template, $config);
 
@@ -66,7 +70,9 @@ 
 		$rules = $this->getRules($template, $config);
 
 		foreach ($rules as $rule) {
-			if ($rule->shouldRun($this->time)) $this->executeTssRule($rule, $template, $config);
+			if ($rule->shouldRun($this->time)) {
+				$this->executeTssRule($rule, $template, $config);
+			}
 		}
 	}
 
@@ -91,8 +97,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
@@ -107,10 +114,14 @@ 
 			//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 Parser\Sheet(file_get_contents($this->tss), $this->baseDir, $config->getCssToXpath(), $config->getValueParser()))->parse());
-			else return $rules;
+			if (!$rules) {
+				return $this->cache->write($key, (new Parser\Sheet(file_get_contents($this->tss), $this->baseDir, $config->getCssToXpath(), $config->getValueParser()))->parse());
+			} else {
+				return $rules;
+			}
+		} else {
+			return (new Parser\Sheet($this->tss, $this->baseDir, $config->getCssToXpath(), $config->getValueParser()))->parse();
 		}
-		else return (new Parser\Sheet($this->tss, $this->baseDir, $config->getCssToXpath(), $config->getValueParser()))->parse();
 	}
 
 	public function setCache(\ArrayAccess $cache) {

src/Parser/CssToXpath.php

Spacing +6 added lines, -6 removed lines

@@ -20,12 +20,12 @@
 		$this->functionSet = $functionSet;
 
 		$this->translators = [
-			Tokenizer::WHITESPACE => function($string) use ($prefix) { return '//' . $prefix . $string;	},
-			'' => function($string) use ($prefix) { return '/' . $prefix . $string;	},
-			Tokenizer::GREATER_THAN => function($string) use ($prefix) { return '/' . $prefix  . $string; },
-			Tokenizer::NUM_SIGN => function($string) { return '[@id=\'' . $string . '\']'; },
-			Tokenizer::DOT => function($string) { return '[contains(concat(\' \', normalize-space(@class), \' \'), \' ' . $string . ' \')]'; },
-			Tokenizer::OPEN_SQUARE_BRACKET => function($string) use ($hash) { return '[' .'php:function(\'\Transphporm\Parser\CssToXpath::processAttr\', \'' . json_encode($string) . '\', ., "' . $hash . '")' . ']';	},
+			Tokenizer::WHITESPACE => function($string) use ($prefix) { return '//'.$prefix.$string; },
+			'' => function($string) use ($prefix) { return '/'.$prefix.$string; },
+			Tokenizer::GREATER_THAN => function($string) use ($prefix) { return '/'.$prefix.$string; },
+			Tokenizer::NUM_SIGN => function($string) { return '[@id=\''.$string.'\']'; },
+			Tokenizer::DOT => function($string) { return '[contains(concat(\' \', normalize-space(@class), \' \'), \' '.$string.' \')]'; },
+			Tokenizer::OPEN_SQUARE_BRACKET => function($string) use ($hash) { return '['.'php:function(\'\Transphporm\Parser\CssToXpath::processAttr\', \''.json_encode($string).'\', ., "'.$hash.'")'.']'; },
 			//']' => function() {	return ''; }
 		];
 	}

Braces +23 added lines, -11 removed lines

@@ -51,7 +51,9 @@ 
 
 		$parts = self::$instances[$hash]->splitOnToken($attr, Tokenizer::EQUALS);
 
-		if ($parts[0] === $attr) return $element[0]->getAttribute($valueParser->parseTokens($attr)[0]) !== '';
+		if ($parts[0] === $attr) {
+			return $element[0]->getAttribute($valueParser->parseTokens($attr)[0]) !== '';
+		}
 
 		if ($parts[0][count($parts[0])-1]['type'] === Tokenizer::NOT) {
 			$attr = [
@@ -61,8 +63,7 @@ 
 				['type' => Tokenizer::EQUALS]
 			];
 			$attr = array_merge($attr, $parts[1]);
-		}
-		else {
+		} else {
 			$attr = [
 				['type' => Tokenizer::NAME, 'value' => 'attr'],
 				['type' => Tokenizer::OPEN_BRACKET, 'value' => $parts[0]],
@@ -77,8 +78,11 @@ 
 		$splitTokens = [];
 		$i = 0;
 		foreach ($tokens as $token) {
-			if ($token['type'] === $splitOn) $i++;
-			else $splitTokens[$i][] = $token;
+			if ($token['type'] === $splitOn) {
+				$i++;
+			} else {
+				$splitTokens[$i][] = $token;
+			}
 		}
 		return $splitTokens;
 	}
@@ -95,7 +99,9 @@ 
 				$selector->type = $token['type'];
 				$selectors[] = $selector;
 			}
-			if (isset($token['value'])) $selectors[count($selectors)-1]->string = $token['value'];
+			if (isset($token['value'])) {
+				$selectors[count($selectors)-1]->string = $token['value'];
+			}
 		}
 		return $selectors;
 
@@ -104,8 +110,9 @@ 
 				$selector = $this->createSelector();
 				$selector->type = $css[$i];
 				$selectors[] = $selector;
+			} else {
+				$selector->string .= $css[$i];
 			}
-			else $selector->string .= $css[$i];
 		}
 		return $selectors;
 	}
@@ -114,15 +121,20 @@ 
 		//$this->css = str_replace([' >', '> '],['>', '>'], trim($css));
 		foreach ($css as $key => $token) {
 			if ($token['type'] === Tokenizer::WHITESPACE &&
-				(isset($css[$key+1]) && $css[$key+1]['type'] === Tokenizer::GREATER_THAN)) unset($css[$key]);
-			else if ($token['type'] === Tokenizer::WHITESPACE &&
-				(isset($css[$key-1]) && $css[$key-1]['type'] === Tokenizer::GREATER_THAN)) unset($css[$key]);
+				(isset($css[$key+1]) && $css[$key+1]['type'] === Tokenizer::GREATER_THAN)) {
+				unset($css[$key]);
+			} else if ($token['type'] === Tokenizer::WHITESPACE &&
+				(isset($css[$key-1]) && $css[$key-1]['type'] === Tokenizer::GREATER_THAN)) {
+				unset($css[$key]);
+			}
 		}
 		$css = $this->splitOnToken(array_values($css), Tokenizer::COLON)[0];
 		$selectors = $this->split($css);
 		$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);