Level-2 / Transphporm

src/FilePath.php

Spacing +3 added lines, -3 removed lines

@@ -14,15 +14,15 @@
 
 	public function getFilePath($filePath) {
 		if (is_file($filePath)) return $filePath;
-		else if (is_file($this->baseDir . DIRECTORY_SEPARATOR . $filePath)) return $this->baseDir . DIRECTORY_SEPARATOR . $filePath;
+		else if (is_file($this->baseDir.DIRECTORY_SEPARATOR.$filePath)) return $this->baseDir.DIRECTORY_SEPARATOR.$filePath;
 		else return $this->loadFromPaths($filePath);
 	}
 
 	private function loadFromPaths($filePath) {
 		foreach ($this->paths as $path) {
-			if (is_file($path . DIRECTORY_SEPARATOR . $filePath)) return $path . DIRECTORY_SEPARATOR . $filePath;
+			if (is_file($path.DIRECTORY_SEPARATOR.$filePath)) return $path.DIRECTORY_SEPARATOR.$filePath;
 		}
 
-		throw new \Exception($filePath . ' not found in include path: ' . implode(';', $this->paths));
+		throw new \Exception($filePath.' not found in include path: '.implode(';', $this->paths));
 	}
 }

Braces +10 added lines, -4 removed lines

@@ -13,14 +13,20 @@
 	}
 
 	public function getFilePath($filePath) {
-		if (is_file($filePath)) return $filePath;
-		else if (is_file($this->baseDir . DIRECTORY_SEPARATOR . $filePath)) return $this->baseDir . DIRECTORY_SEPARATOR . $filePath;
-		else return $this->loadFromPaths($filePath);
+		if (is_file($filePath)) {
+			return $filePath;
+		} else if (is_file($this->baseDir . DIRECTORY_SEPARATOR . $filePath)) {
+			return $this->baseDir . DIRECTORY_SEPARATOR . $filePath;
+		} else {
+			return $this->loadFromPaths($filePath);
+		}
 	}
 
 	private function loadFromPaths($filePath) {
 		foreach ($this->paths as $path) {
-			if (is_file($path . DIRECTORY_SEPARATOR . $filePath)) return $path . DIRECTORY_SEPARATOR . $filePath;
+			if (is_file($path . DIRECTORY_SEPARATOR . $filePath)) {
+				return $path . DIRECTORY_SEPARATOR . $filePath;
+			}
 		}
 
 		throw new \Exception($filePath . ' not found in include path: ' . implode(';', $this->paths));

src/Parser/Last.php

Indentation +3 added lines, -3 removed lines

@@ -53,9 +53,9 @@
 		$this->last = $value;
 	}
 
-    public function makeTraversing() {
-        $this->traversing = true;
-    }
+	public function makeTraversing() {
+		$this->traversing = true;
+	}
 
 	//Applies the current operation to whatever is in $last based on $mode
 	public function process() {

Braces +2 added lines, -4 removed lines

@@ -63,8 +63,7 @@ 
 			try {
 				$value = $this->data->extract($this->last, $this->autoLookup, $this->traversing);
 				$this->result->processValue($value);
-			}
-			catch (\UnexpectedValueException $e) {
+			} catch (\UnexpectedValueException $e) {
 				$this->processLastUnexpected();
 			}
 		}
@@ -73,8 +72,7 @@ 
 	private function processLastUnexpected() {
 		if (!($this->autoLookup || $this->traversing)) {
 			$this->result->processValue($this->last);
-		}
-		else {
+		} else {
 			$this->result->clear();
 			$this->result->processValue(false);
 		}

src/Parser/Value.php

Indentation +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
 		}
 		else $parsedVal = null;
         
-        $this->result->postProcess($this->data, $val, $parsedVal, $this->allowNullResult);
+		$this->result->postProcess($this->data, $val, $parsedVal, $this->allowNullResult);
 
 		$this->last->clear();
 	}

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
 		if ($lastResult) {
 			$this->last->makeTraversing();
 		}
