Level-2 / Transphporm

src/Parser/Value.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 		$finalPos = $this->findMatchingPos($str, $marker);
 		$string = substr($str, 1, $finalPos-1);
 		//Now remove escape characters
-		return str_replace('\\' . $marker, $marker, $string);
+		return str_replace('\\'.$marker, $marker, $string);
 	}
 
 	private function parseFunction($function) {

Doc Comments +7 added lines

@@ -63,6 +63,9 @@ 
 		return $array;
 	}
 
+	/**
+	 * @param \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 \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 +17 added lines, -10 removed lines

@@ -28,8 +28,9 @@ 
 			$params = $bracketMatcher->match('(', ')');
 			
 			return ['name' => $name, 'params' => $params, 'endPoint' => $bracketMatcher->getClosePos()];
+		} else {
+			return ['name' => null, 'params' => $function, 'endPoint' => strlen($function)];
 		}
-		else return ['name' => null, 'params' => $function, 'endPoint' => strlen($function)];
 	}
 
 	public function parse($function, \DomElement $element) {
@@ -37,23 +38,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;
 	}
 
@@ -65,7 +69,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;
 	}
 	
@@ -73,8 +79,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/Parser/CssToXpath.php

Doc Comments +3 added lines

@@ -50,6 +50,9 @@
 		return $attr;
 	}
 
+	/**
+	 * @param string $comparator
+	 */
 	private static function compare($comparator, $a, $b) {
 		if ($comparator == '=') return $a == $b;
 		else if ($comparator == '!=') return $a != $b;

Braces +10 added lines, -4 removed lines

@@ -51,8 +51,11 @@ 
 	}
 
 	private static function compare($comparator, $a, $b) {
-		if ($comparator == '=') return $a == $b;
-		else if ($comparator == '!=') return $a != $b;
+		if ($comparator == '=') {
+			return $a == $b;
+		} else if ($comparator == '!=') {
+			return $a != $b;
+		}
 	}
 
 	//split the css into indivudal functions
@@ -66,8 +69,9 @@ 
 				$selector = $this->createSelector();
 				$selector->type = $css[$i];
 				$selectors[] = $selector;
+			} else {
+				$selector->string .= $css[$i];
 			}
-			else $selector->string .= $css[$i];			
 		}
 		return $selectors;
 	}
@@ -78,7 +82,9 @@ 
 		$this->depth = count($selectors);
 		$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);

Spacing +7 added lines, -7 removed lines

@@ -15,14 +15,14 @@
 	public function __construct($css, Value $valueParser, $prefix = '') {
 		$hash = $this->registerInstance();
 		$this->valueParser = $valueParser;
-		$this->css = str_replace([' >', '> '],['>', '>'], trim($css));
+		$this->css = str_replace([' >', '> '], ['>', '>'], trim($css));
 		$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, $xpath) use($hash) { return '[' .'php:function(\'\Transphporm\Parser\CssToXpath::processAttr\', \'' . $string . '\', ., "' . $hash . '")' . ']';	},
+			' ' => 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, $xpath) use($hash) { return '['.'php:function(\'\Transphporm\Parser\CssToXpath::processAttr\', \''.$string.'\', ., "'.$hash.'")'.']'; },
 			']' => function() {	return ''; }
 		];
 	}

src/Hook/PostProcess.php

Braces +7 added lines, -3 removed lines

@@ -9,9 +9,13 @@
 class PostProcess implements \Transphporm\Hook {
 	public function run(\DomElement $element) {
 		$transphporm = $element->getAttribute('transphporm');
-		if ($transphporm === 'remove') $element->parentNode->removeChild($element);
-		else if ($transphporm === 'text') $element->parentNode->replaceChild($element->firstChild, $element);
-		else $element->removeAttribute('transphporm');
+		if ($transphporm === 'remove') {
+			$element->parentNode->removeChild($element);
+		} else if ($transphporm === 'text') {
+			$element->parentNode->replaceChild($element->firstChild, $element);
+		} else {
+			$element->removeAttribute('transphporm');
+		}
 	}
 
 }
\ No newline at end of file

src/Parser/BracketMatcher.php

Braces +3 added lines, -1 removed lines

@@ -19,7 +19,9 @@
 		$close = strpos($this->str, $closingChr, $open);
 
 		$cPos = $open+1;
-		while (($cPos = strpos($this->str, $openChr, $cPos+1)) !== false && $cPos < $close) $close = strpos($this->str, $closingChr, $close+1);
+		while (($cPos = strpos($this->str, $openChr, $cPos+1)) !== false && $cPos < $close) {
+			$close = strpos($this->str, $closingChr, $close+1);
+		}
 
 		$this->startPos = $open;
 		$this->endPos = $close;

src/Property/Content.php

Doc Comments +13 added lines

@@ -34,6 +34,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) {
@@ -91,6 +95,9 @@ 
 		foreach ($remove as $r) $r->parentNode->removeChild($r);
 	}
 
