Level-2 / Transphporm

src/PropertyBuilder.php

Braces +3 added lines, -1 removed lines

@@ -20,7 +20,9 @@
 		$formatter->register(new Formatter\Date($locale));
 		$formatter->register(new Formatter\StringFormatter());
 		
-		foreach ($formatters as $format) $formatter->register($format);
+		foreach ($formatters as $format) {
+			$formatter->register($format);
+		}
 
 		$this->builder->registerProperty('content', new Property\Content($data, $headers, $formatter));
 		$this->builder->registerProperty('repeat', new Property\Repeat($data));

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

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

Braces +10 added lines, -5 removed lines

@@ -33,7 +33,9 @@ 
 			$rules = $this->writeRule($rules, $selector, $rule);
 		}
 		//there may be processing instructions at the end
-		if ($processing = $this->processingInstructions($this->tss, $pos, strlen($this->tss), count($rules)+$indexStart)) $rules = array_merge($rules, $processing['rules']);
+		if ($processing = $this->processingInstructions($this->tss, $pos, strlen($this->tss), count($rules)+$indexStart)) {
+			$rules = array_merge($rules, $processing['rules']);
+		}
 		usort($rules, [$this, 'sortRules']);
 		return $rules;
 	}
@@ -63,8 +65,7 @@ 
 				$pos = strpos($tss, ';', $spacePos);
 				$args = substr($tss, $spacePos+1, $pos-$spacePos-1);
 				$rules = array_merge($rules, $this->$funcName($args, $indexStart));
-			}
-			else {
+			} else {
 				break;	
 			} 
 		}
@@ -79,7 +80,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;
 	}
@@ -100,7 +103,9 @@ 
 		$return = [];
 
 		foreach ($rules as $rule) {
-			if (trim($rule) === '') continue;
+			if (trim($rule) === '') {
+				continue;
+			}
 			$parts = explode(':', $rule, 2);
 
 			$parts[1] = $stringExtractor->rebuild($parts[1]);

Doc Comments +15 added lines

@@ -12,6 +12,9 @@ 
 	private $prefix;
 	private $valueParser;
 
+	/**
+	 * @param string $tss
+	 */
 	public function __construct($tss, $baseDir, Value $valueParser, $prefix = '') {
 		$this->tss = $this->stripComments($tss);
 		$this->baseDir = $baseDir;
@@ -37,6 +40,10 @@ 
 		return $rules;
 	}
 
+	/**
+	 * @param string $selector
+	 * @param integer $index
+	 */
 	private function CssToRules($selector, $index, $properties) {
 		$parts = explode(',', $selector);
 		$rules = [];
@@ -59,6 +66,11 @@ 
 		return $rules;
 	}
 
+	/**
+	 * @param integer $pos
+	 * @param integer $next
+	 * @param integer $indexStart
+	 */
 	private function processingInstructions($tss, $pos, $next, $indexStart) {
 		$rules = [];
 		while (($atPos = strpos($tss, '@', $pos)) !== false) {
@@ -99,6 +111,9 @@ 
 		return $str;
 	}
 
+	/**
+	 * @param string $str
+	 */
 	private function getProperties($str) {
 		$stringExtractor = new StringExtractor($str);
 		$rules = explode(';', $stringExtractor);

src/Parser/StringExtractor.php

Spacing +2 added lines, -2 removed lines

@@ -17,8 +17,8 @@
 		while (($pos = strpos($str, '"', $pos+1)) !== false) {
 			$end = strpos($str, '"', $pos+1);
 			while ($str[$end-1] == '\\') $end = strpos($str, '"', $end+1);
-			$strings['$+STR' . ++$num] = substr($str, $pos, $end-$pos+1);
-			$str = substr_replace($str, '$+STR' . $num, $pos, $end-$pos+1);
+			$strings['$+STR'.++$num] = substr($str, $pos, $end-$pos+1);
+			$str = substr_replace($str, '$+STR'.$num, $pos, $end-$pos+1);
 		}
 
 		return [$str, $strings];

Braces +3 added lines, -1 removed lines

@@ -16,7 +16,9 @@
 		$strings = [];
 		while (($pos = strpos($str, '"', $pos+1)) !== false) {
 			$end = strpos($str, '"', $pos+1);
-			while ($str[$end-1] == '\\') $end = strpos($str, '"', $end+1);
+			while ($str[$end-1] == '\\') {
+				$end = strpos($str, '"', $end+1);
+			}
 			$strings['$+STR' . ++$num] = substr($str, $pos, $end-$pos+1);
 			$str = substr_replace($str, '$+STR' . $num, $pos, $end-$pos+1);
 		}

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) {

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

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;

src/Property/Bind.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 		$this->data = $data;
 	}
 
-	public function run($value, \DomElement $element, \Transphporm\Hook\PropertyHook $rule)  {
+	public function run($value, \DomElement $element, \Transphporm\Hook\PropertyHook $rule) {
 		$this->data->bind($element, $value);
 	}
 }
\ No newline at end of file

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/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, \Transphporm\Hook\PropertyHook $rule) {
-		if ($attr = $rule->getPseudoMatcher()->attr()) $element->removeAttribute($attr);
-		else if (strtolower($value[0]) === 'none') $element->setAttribute('transphporm', 'remove');
-		else $element->setAttribute('transphporm', 'show');
+		if ($attr = $rule->getPseudoMatcher()->attr()) {
+			$element->removeAttribute($attr);
+		} else if (strtolower($value[0]) === 'none') {
+			$element->setAttribute('transphporm', 'remove');
+		} else {
+			$element->setAttribute('transphporm', 'show');
+		}
 	}
 }
\ No newline at end of file

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\PropertyHook $rule
+	 */
 	private function processPseudo($value, $element, $rule) {
 		return $this->pseudoAttr($value, $element, $rule) || $this->pseudoHeader($value, $element, $rule) || $this->pseudoBefore($value, $element, $rule) || $this->pseudoAfter($value, $element, $rule);
 	}
@@ -96,6 +100,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);
@@ -105,12 +112,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, \Transphporm\Hook\PropertyHook $rule) {
-		if ($element->getAttribute('transphporm') === 'remove') return;
+		if ($element->getAttribute('transphporm') === 'remove') {
+			return;
+		}
 				
 		$value = $this->formatter->format($value, $rule->getRules());
 		if (!$this->processPseudo($value, $element, $rule)) {
 			//Remove the current contents
 			$this->removeAllChildren($element);
 			//Now make a text node
-			if ($this->getContentMode($rule->getRules()) === 'replace') $this->replaceContent($element, $value);
-			else $this->appendContent($element, $value);
+			if ($this->getContentMode($rule->getRules()) === 'replace') {
+				$this->replaceContent($element, $value);
+			} else {
+				$this->appendContent($element, $value);
+			}
 		}
 	}
 
@@ -57,9 +62,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');
@@ -91,7 +97,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) {
@@ -110,6 +118,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