-		else if ($this->last->isEmpty())  {
+		else if ($this->last->isEmpty()) {
 			$this->processString(['value' => '.']);
 			$this->result->setMode(Tokenizer::CONCAT);
 		}

Braces +11 added lines, -9 removed lines

@@ -56,7 +56,9 @@ 
 		$this->last = new Last($this->data, $this->result, $this->autoLookup);
 		$this->traversing = false;
 
-		if (count($tokens) <= 0) return [$data];
+		if (count($tokens) <= 0) {
+			return [$data];
+		}
 
 		foreach (new TokenFilterIterator($tokens, [Tokenizer::WHITESPACE, Tokenizer::NEW_LINE]) as $token) {
 			$this->{$this->tokenFuncs[$token['type']]}($token);
@@ -84,8 +86,7 @@ 
 		// foo.bar is treated as looking up `bar` in `foo` whereas .foo is treated as the string ".foo"
 		if ($lastResult) {
 			$this->last->makeTraversing();
-		}
-		else if ($this->last->isEmpty())  {
+		} else if ($this->last->isEmpty())  {
 			$this->processString(['value' => '.']);
 			$this->result->setMode(Tokenizer::CONCAT);
 		}
@@ -100,11 +101,12 @@ 
 	private function processSquareBracket($token) {
 		if ($this->hasFunction($this->last->read())) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
+		} else {
 			$this->last->traverse();
 			$this->last->set($this->getNewParser()->parseTokens($token['value'], null)[0]);
-			if (!is_bool($this->last->read())) $this->last->makeTraversing();
+			if (!is_bool($this->last->read())) {
+				$this->last->makeTraversing();
+			}
 		}
 	}
 
@@ -127,8 +129,7 @@ 
 		if ($this->hasFunction($this->last->read())
 			&& !$this->data->methodExists($this->last->read())) {
 			$this->callTransphpormFunctions($token);
-		}
-		else {
+		} else {
 			$this->last->processNested($this->getNewParser(), $token);
 		}
 	}
@@ -145,8 +146,9 @@ 
 			$parser = new Value($this->data->getData());
 			$parsedArr = $parser->parse($val);
 			$parsedVal = isset($parsedArr[0]) ? $parsedArr[0] : null;
+		} else {
+			$parsedVal = null;
 		}
-		else $parsedVal = null;
         
         $this->result->postProcess($this->data, $val, $parsedVal, $this->allowNullResult);
 

src/Property/Content.php

Braces +22 added lines, -11 removed lines

@@ -14,7 +14,9 @@ 
 	}
 
 	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);
 
@@ -22,14 +24,19 @@ 
 			//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;
@@ -56,9 +63,10 @@ 
 	public 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 {
 				yield $this->convertNode($n, $document);
 			}
 		}
@@ -69,9 +77,10 @@ 
 			$new = $document->importNode($node, true);
 			//Removing this might cause problems with caching...
 			//$new->setAttribute('transphporm', 'added');
-		}
-		else {
-			if ($node instanceof \DomText) $node = $node->nodeValue;
+		} else {
+			if ($node instanceof \DomText) {
+				$node = $node->nodeValue;
+			}
 			$new = $document->createElement('text');
 
 			$new->appendChild($document->createTextNode($node));
@@ -95,6 +104,8 @@ 
 	}
 
 	private function removeAllChildren($element) {
-		while ($element->hasChildNodes()) $element->removeChild($element->firstChild);
+		while ($element->hasChildNodes()) {
+			$element->removeChild($element->firstChild);
+		}
 	}
 }

src/Config.php

Braces +9 added lines, -3 removed lines

@@ -68,7 +68,9 @@ 
 	}
 
     public function registerContentPseudo($name, Property\ContentPseudo $pseudo) {
-        if (isset($this->properties['content'])) $this->properties['content']->addContentPseudo($name, $pseudo);
+        if (isset($this->properties['content'])) {
+        	$this->properties['content']->addContentPseudo($name, $pseudo);
+        }
     }
 
 	public function registerPseudo(Pseudo $pseudo) {
@@ -76,12 +78,16 @@ 
 	}
 
 	public function loadProperties(Hook\PropertyHook $hook) {
-		foreach ($this->properties as $name => $property) $hook->registerProperty($name, $property);
+		foreach ($this->properties as $name => $property) {
+			$hook->registerProperty($name, $property);
+		}
 	}
 
 	public function createPseudoMatcher($pseudo) {
 		$pseudoMatcher = new Hook\PseudoMatcher($pseudo, $this->valueParser);
-		foreach ($this->pseudo as $pseudoFunction) $pseudoMatcher->registerFunction(clone $pseudoFunction);
+		foreach ($this->pseudo as $pseudoFunction) {
+			$pseudoMatcher->registerFunction(clone $pseudoFunction);
+		}
 		return $pseudoMatcher;
 	}
 

Indentation +4 added lines, -4 removed lines

@@ -40,7 +40,7 @@ 
 	}
 
 	public function &getLine() {
-        $line = &$this->line;
+		$line = &$this->line;
 		return $line;
 	}
 
@@ -68,9 +68,9 @@ 
 		$this->properties[$name] = $property;
 	}
 
-    public function registerContentPseudo($name, Property\ContentPseudo $pseudo) {
-        if (isset($this->properties['content'])) $this->properties['content']->addContentPseudo($name, $pseudo);
-    }
+	public function registerContentPseudo($name, Property\ContentPseudo $pseudo) {
+		if (isset($this->properties['content'])) $this->properties['content']->addContentPseudo($name, $pseudo);
+	}
 
 	public function registerPseudo(Pseudo $pseudo) {
 		$this->pseudo[] = $pseudo;

src/Parser/Tokenizer.php

Doc Comments +3 added lines

@@ -98,6 +98,9 @@
 		}
 	}
 
