Level-2 / Transphporm

src/Pseudo/Not.php

Braces +6 added lines, -2 removed lines

@@ -16,7 +16,9 @@ 
 	}
 
 	public function match($name, $args, \DomElement $element) {
-		if ($name !== 'not') return true;
+		if ($name !== 'not') {
+			return true;
+		}
 		
 		$xpath = new \DomXpath($element->ownerDocument);
 		return $this->notElement($args, $xpath, $element);
@@ -29,7 +31,9 @@ 
 			//Find all nodes matched by the expressions in the brackets :not(EXPR)
 			foreach ($xpath->query($xpathString) as $matchedElement) {
 				//Check to see whether this node was matched by the not query
-				if ($element->isSameNode($matchedElement)) return false;
+				if ($element->isSameNode($matchedElement)) {
+					return false;
+				}
 			}
 		}
 		return true;

src/Pseudo/Attribute.php

Braces +3 added lines, -1 removed lines

@@ -14,7 +14,9 @@
 	}
 
 	public function match($name, $args, \DomElement $element) {
-		if (!($name === null || in_array($name, ['data', 'iteration', 'root'])))  return true;
+		if (!($name === null || in_array($name, ['data', 'iteration', 'root']))) {
+			return true;
+		}
 		return $args[0];
 	}
 }

src/Property/Content.php

Doc Comments +16 added lines

@@ -28,6 +28,9 @@ 
 		}
 	}
 
