Level-2 / Transphporm

src/TSSFunction/Template.php

Braces +6 added lines, -2 removed lines

@@ -30,7 +30,9 @@ 
 		$newTemplate = new \Transphporm\Builder($this->baseDir . $args[0], $tss ? $this->baseDir . $tss : null);
 
 		$doc = $newTemplate->output($this->elementData->getData($element), true)->body;
-		if ($selector != '') return $this->templateSubsection($doc, $selector);
+		if ($selector != '') {
+			return $this->templateSubsection($doc, $selector);
+		}
 
 		return $this->getTemplateContent($doc, $tss);
 
@@ -60,7 +62,9 @@ 
 
 	private function getClonedElement($node, $tss) {
 		$clone = $node->cloneNode(true);
-		if ($tss != null && $clone instanceof \DomElement) $clone->setAttribute('transphporm', 'includedtemplate');
+		if ($tss != null && $clone instanceof \DomElement) {
+			$clone->setAttribute('transphporm', 'includedtemplate');
+		}
 		return $clone;
 	}
 }

src/Hook/ElementData.php

Braces +3 added lines, -1 removed lines

@@ -31,7 +31,9 @@
 	/** Returns the data that has been bound to $element, or, if no data is bound to $element climb the DOM tree to find the data bound to a parent node*/
 	public function getData(\DomElement $element = null, $type = 'data') {
 		while ($element) {
-			if (isset($this->elementMap[$element]) && isset($this->elementMap[$element][$type])) return $this->elementMap[$element][$type];
+			if (isset($this->elementMap[$element]) && isset($this->elementMap[$element][$type])) {
+				return $this->elementMap[$element][$type];
+			}
 			$element = $element->parentNode;
 		}
 		return $this->data;

src/Parser/Value.php

Spacing +1 added lines, -1 removed lines

@@ -156,7 +156,7 @@
 
 	private function callFuncOnObject($obj, $func, $args, $element) {
 		if (isset($obj->$func) && is_callable($obj->$func)) return call_user_func_array($obj->$func, $args);
-		else if (isset($obj->$func) && is_array($obj->$func))  {
+		else if (isset($obj->$func) && is_array($obj->$func)) {
 
 		}
 		else return call_user_func_array([$obj, $func], $args);

Braces +50 added lines, -32 removed lines

@@ -19,7 +19,9 @@ 
 	public function parse($str, $element = null, $returnTokens = false) {
 		$tokenizer = new Tokenizer($str);
 		$tokens = $tokenizer->getTokens();
-		if ($returnTokens) return $tokens;
+		if ($returnTokens) {
+			return $tokens;
+		}
 		$result = $this->parseTokens($tokens, $element, $this->data);
 		return $result;
 	}
@@ -29,10 +31,14 @@ 
 		$mode = Tokenizer::ARG;
 		$last = null;
 
-		if (empty($tokens)) return [$data];
+		if (empty($tokens)) {
+			return [$data];
+		}
 
 		foreach ($tokens as $token) {
-		if (is_string($token)) throw new \Exception($token);
+		if (is_string($token)) {
+			throw new \Exception($token);
+		}
 
 			if (in_array($token['type'], [Tokenizer::NOT, Tokenizer::EQUALS])) {
 				// ($last !== null) $result = $this->processValue($result, $mode, $last);
@@ -41,24 +47,32 @@ 
 
 				if ($mode == Tokenizer::NOT && $token['type'] == Tokenizer::EQUALS) {
 					$mode = Tokenizer::NOT;
+				} else {
+					$mode = $token['type'];
 				}
-				else $mode = $token['type'];
 			}
 
 			if ($token['type'] === Tokenizer::DOT) {
 				if ($last !== null) {
-					if (isset($data->$last)) $data = $data->$last;
-					else if (is_array($data) && isset($data[$last])) $data = $data[$last];
+					if (isset($data->$last)) {
+						$data = $data->$last;
+					} else if (is_array($data) && isset($data[$last])) {
+						$data = $data[$last];
+					}
+				} else {
+					$data = array_pop($result);
 				}
-				else $data = array_pop($result);
 
 				$last = null;
 			}
 
 			if ($token['type'] == Tokenizer::OPEN_SQUARE_BRACKET) {
 				if ($last !== null) {
-					if (isset($data->$last)) $data = $data->$last;
-					else if (is_array($data) && isset($data[$last])) $data = $data[$last];
+					if (isset($data->$last)) {
+						$data = $data->$last;
+					} else if (is_array($data) && isset($data[$last])) {
+						$data = $data[$last];
+					}
 				}
 
 				$last = $this->parseTokens($token['value'], $element, null)[0];
@@ -85,19 +99,22 @@ 
 
 					foreach ($result as $i => $value) {
 						if (is_array($data)) {
-							if (isset($data[$value])) $result[$i] = $data[$value];
+							if (isset($data[$value])) {
+								$result[$i] = $data[$value];
+							}
+						} else if (is_scalar($value) && isset($data->$value)) {
+							$result[$i] = $data->$value;
 						}
-						else if (is_scalar($value) && isset($data->$value)) $result[$i] = $data->$value;
 					}
 					$last = null;
-				}
-				else if ($data instanceof \Transphporm\Functionset) {
+				} else if ($data instanceof \Transphporm\Functionset) {
 					$result = $this->processValue($result, $mode, $data->$last($token['value'], $element));
 					$last = null;
-				}
-				else {
+				} else {
 					$args = $this->parseTokens($token['value'], $element, $data);
-					if ($args[0] == $data) $args = [];
+					if ($args[0] == $data) {
+						$args = [];
+					}
 					$funcResult = $this->callFunc($last, $args, $element, $data);
 					$result = $this->processValue($result, $mode, $funcResult);
 					$last = null;
@@ -120,14 +137,13 @@ 
 		if ($last !== null) {
 			if ($this->autoLookup && isset($data->$last)) {
 				$result = $this->processValue($result, $mode, $data->$last);
-			}
-			else if (is_array($data) && isset($data[$last])) {
+			} else if (is_array($data) && isset($data[$last])) {
 				$result = $this->processValue($result, $mode, $data[$last]);
-			}
-			else if (!$this->autoLookup) {
+			} else if (!$this->autoLookup) {
 				$result = $this->processValue($result, $mode, $last);
+			} else {
+				$result = [false];
 			}
-			else $result = [false];
 		}
 		return $result;
 	}
@@ -135,14 +151,11 @@ 
 	private function processValue($result, $mode, $newValue) {
 		if ($mode == Tokenizer::ARG) {
 			$result[] = $newValue;
-		}
-		else if ($mode == Tokenizer::CONCAT) {
+		} else if ($mode == Tokenizer::CONCAT) {
 				$result[count($result)-1] .= $newValue;
-		}
-		else if ($mode == Tokenizer::NOT) {
+		} else if ($mode == Tokenizer::NOT) {
 			$result[count($result)-1] = $result[count($result)-1] != $newValue;
-		}
-		else if ($mode == Tokenizer::EQUALS) {
+		} else if ($mode == Tokenizer::EQUALS) {
 			$result[count($result)-1] = $result[count($result)-1] == $newValue;
 		}
 
@@ -150,15 +163,20 @@ 
 	}
 
 	private function callFunc($name, $args, $element, $data) {
-		if ($data instanceof \Transphporm\FunctionSet) return $data->$name($args, $element);
-		else return $this->callFuncOnObject($data, $name, $args, $element);
+		if ($data instanceof \Transphporm\FunctionSet) {
+			return $data->$name($args, $element);
+		} else {
+			return $this->callFuncOnObject($data, $name, $args, $element);
+		}
 	}
 
 	private function callFuncOnObject($obj, $func, $args, $element) {
-		if (isset($obj->$func) && is_callable($obj->$func)) return call_user_func_array($obj->$func, $args);
-		else if (isset($obj->$func) && is_array($obj->$func))  {
+		if (isset($obj->$func) && is_callable($obj->$func)) {
+			return call_user_func_array($obj->$func, $args);
+		} else if (isset($obj->$func) && is_array($obj->$func))  {
 
+		} else {
+			return call_user_func_array([$obj, $func], $args);
 		}
-		else return call_user_func_array([$obj, $func], $args);
 	}
 }

src/Parser/Sheet.php

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
 			}
 
 			$selector = trim(substr($this->tss, $pos, $next-$pos));
-			$pos =  strpos($this->tss, '}', $next)+1;
+			$pos = strpos($this->tss, '}', $next)+1;
 			$newRules = $this->cssToRules($selector, count($rules)+$indexStart, $this->getProperties(trim(substr($this->tss, $next+1, $pos-2-$next))));
 			$rules = $this->writeRule($rules, $newRules);
 		}
@@ -63,7 +63,7 @@ 
 	private function processingInstructions($tss, $pos, $next, $indexStart) {
 		$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);
@@ -79,9 +79,9 @@ 
 	}
 
 	private function import($args, $indexStart) {
-		if (is_file(trim($args,'\'" '))) $fileName = trim($args,'\'" ');
+		if (is_file(trim($args, '\'" '))) $fileName = trim($args, '\'" ');
 		else $fileName = $this->valueParser->parse($args)[0];
-		$sheet = new Sheet(file_get_contents($this->baseDir . $fileName), $this->baseDir, $this->valueParser, $this->prefix);
+		$sheet = new Sheet(file_get_contents($this->baseDir.$fileName), $this->baseDir, $this->valueParser, $this->prefix);
 		return $sheet->parse(0, [], $indexStart);
 	}
 

Braces +18 added lines, -8 removed lines

@@ -33,7 +33,9 @@ 
 			$rules = $this->writeRule($rules, $newRules);
 		}
 		//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;
 	}