+	/**
+	 * @param integer $n
+	 */
 	private function isLiteral($n) {
 		//Is it a normal literal character
 		return isset($this->str[$n]) && ($this->identifyChar($this->str[$n]) == self::NAME

Spacing +1 added lines, -1 removed lines

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

Braces +30 added lines, -12 removed lines

@@ -83,8 +83,11 @@ 
 			$i += $this->doBrackets($tokens, $char, $i);
 
 		}
-		if ($returnObj) return new Tokens($tokens);
-		else return $tokens;
+		if ($returnObj) {
+			return new Tokens($tokens);
+		} else {
+			return $tokens;
+		}
 	}
 
 	private function doSingleLineComments(&$tokens, $char, $i) {
@@ -135,10 +138,15 @@ 
 	}
 
 	private function processLiterals(&$tokens, $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, 'line' => $this->lineNo];
+		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, 'line' => $this->lineNo];
+		}
 	}
 
 	private function doBrackets(&$tokens, $char, $i) {
@@ -171,7 +179,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);
 	}
@@ -180,18 +190,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/Template.php

Braces +14 added lines, -5 removed lines

@@ -66,7 +66,9 @@ 
 	/** Loops through all assigned hooks, runs the Xpath query and calls the hook */
 	private function processHooks() {
 		foreach ($this->hooks as list($query, $hook)) {
-			foreach ($this->xpath->query($query) as $element) $hook->run($element);
+			foreach ($this->xpath->query($query) as $element) {
+				$hook->run($element);
+			}
 		}
 		$this->hooks = [];
 	}
@@ -74,7 +76,9 @@ 
 	/** Prints out the current DomDocument as HTML */
 	private function printDocument() {
 		$output = '';
-		foreach ($this->document->documentElement->childNodes as $node) $output .= call_user_func($this->save, $node);
+		foreach ($this->document->documentElement->childNodes as $node) {
+			$output .= call_user_func($this->save, $node);
+		}
 		return $output;
 	}
 
@@ -86,13 +90,18 @@ 
 		//Generate the document by taking only the childnodes of the template, ignoring the <template> and </template> tags
 		//TODO: Is there a faster way of doing this without string manipulation on the output or this loop through childnodes?
 		 //Either return a whole DomDocument or return the output HTML
-		if ($document) return $this->document;
+		if ($document) {
+			return $this->document;
+		}
 
 		//Print the doctype... saveHtml inexplicably does not support $doc->doctype as an argument
 		$output = ($this->document->doctype) ? $this->document->saveXml($this->document->doctype) . "\n" : '';
 
-		if ($this->document->documentElement->tagName !== 'template') $output .= call_user_func($this->save, $this->document->documentElement);
-		else $output = $this->printDocument();
+		if ($this->document->documentElement->tagName !== 'template') {
+			$output .= call_user_func($this->save, $this->document->documentElement);
+		} else {
+			$output = $this->printDocument();
+		}
 
 		//repair empty tags. Browsers break on <script /> and <div /> so can't avoid LIBXML_NOEMPTYTAG but they also break on <base></base> so repair them
 		$output = str_replace(['></img>', '></br>', '></meta>', '></base>', '></link>', '></hr>', '></input>'], ' />', $output);

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
 				$this->save = function($content = null) {
 					return $this->document->saveHtml($content);
 				};
