Level-2 / Transphporm

src/Parser/Sheet.php

Doc Comments +14 added lines

@@ -12,6 +12,9 @@ 
 	private $valueParser;
 	private $xPath;
 
+	/**
+	 * @param string $tss
+	 */
 	public function __construct($tss, $baseDir, CssToXpath $xPath, Value $valueParser) {
 		$this->tss = $this->stripComments($tss, '//', "\n");
 		$this->tss = $this->stripComments($this->tss, '/*', '*/');
@@ -46,6 +49,9 @@ 
 		return $rules;
 	}
 
+	/**
+	 * @param integer $index
+	 */
 	private function CssToRules($selector, $index, $properties) {
 		//$parts = explode(',', $selector);
 		$parts = $this->splitOnToken($selector, Tokenizer::ARG);
@@ -70,6 +76,10 @@ 
 		return $rules;
 	}
 
+	/**
+	 * @param integer $key
+	 * @param integer $indexStart
+	 */
 	private function processingInstructions($key, $indexStart) {
 		if (isset($this->tss[$key]) && $this->tss[$key]['type'] !== Tokenizer::AT_SIGN) return false;
 		$rules = [];
@@ -95,6 +105,10 @@ 
 		return ($a->depth < $b->depth) ? -1 : 1;
 	}
 
+	/**
+	 * @param string $open
+	 * @param string $close
+	 */
 	private function stripComments($str, $open, $close) {
 		$pos = 0;
 		while (($pos = strpos($str, $open, $pos)) !== false) {

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 
 	private function import($args, $indexStart) {
 		$fileName = $args[0];
-		$sheet = new Sheet(file_get_contents($this->baseDir . $fileName), dirname(realpath($this->baseDir . $fileName)) . DIRECTORY_SEPARATOR, $this->xPath, $this->valueParser);
+		$sheet = new Sheet(file_get_contents($this->baseDir.$fileName), dirname(realpath($this->baseDir.$fileName)).DIRECTORY_SEPARATOR, $this->xPath, $this->valueParser);
 		return $sheet->parse($indexStart);
 	}
 

Braces +34 added lines, -12 removed lines

@@ -26,7 +26,9 @@ 
 		$rules = [];
 		$numOfTokens = count($this->tss);
 		for ($i = 0; isset($this->tss[$i]) && $i <= $numOfTokens; $i++) {
-			if ($this->tss[$i]['type'] === Tokenizer::WHITESPACE) continue;
+			if ($this->tss[$i]['type'] === Tokenizer::WHITESPACE) {
+				continue;
+			}
 			if ($processing = $this->processingInstructions($i, count($rules)+$indexStart)) {
 				$i = $processing['endPos']+1;
 				$rules = array_merge($rules, $processing['rules']);
@@ -35,14 +37,20 @@ 
 			$tokens = array_slice($this->tss, $i);
 			$selector = $this->splitOnToken($tokens, Tokenizer::OPEN_BRACE)[0];
 			$i += count($selector);
-			if ($selector[count($selector)-1]['type'] === Tokenizer::WHITESPACE) array_pop($selector);
-			if (!isset($this->tss[$i])) break;
+			if ($selector[count($selector)-1]['type'] === Tokenizer::WHITESPACE) {
+				array_pop($selector);
+			}
+			if (!isset($this->tss[$i])) {
+				break;
+			}
 
 			$newRules = $this->cssToRules($selector, count($rules)+$indexStart, $this->getProperties($this->tss[$i]['value']));
 			$rules = $this->writeRule($rules, $newRules);
 		}
 		usort($rules, [$this, 'sortRules']);
-		if (empty($rules) && !empty($this->tss)) throw new \Exception("No TSS rules parsed");
+		if (empty($rules) && !empty($this->tss)) {
+			throw new \Exception("No TSS rules parsed");
+		}
 		return $rules;
 	}
 
@@ -71,7 +79,9 @@ 
 	}
 
 	private function processingInstructions($key, $indexStart) {
-		if (isset($this->tss[$key]) && $this->tss[$key]['type'] !== Tokenizer::AT_SIGN) return false;
+		if (isset($this->tss[$key]) && $this->tss[$key]['type'] !== Tokenizer::AT_SIGN) {
+			return false;
+		}
 		$rules = [];
 		$tokens = array_slice($this->tss, $key+1);
 		$tokens = $this->splitOnToken($tokens, Tokenizer::SEMI_COLON)[0];
@@ -90,7 +100,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;
 	}
@@ -99,7 +111,9 @@ 
 		$pos = 0;
 		while (($pos = strpos($str, $open, $pos)) !== false) {
 			$end = strpos($str, $close, $pos);
-			if ($end === false) break;
+			if ($end === false) {
+				break;
+			}
 			$str = substr_replace($str, '', $pos, $end-$pos+strlen($close));
 		}
 
@@ -110,8 +124,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;
 	}
@@ -123,13 +140,18 @@ 
 		$rules = [];
 		$i = 0;
 		foreach ($tokens as $token) {
-			if ($token['type'] === Tokenizer::SEMI_COLON) $i++;
-			else if ($token['type'] !== Tokenizer::WHITESPACE) $rules[$i][] = $token;
+			if ($token['type'] === Tokenizer::SEMI_COLON) {
+				$i++;
+			} else if ($token['type'] !== Tokenizer::WHITESPACE) {
+				$rules[$i][] = $token;
+			}
 		}
 
 		$return = [];
 		foreach ($rules as $rule) {
-			if ($rule[1]['type'] === Tokenizer::COLON) $return[$rule[0]['value']] = array_slice($rule, 2);
+			if ($rule[1]['type'] === Tokenizer::COLON) {
+				$return[$rule[0]['value']] = array_slice($rule, 2);
+			}
 		}
 
 		return $return;

src/Parser/CssToXpath.php

Spacing +6 added lines, -6 removed lines

@@ -19,12 +19,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.'")'.']'; }
 		];
 	}
 

Braces +21 added lines, -10 removed lines

@@ -49,7 +49,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 = [
@@ -59,8 +61,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]],
@@ -75,8 +76,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;
 	}
@@ -93,7 +97,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;
 	}
@@ -101,15 +107,20 @@ 
 	public function getXpath($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);