@@ -69,8 +71,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,15 +80,20 @@ 
 	}
 
 	private function import($args, $indexStart) {
-		if (is_file(trim($args,'\'" '))) $fileName = trim($args,'\'" ');
-		else $fileName = $this->valueParser->parse($args)[0];
+		if (is_file(trim($args,'\'" '))) {
+			$fileName = trim($args,'\'" ');
+		} else {
+			$fileName = $this->valueParser->parse($args)[0];
+		}
 		$sheet = new Sheet(file_get_contents($this->baseDir . $fileName), $this->baseDir, $this->valueParser, $this->prefix);
 		return $sheet->parse(0, [], $indexStart);
 	}
 
 	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;
 	}
@@ -96,7 +102,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+2);
 		}
 
@@ -109,7 +117,9 @@ 
 		$return = [];
 
 		foreach ($rules as $rule) {
-			if (trim($rule) === '') continue;
+			if (trim($rule) === '') {
+				continue;
+			}
 			$parts = explode(':', $rule, 2);
 			$parts[1] = $stringExtractor->rebuild($parts[1]);
 			$return[trim($parts[0])] = isset($parts[1]) ? trim($parts[1]) : '';

src/Parser/Tokenizer.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
 			$string = $this->extractString($i);
 			$length = strlen($string)+1;
 			$char = $this->getChar($char);
-			$string = str_replace('\\' . $char, $char, $string);
+			$string = str_replace('\\'.$char, $char, $string);
 			$tokens[] = ['type' => self::STRING, 'value' => $string];
 			return $length;
 		}