+	/**
+	 * @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.
 		$this->removeAdded($element);
@@ -100,12 +107,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 +18 added lines, -8 removed lines

@@ -18,15 +18,20 @@ 
 	}
 
 	public function run($value, \DomElement $element, array $rules, \Transphporm\Hook\PseudoMatcher $pseudoMatcher, array $properties = []) {
-		if ($element->getAttribute('transphporm') === 'remove') return;
+		if ($element->getAttribute('transphporm') === 'remove') {
+			return;
+		}
 	
 		$value = $this->formatter->format($value, $rules);
 		if (!$this->processPseudo($value, $element, $pseudoMatcher)) {
 			//Remove the current contents
 			$this->removeAllChildren($element);
 			//Now make a text node
-			if ($this->getContentMode($rules) === 'replace') $this->replaceContent($element, $value);
-			else $this->appendContent($element, $value);
+			if ($this->getContentMode($rules) === 'replace') {
+				$this->replaceContent($element, $value);
+			} else {
+				$this->appendContent($element, $value);
+			}
 		}
 	}
 
@@ -50,9 +55,10 @@ 
 			if ($n instanceof \DomElement) {
 				$new = $document->importNode($n, true);
 				$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));
 				$new->setAttribute('transphporm', 'text');
@@ -88,7 +94,9 @@ 
 		while ($e = $e->previousSibling && !in_array($e->getAttribute('transphporm'), [null, 'remove'])) {
 			$remove[] = $e;
 		}
-		foreach ($remove as $r) $r->parentNode->removeChild($r);
+		foreach ($remove as $r) {
+			$r->parentNode->removeChild($r);
+		}
 	}
 
 	private function replaceContent($element, $content) {
@@ -107,6 +115,8 @@ 
 	}
 	
 	private function removeAllChildren($element) {
-		while ($element->hasChildNodes()) $element->removeChild($element->firstChild);
+		while ($element->hasChildNodes()) {
+			$element->removeChild($element->firstChild);
+		}
 	}
 }
\ No newline at end of file

src/Property/Repeat.php

Doc Comments +3 added lines

@@ -34,6 +34,9 @@
 		return false;
 	}
 
+	/**
+	 * @param \Transphporm\Hook\PseudoMatcher $pseudoMatcher
+	 */
 	private function createHook($newRules, $pseudoMatcher, $properties) {
 		$hook = new \Transphporm\Hook\PropertyHook($newRules, $pseudoMatcher, new \Transphporm\Parser\Value($this->data));
 		foreach ($properties as $name => $property) $hook->registerProperty($name, $property);

Braces +9 added lines, -3 removed lines

@@ -13,13 +13,17 @@ 
 	}
 
 	public function run($value, \DomElement $element, array $rules, \Transphporm\Hook\PseudoMatcher $pseudoMatcher, array $properties = []) {
-		if ($element->getAttribute('transphporm') === 'added') return $element->parentNode->removeChild($element);
+		if ($element->getAttribute('transphporm') === 'added') {
+			return $element->parentNode->removeChild($element);
+		}
 
 		$count = 0;
 		foreach ($value as $key => $iteration) {
 			$clone = $element->cloneNode(true);
 			//Mark all but one of the nodes as having been added by transphporm, when the hook is run again, these are removed
-			if ($count > 0) $clone->setAttribute('transphporm', 'added');
+			if ($count > 0) {
+				$clone->setAttribute('transphporm', 'added');
+			}
 			$this->data->bind($clone, $iteration, 'iteration');
 			$this->data->bind($clone, $key, 'key');
 			$element->parentNode->insertBefore($clone, $element);
@@ -38,7 +42,9 @@ 
 
 	private function createHook($newRules, $pseudoMatcher, $properties) {
 		$hook = new \Transphporm\Hook\PropertyHook($newRules, $pseudoMatcher, new \Transphporm\Parser\Value($this->data));
-		foreach ($properties as $name => $property) $hook->registerProperty($name, $property);
+		foreach ($properties as $name => $property) {
+			$hook->registerProperty($name, $property);
+		}
 		return $hook;
 	}
 }
\ No newline at end of file

src/Hook/PropertyHook.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->rules, $this->pseudoMatcher, $this->properties);
+		if (isset($this->properties[$name])) {
+			return $this->properties[$name]->run($value, $element, $this->rules, $this->pseudoMatcher, $this->properties);
+		}
 		return false;
 	}
 }

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($value, \DomElement $element, array $rules, \Transphporm\Hook\PseudoMatcher $pseudoMatcher, array $properties = []) {
-		if ($pseudoMatcher->hasFunction('attr')) $element->removeAttribute($pseudoMatcher->getFuncArgs('attr'));
-		else if (strtolower($value[0]) === 'none') $element->setAttribute('transphporm', 'remove');
-		else $element->setAttribute('transphporm', 'show');
+		if ($pseudoMatcher->hasFunction('attr')) {
+			$element->removeAttribute($pseudoMatcher->getFuncArgs('attr'));
+		} else if (strtolower($value[0]) === 'none') {
+			$element->setAttribute('transphporm', 'remove');
+		} else {
+			$element->setAttribute('transphporm', 'show');
+		}
 	}
 }
\ No newline at end of file

src/Pseudo/Attribute.php

Braces +15 added lines, -6 removed lines

@@ -14,10 +14,14 @@ 
 
 	public function match($pseudo, \DomElement $element) {
 		$pos = strpos($pseudo, '[');
-		if ($pos === false) return true;
+		if ($pos === false) {
+			return true;
+		}
 		
 		$name = substr($pseudo, 0, $pos);
-		if (!is_callable([$this->dataFunction, $name])) return true;
+		if (!is_callable([$this->dataFunction, $name])) {
+			return true;
+		}
 
 		$bracketMatcher = new \Transphporm\Parser\BracketMatcher($pseudo);
 		$criteria = $bracketMatcher->match('[', ']');
@@ -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 '';
 	}
 
 }
\ No newline at end of file