+	/**
+	 * @param \DOMElement $element
+	 */
 	private function shouldRun($element) {
 		do {
 			if ($element->getAttribute('transphporm') == 'includedtemplate') return false;
@@ -40,6 +43,10 @@ 
 		return (isset($rules['content-mode'])) ? $rules['content-mode'] : 'append';
 	}
 
+	/**
+	 * @param \DOMElement $element
+	 * @param \Transphporm\Hook\PseudoMatcher $pseudoMatcher
+	 */
 	private function processPseudo($value, $element, $pseudoMatcher) {
 		$pseudoContent = ['attr', 'header', 'before', 'after'];
 		foreach ($pseudoContent as $pseudo) {
@@ -96,6 +103,9 @@ 
 		}
 	}
 
+	/**
+	 * @param \DOMElement $element
+	 */
 	private function replaceContent($element, $content) {
 		//If this rule was cached, the elements that were added last time need to be removed prior to running the rule again.
 		foreach ($this->getNode($content, $element->ownerDocument) as $node) {
@@ -104,12 +114,18 @@ 
 		$element->setAttribute('transphporm', 'remove');
 	}
 
+	/**
+	 * @param \DOMElement $element
+	 */
 	private function appendContent($element, $content) {
 		foreach ($this->getNode($content, $element->ownerDocument) as $node) {
 			$element->appendChild($node);
 		}
 	}
 
+	/**
+	 * @param \DOMElement $element
+	 */
 	private function removeAllChildren($element) {
 		while ($element->hasChildNodes()) $element->removeChild($element->firstChild);
 	}

Braces +22 added lines, -11 removed lines

@@ -16,21 +16,28 @@ 
 	}
 
 	public function run(array $values, \DomElement $element, array $rules, \Transphporm\Hook\PseudoMatcher $pseudoMatcher, array $properties = []) {
-		if (!$this->shouldRun($element)) return false;
+		if (!$this->shouldRun($element)) {
+			return false;
+		}
 		$values = $this->formatter->format($values, $rules);
 
 		if (!$this->processPseudo($values, $element, $pseudoMatcher)) {
 			//Remove the current contents
 			$this->removeAllChildren($element);
 			//Now make a text node
-			if ($this->getContentMode($rules) === 'replace') $this->replaceContent($element, $values);
-			else $this->appendContent($element, $values);
+			if ($this->getContentMode($rules) === 'replace') {
+				$this->replaceContent($element, $values);
+			} else {
+				$this->appendContent($element, $values);
+			}
 		}
 	}
 
 	private function shouldRun($element) {
 		do {
-			if ($element->getAttribute('transphporm') == 'includedtemplate') return false;
+			if ($element->getAttribute('transphporm') == 'includedtemplate') {
+				return false;
+			}
 		}
 		while (($element = $element->parentNode) instanceof \DomElement);
 		return true;
@@ -54,16 +61,18 @@ 
 	private function getNode($node, $document) {
 		foreach ($node as $n) {
 			if (is_array($n)) {
-				foreach ($this->getNode($n, $document) as $new) yield $new;
-			}
-			else {
+				foreach ($this->getNode($n, $document) as $new) {
+					yield $new;
+				}
+			} else {
 				if ($n instanceof \DomElement) {
 					$new = $document->importNode($n, true);
 					//Removing this might cause problems with caching...
 					//$new->setAttribute('transphporm', 'added');
-				}
-				else {
-					if ($n instanceof \DomText) $n = $n->nodeValue;
+				} else {
+					if ($n instanceof \DomText) {
+						$n = $n->nodeValue;
+					}
 					$new = $document->createElement('text');
 
 					$new->appendChild($document->createTextNode($n));
@@ -111,6 +120,8 @@ 
 	}
 
 	private function removeAllChildren($element) {
-		while ($element->hasChildNodes()) $element->removeChild($element->firstChild);
+		while ($element->hasChildNodes()) {
+			$element->removeChild($element->firstChild);
+		}
 	}
 }

src/Hook/PseudoMatcher.php

Braces +13 added lines, -5 removed lines

@@ -39,27 +39,35 @@
 		$parts['name'] = $this->getFuncName($tokens);
 		if ($parts['name'] === null || in_array($parts['name'], ['data', 'iteration', 'root'])) {
 			$parts['args'] = $this->valueParser->parseTokens($tokens);
+		} elseif (isset($tokens[1])) {
+			$parts['args'] = $this->valueParser->parseTokens($tokens[1]['value']);
+		} else {
+			$parts['args'] = [['']];
 		}
-		elseif (isset($tokens[1])) $parts['args'] = $this->valueParser->parseTokens($tokens[1]['value']);
-		else $parts['args'] = [['']];
 		return $parts;
 	}
 
 	private function getFuncName($tokens) {
-		if ($tokens[0]['type'] === Tokenizer::NAME) return $tokens[0]['value'];
+		if ($tokens[0]['type'] === Tokenizer::NAME) {
+			return $tokens[0]['value'];
+		}
 		return null;
 	}
 
 	public function hasFunction($name) {
 		foreach ($this->pseudo as $tokens) {
-			if ($name === $this->getFuncName($tokens)) return true;
+			if ($name === $this->getFuncName($tokens)) {
+				return true;
+			}
 		}
 	}
 
 	public function getFuncArgs($name) {
 		foreach ($this->pseudo as $tokens) {
 			$parts = $this->getFuncParts($tokens);
-			if ($name === $parts['name']) return $parts['args'];
+			if ($name === $parts['name']) {
+				return $parts['args'];
+			}
 		}
 	}
 }

src/Parser/Value.php

Braces +22 added lines, -16 removed lines

@@ -50,10 +50,14 @@ 
 		$this->data = new ValueData($data ? $data : $this->baseData);
 		$this->last = null;
 
-		if (empty($tokens)) return [$data];
+		if (empty($tokens)) {
+			return [$data];
+		}
 
 		foreach ($tokens as $token) {
-			if ($token['type'] !== Tokenizer::WHITESPACE) $this->{$this->tokenFuncs[$token['type']]}($token);
+			if ($token['type'] !== Tokenizer::WHITESPACE) {
+				$this->{$this->tokenFuncs[$token['type']]}($token);
+			}
 		}
 
 		$this->processLast();
@@ -72,13 +76,15 @@ 
 	//Reads the last selected value from $data regardless if it's an array or object and overrides $this->data with the new value
 	//Dot moves $data to the next object in $data foo.bar moves the $data pointer from `foo` to `bar`
 	private function processDot($token) {
-		if ($this->last !== null) $this->data->traverse($this->last);
-		else {
+		if ($this->last !== null) {
+			$this->data->traverse($this->last);
+		} else {
 			//When . is not preceeded by anything, treat it as part of the string instead of an operator
 			// foo.bar is treated as looking up `bar` in `foo` whereas .foo is treated as the string ".foo"
 			$lastResult = $this->result->pop();
-			if ($lastResult) $this->data = new ValueData($lastResult);
-			else {
+			if ($lastResult) {
+				$this->data = new ValueData($lastResult);
+			} else {
 				$this->processString(['value' => '.']);
 				$this->result->setMode(Tokenizer::CONCAT);
 			}
@@ -91,9 +97,10 @@ 
 		$parser = new Value($this->baseData, $this->autoLookup);
 		if ($this->baseData instanceof \Transphporm\Functionset && $this->baseData->hasFunction($this->last)) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
-			if ($this->last !== null) $this->data->traverse($this->last);
+		} else {
+			if ($this->last !== null) {
+				$this->data->traverse($this->last);
+			}
 			$this->last = $parser->parseTokens($token['value'], null)[0];
 		}
 	}
@@ -113,8 +120,7 @@ 
 	private function processBrackets($token) {
 		if ($this->baseData instanceof \Transphporm\Functionset && $this->baseData->hasFunction($this->last)) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
+		} else {
 			$this->processNested($token);
 		}
 	}
@@ -131,7 +137,9 @@ 
 		foreach ($this->result->getResult() as $i => $value) {
 			if (is_scalar($value)) {
 				$val = $this->data->read($value);
-				if ($val) $this->result[$i] = $val;
+				if ($val) {
+					$this->result[$i] = $val;
+				}
 			}
 		}
 		$this->last = null;
@@ -143,12 +151,10 @@ 
 			try {
 				$value = $this->data->extract($this->last, $this->autoLookup);
 				$this->result->processValue($value);
-			}
-			catch (\UnexpectedValueException $e) {
+			} catch (\UnexpectedValueException $e) {
 				if (!$this->autoLookup) {
 					$this->result->processValue($this->last);
-				}
-				else {
+				} else {
 					$this->result->clear();
 					$this->result[0] = false;
 				}

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 +32 added lines, -11 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;
 	}
 
@@ -69,7 +77,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];
@@ -88,7 +98,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;
 	}
@@ -97,7 +109,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));
 		}
 