Braces +25 added lines, -10 removed lines

@@ -76,10 +76,15 @@ 
 				$name .= $this->str[$i+1];
 				$i++;
 			}
-			if (is_numeric($name)) $tokens[] = ['type' => self::NUMERIC, 'value' => $name];
-			else if ($name == 'true') $tokens[] = ['type' => self::BOOL, 'value' => true];
-			else if ($name == 'false') $tokens[] = ['type' => self::BOOL, 'value' => false];
-			else $tokens[] = ['type' => self::NAME, 'value' => $name];
+			if (is_numeric($name)) {
+				$tokens[] = ['type' => self::NUMERIC, 'value' => $name];
+			} else if ($name == 'true') {
+				$tokens[] = ['type' => self::BOOL, 'value' => true];
+			} else if ($name == 'false') {
+				$tokens[] = ['type' => self::BOOL, 'value' => false];
+			} else {
+				$tokens[] = ['type' => self::NAME, 'value' => $name];
+			}
 		}
 	}
 
@@ -114,7 +119,9 @@ 
 	private function extractString($pos) {
 		$char = $this->str[$pos];
 		$end = strpos($this->str, $char, $pos+1);
-		while ($end !== false && $this->str[$end-1] == '\\') $end = strpos($this->str, $char, $end+1);
+		while ($end !== false && $this->str[$end-1] == '\\') {
+			$end = strpos($this->str, $char, $end+1);
+		}
 
 		return substr($this->str, $pos+1, $end-$pos-1);
 	}
@@ -123,18 +130,26 @@ 
 		$close = strpos($this->str, $closeBracket, $open);
 
 		$cPos = $open+1;