-				$this->document->loadHtml('<' . '?xml encoding="UTF-8">' . $doc,  LIBXML_HTML_NODEFDTD | LIBXML_HTML_NOIMPLIED);
+				$this->document->loadHtml('<'.'?xml encoding="UTF-8">'.$doc, LIBXML_HTML_NODEFDTD | LIBXML_HTML_NOIMPLIED);
 
 				if (strpos($doc, '<!') !== 0) {
 					$templateNode = $this->document->getElementsByTagName('template')[0];
@@ -89,7 +89,7 @@ 
 		if ($document) return $this->document;
 
 		//Print the doctype... saveHtml inexplicably does not support $doc->doctype as an argument
-		$output = ($this->document->doctype) ? $this->document->saveXml($this->document->doctype) . "\n" : '';
+		$output = ($this->document->doctype) ? $this->document->saveXml($this->document->doctype)."\n" : '';
 
 		if ($this->document->documentElement->tagName !== 'template') $output .= call_user_func($this->save, $this->document->documentElement);
 		else $output = $this->printDocument();

src/TSSValidator.php

Indentation +33 added lines, -33 removed lines

@@ -2,48 +2,48 @@
 namespace Transphporm;
 use Transphporm\Parser\Tokenizer;
 class TSSValidator {
-    private $error;
+	private $error;
 
-    public function validate($tss) {
-        $this->error = null;
-        $tokens = $this->tokenize($tss);
+	public function validate($tss) {
+		$this->error = null;
+		$tokens = $this->tokenize($tss);
 
-        foreach ($tokens as $token)
-            if (!$this->validateRule($token)) return false;
+		foreach ($tokens as $token)
+			if (!$this->validateRule($token)) return false;
 
-        return true;
-    }
+		return true;
+	}
 
-    public function getLastError() {
-        return $this->error;
-    }
+	public function getLastError() {
+		return $this->error;
+	}
 
-    private function validateRule($token) {
-        if ($token['type'] !== Tokenizer::OPEN_BRACE) return true;
+	private function validateRule($token) {
+		if ($token['type'] !== Tokenizer::OPEN_BRACE) return true;
 
-        return $this->checkBraces($token) && $this->checkSemicolons($token)
-            && $this->checkParenthesis($token);
-    }
+		return $this->checkBraces($token) && $this->checkSemicolons($token)
+			&& $this->checkParenthesis($token);
+	}
 
-    private function checkBraces($token) {
-        return strpos($token['string'], '{') === false;
-    }
+	private function checkBraces($token) {
+		return strpos($token['string'], '{') === false;
+	}
 
-    private function checkSemicolons($braceToken) {
-        $splitTokens = $braceToken['value']->splitOnToken(Tokenizer::COLON);
-        array_shift($splitTokens); array_pop($splitTokens);
-        foreach ($splitTokens as $tokens)
-            if (!in_array(Tokenizer::SEMI_COLON, array_column(iterator_to_array($tokens), 'type'))) return false;
+	private function checkSemicolons($braceToken) {
+		$splitTokens = $braceToken['value']->splitOnToken(Tokenizer::COLON);
+		array_shift($splitTokens); array_pop($splitTokens);
+		foreach ($splitTokens as $tokens)
+			if (!in_array(Tokenizer::SEMI_COLON, array_column(iterator_to_array($tokens), 'type'))) return false;
 
-        return true;
-    }
+		return true;
+	}
 
-    private function checkParenthesis($token) {
-        return substr_count($token['string'], '(') === substr_count($token['string'], ')');
-    }
+	private function checkParenthesis($token) {
+		return substr_count($token['string'], '(') === substr_count($token['string'], ')');
+	}
 
-    private function tokenize($tss) {
-        if (is_file($tss)) $tss = file_get_contents($tss);
-        return (new Parser\Tokenizer($tss))->getTokens();
-    }
+	private function tokenize($tss) {
+		if (is_file($tss)) $tss = file_get_contents($tss);
+		return (new Parser\Tokenizer($tss))->getTokens();
+	}
 }

Braces +12 added lines, -6 removed lines

@@ -8,8 +8,9 @@ 
         $this->error = null;
         $tokens = $this->tokenize($tss);
 
-        foreach ($tokens as $token)
-            if (!$this->validateRule($token)) return false;
+        foreach ($tokens as $token) {
+                    if (!$this->validateRule($token)) return false;
+        }
 
         return true;
     }
@@ -19,7 +20,9 @@ 
     }
 
     private function validateRule($token) {
-        if ($token['type'] !== Tokenizer::OPEN_BRACE) return true;
+        if ($token['type'] !== Tokenizer::OPEN_BRACE) {
+        	return true;
+        }
 
         return $this->checkBraces($token) && $this->checkSemicolons($token)
             && $this->checkParenthesis($token);
@@ -32,8 +35,9 @@ 
     private function checkSemicolons($braceToken) {
         $splitTokens = $braceToken['value']->splitOnToken(Tokenizer::COLON);
         array_shift($splitTokens); array_pop($splitTokens);
-        foreach ($splitTokens as $tokens)
-            if (!in_array(Tokenizer::SEMI_COLON, array_column(iterator_to_array($tokens), 'type'))) return false;
+        foreach ($splitTokens as $tokens) {
+                    if (!in_array(Tokenizer::SEMI_COLON, array_column(iterator_to_array($tokens), 'type'))) return false;
+        }
 
         return true;
     }
@@ -43,7 +47,9 @@ 
     }
 
     private function tokenize($tss) {
-        if (is_file($tss)) $tss = file_get_contents($tss);
+        if (is_file($tss)) {
+        	$tss = file_get_contents($tss);
+        }
         return (new Parser\Tokenizer($tss))->getTokens();
     }
 }

src/Property/ContentPseudo/BeforeAfter.php

Doc Comments +3 added lines

@@ -4,6 +4,9 @@
 	private $insertLocation;
 	private $content;
 
+	/**
+	 * @param string $insertLocation
+	 */
 	public function __construct($insertLocation, \Transphporm\Property\Content $content) {
 		$this->insertLocation = $insertLocation;
 		$this->content = $content;