@@ -108,8 +122,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;
 	}
@@ -117,7 +134,9 @@ 
 	private function removeWhitespace($tokens) {
 		$newTokens = [];
 		foreach ($tokens as $token) {
-			if ($token['type'] !== Tokenizer::WHITESPACE) $newTokens[] = $token;
+			if ($token['type'] !== Tokenizer::WHITESPACE) {
+				$newTokens[] = $token;
+			}
 		}
 		return $newTokens;
 	}
@@ -127,7 +146,9 @@ 
 		$return = [];
 		foreach ($rules as $rule) {
 			$rule = $this->removeWhitespace($rule);
-			if (isset($rule[1]) && $rule[1]['type'] === Tokenizer::COLON) $return[$rule[0]['value']] = array_slice($rule, 2);
+			if (isset($rule[1]) && $rule[1]['type'] === Tokenizer::COLON) {
+				$return[$rule[0]['value']] = array_slice($rule, 2);
+			}
 		}
 
 		return $return;

src/Parser/CssToXpath.php

Indentation +4 added lines, -4 removed lines

@@ -49,11 +49,11 @@
 		$functionSet->setElement($element[0]);
 
 		$attributes = array();
-        foreach($element[0]->attributes as $attribute_name => $attribute_node) {
-            $attributes[$attribute_name] = $attribute_node->nodeValue;
-        }
+		foreach($element[0]->attributes as $attribute_name => $attribute_node) {
+			$attributes[$attribute_name] = $attribute_node->nodeValue;
+		}
 
-        $parser = new \Transphporm\Parser\Value($functionSet, true);
+		$parser = new \Transphporm\Parser\Value($functionSet, true);
 		$return = $parser->parseTokens($attr, $attributes);
 
 		return $return[0] === '' ? false : $return[0];

Spacing +7 added lines, -7 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.'")'.']'; }
 		];
 	}
 
@@ -49,7 +49,7 @@ 
 		$functionSet->setElement($element[0]);
 
 		$attributes = array();
-        foreach($element[0]->attributes as $attribute_name => $attribute_node) {
+        foreach ($element[0]->attributes as $attribute_name => $attribute_node) {
             $attributes[$attribute_name] = $attribute_node->nodeValue;
         }
 

Braces +17 added lines, -7 removed lines

@@ -63,8 +63,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;
 	}
@@ -81,7 +84,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;
 	}
@@ -89,15 +94,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);

src/Property/Display.php

Braces +7 added lines, -3 removed lines

@@ -7,8 +7,12 @@
 namespace Transphporm\Property;
 class Display implements \Transphporm\Property {
 	public function run(array $values, \DomElement $element, array $rules, \Transphporm\Hook\PseudoMatcher $pseudoMatcher, array $properties = []) {
-		if ($pseudoMatcher->hasFunction('attr')) $element->removeAttribute($pseudoMatcher->getFuncArgs('attr')[0]);
-		else if (strtolower($values[0]) === 'none') $element->setAttribute('transphporm', 'remove');
-		else $element->setAttribute('transphporm', 'show');
+		if ($pseudoMatcher->hasFunction('attr')) {
+			$element->removeAttribute($pseudoMatcher->getFuncArgs('attr')[0]);
+		} else if (strtolower($values[0]) === 'none') {
+			$element->setAttribute('transphporm', 'remove');
+		} else {
+			$element->setAttribute('transphporm', 'show');
+		}
 	}
 }