-		while (($cPos = strpos($this->str, $startBracket, $cPos+1)) !== false && $cPos < $close) $close = strpos($this->str, $closeBracket, $close+1);
+		while (($cPos = strpos($this->str, $startBracket, $cPos+1)) !== false && $cPos < $close) {
+			$close = strpos($this->str, $closeBracket, $close+1);
+		}
 		return substr($this->str, $open+1, $close-$open-1);
 	}
 
 	private function identifyChar($chr) {
-		if (isset($this->chars[$chr])) return $this->chars[$chr];
-		else return self::NAME;
+		if (isset($this->chars[$chr])) {
+			return $this->chars[$chr];
+		} else {
+			return self::NAME;
+		}
 	}
 
 	private function getChar($num) {
 		$chars = array_reverse($this->chars);
-		if (isset($chars[$num])) return $chars[$num];
-		else return false;
+		if (isset($chars[$num])) {
+			return $chars[$num];
+		} else {
+			return false;
+		}
 	}
 }

src/Property/Repeat.php

Braces +15 added lines, -5 removed lines

@@ -15,13 +15,19 @@ 
 	}
 
 	public function run(array $values, \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);
+		}
 		$max = $this->getMax($values);
 		$count = 0;
 
-		if (empty($values[0])) $values[0] = [];
+		if (empty($values[0])) {
+			$values[0] = [];
+		}
 		foreach ($values[0] as $key => $iteration) {
-			if ($count+1 > $max) break;
+			if ($count+1 > $max) {
+				break;
+			}
 			$clone = $this->cloneElement($element, $iteration, $key, $count++);
 			//Re-run the hook on the new element, but use the iterated data
 			//Don't run repeat on the clones element or it will loop forever
@@ -45,7 +51,9 @@ 
 
 	private function tagElement($element, $count) {
 		//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) $element->setAttribute('transphporm', 'added');
+		if ($count > 0) {
+			$element->setAttribute('transphporm', 'added');
+		}
 	}
 
 	private function getMax($values) {
@@ -54,7 +62,9 @@ 
 
 	private function createHook($newRules, $pseudoMatcher, $properties) {
 		$hook = new \Transphporm\Hook\PropertyHook($newRules, $pseudoMatcher, new \Transphporm\Parser\Value($this->functionSet));
-		foreach ($properties as $name => $property) $hook->registerProperty($name, $property);
+		foreach ($properties as $name => $property) {
+			$hook->registerProperty($name, $property);
+		}
 		return $hook;
 	}
 }

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

src/Property/Content.php

Braces +24 added lines, -10 removed lines

@@ -18,21 +18,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,21 +61,26 @@ 
 	}
 	
 	private function getNode($node, $document) {
-		if (is_array($node[0])) $node = $node[0];
+		if (is_array($node[0])) {
+			$node = $node[0];
+		}
 		foreach ($node as $n) {
 
 			if ($n instanceof \DomElement) {
 				$new = $document->importNode($n, true);
 				//Removing this might cause problems with caching... 
 				//$new->setAttribute('transphporm', 'added');
-			}
-			else {
+			} else {
 				
 
 
-				if ($n instanceof \DomText) $n = $n->nodeValue;
+				if ($n instanceof \DomText) {
+					$n = $n->nodeValue;
+				}
 				$new = $document->createElement('text');
-				if (is_array($n)) throw new \Exception();
+				if (is_array($n)) {
+					throw new \Exception();
+				}
 				
 				$new->appendChild($document->createTextNode($n));
 				$new->setAttribute('transphporm', 'text');
@@ -114,6 +126,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/Pseudo/Attribute.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 
 		$valueParser = new \Transphporm\Parser\Value($this->functionSet);
 
-		$criteria = $name . '(' . $criteria;
+		$criteria = $name.'('.$criteria;
 
 		$pos = strpos($pseudo, '!');
 		if ($pos === false) $pos = strpos($pseudo, '=');

Braces +11 added lines, -4 removed lines

@@ -15,10 +15,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->functionSet, $name])) return true;
+		if (!is_callable([$this->functionSet, $name])) {
+			return true;
+		}
 
 		$bracketMatcher = new \Transphporm\Parser\BracketMatcher($pseudo);
 		$criteria = $bracketMatcher->match('[', ']');
@@ -28,11 +32,14 @@ 
 		$criteria = $name . '(' . $criteria;
 
 		$pos = strpos($pseudo, '!');
-		if ($pos === false) $pos = strpos($pseudo, '=');
+		if ($pos === false) {
+			$pos = strpos($pseudo, '=');
+		}
 		if ($pos === false) {
 			$criteria .= ')=true';
+		} else {
+			$criteria = substr_replace($criteria, ')', $pos, 0);
 		}
-		else $criteria = substr_replace($criteria, ')', $pos, 0);
 
 		return $valueParser->parse($criteria, $element)[0];
 	}