Level-2 / Transphporm

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/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

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

Indentation +33 added lines, -33 removed lines

@@ -7,48 +7,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();
+	}
 }

src/Parser/CssToXpath.php

Doc Comments +3 added lines

@@ -13,6 +13,9 @@
 	private $functionSet;
 	private $id;
 
+	/**
+	 * @param string $id
+	 */
 	public function __construct(\Transphporm\FunctionSet $functionSet, $prefix = '', $id = null) {
 		$this->id = $id;
 		self::$instances[$this->id] = $this;

Braces +12 added lines, -4 removed lines

@@ -70,7 +70,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;
 	}
@@ -80,7 +82,9 @@ 
 		$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);
@@ -92,11 +96,15 @@ 
 		$tokens = new Tokens;
 		$split = $css->splitOnToken(Tokenizer::GREATER_THAN);
 
-		if (count($split) <= 1) return $css;
+		if (count($split) <= 1) {
+			return $css;
+		}
 
 		for ($i = 0; $i < count($split); $i++) {
 			$tokens->add($split[$i]->trim());
-			if (isset($split[$i+1])) $tokens->add(['type' => Tokenizer::GREATER_THAN]);
+			if (isset($split[$i+1])) {
+				$tokens->add(['type' => Tokenizer::GREATER_THAN]);
+			}
 		}
 		
 		return $tokens;

Spacing +8 added lines, -8 removed lines

@@ -19,13 +19,13 @@ 
 		$this->functionSet = $functionSet;
 
 		$this->translators = [
-			Tokenizer::WHITESPACE => function($string) use ($prefix) { return '//' . $prefix . $string;	},
-			Tokenizer::MULTIPLY => function () { return '*'; },
-			'' => 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) { return '[' .'php:function(\'\Transphporm\Parser\CssToXpath::processAttr\', \'' . base64_encode(serialize($string)) . '\', ., "' .  $this->id . '")' . ']';	}
+			Tokenizer::WHITESPACE => function($string) use ($prefix) { return '//'.$prefix.$string; },
+			Tokenizer::MULTIPLY => function() { return '*'; },
+			'' => 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) { return '['.'php:function(\'\Transphporm\Parser\CssToXpath::processAttr\', \''.base64_encode(serialize($string)).'\', ., "'.$this->id.'")'.']'; }
 		];
 	}
 
@@ -44,7 +44,7 @@ 
 		$functionSet->setElement($element[0]);
 
 		$attributes = [];
-		foreach($element[0]->attributes as $name => $node) {
+		foreach ($element[0]->attributes as $name => $node) {
 			$attributes[$name] = $node->nodeValue;
 		}
 

src/Parser/Tokens.php

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
 			if ($token['type'] === $tokenType) $i++;
 			else $splitTokens[$i][] = $token;
 		}
-		return array_map(function ($tokens) {
+		return array_map(function($tokens) {
 			return new Tokens($tokens);
 		}, $splitTokens);
 		//return $splitTokens;

Braces +30 added lines, -11 removed lines

@@ -39,8 +39,11 @@ 
 	}
 
 	public function add($token) {
-		if ($token instanceof Tokens) $this->tokens = array_merge($token->tokens);
-		else $this->tokens[] = $token;
+		if ($token instanceof Tokens) {
+			$this->tokens = array_merge($token->tokens);
+		} else {
+			$this->tokens[] = $token;
+		}
 	}
 
 
@@ -54,9 +57,13 @@ 
 
 	private function getKeyToSlice($tokenType) {
 		$keys = $this->getKeysOfTokenType($tokenType);
-		if (empty($keys)) return false;
+		if (empty($keys)) {
+			return false;
+		}
 		$key = $keys[0];
-		for ($i = 0; $key < $this->iterator && isset($keys[$i]); $i++) $key = $keys[$i];
+		for ($i = 0; $key < $this->iterator && isset($keys[$i]); $i++) {
+			$key = $keys[$i];
+		}
 		return $key;
 	}
 
@@ -70,10 +77,17 @@ 
 
 	private function sliceTokens($tokenType, $type, $increment = false) {
 		$key = $this->getKeyToSlice($tokenType);
-		if ($key === false) return new Tokens([]);
-		if ($increment) $key++;
-		if ($type === "from") return new Tokens(array_slice($this->tokens, $key));
-		else return new Tokens(array_slice($this->tokens, $this->iterator, $key));
+		if ($key === false) {
+			return new Tokens([]);
+		}
+		if ($increment) {
+			$key++;
+		}
+		if ($type === "from") {
+			return new Tokens(array_slice($this->tokens, $key));
+		} else {
+			return new Tokens(array_slice($this->tokens, $this->iterator, $key));
+		}
 	}
 
 	public function skip($count) {
@@ -84,8 +98,11 @@ 
 		$splitTokens = [];
 		$i = 0;
 		foreach ($this->tokens as $token) {
-			if ($token['type'] === $tokenType) $i++;
-			else $splitTokens[$i][] = $token;
+			if ($token['type'] === $tokenType) {
+				$i++;
+			} else {
+				$splitTokens[$i][] = $token;
+			}
 		}
 		return array_map(function ($tokens) {
 			return new Tokens($tokens);
@@ -109,7 +126,9 @@ 
 
 	public function removeLine() {
 		$tokens = $this->tokens;
-		foreach ($tokens as &$token) unset($token['line']);
+		foreach ($tokens as &$token) {
+			unset($token['line']);
+		}
 		return new Tokens($tokens);
 	}
 

src/Parser/Tokenizer/TokenizedString.php

Spacing +5 added lines, -5 removed lines

@@ -55,21 +55,21 @@ 
 	}
 
 	public function read($offset = 0) {
-		return $this->str[$this->pos + $offset];
+		return $this->str[$this->pos+$offset];
 	}
 
 	public function identifyChar($offset = 0) {
-		$chr = $this->str[$this->pos + $offset];
+		$chr = $this->str[$this->pos+$offset];
 		if (!empty($this->chars[$chr])) return $this->chars[$chr];
 		else return Tokenizer::NAME;
 	}
 
 	public function has($offset = 0) {
-		return isset($this->str[$this->pos + $offset]);
+		return isset($this->str[$this->pos+$offset]);
 	}
 
 	public function pos($str) {
-		$pos = strpos($this->str,  $str, $this->pos);
+		$pos = strpos($this->str, $str, $this->pos);
 		return $pos ? $pos-$this->pos : false;
 	}
 
@@ -82,7 +82,7 @@ 
 	}
 
 	public function extractString($offset = 0) {
-		$pos = $this->pos + $offset;
+		$pos = $this->pos+$offset;
 		$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);

Braces +16 added lines, -6 removed lines

@@ -40,8 +40,11 @@ 
 	}
 
 	public function move($n) {
-		if ($n === false) $this->pos = strlen($this->str)-1;
-		else $this->pos += $n;
+		if ($n === false) {
+			$this->pos = strlen($this->str)-1;
+		} else {
+			$this->pos += $n;
+		}
 	}
 
 	public function next() {
@@ -60,8 +63,11 @@ 
 
 	public function identifyChar($offset = 0) {
 		$chr = $this->str[$this->pos + $offset];
-		if (!empty($this->chars[$chr])) return $this->chars[$chr];
-		else return Tokenizer::NAME;
+		if (!empty($this->chars[$chr])) {
+			return $this->chars[$chr];
+		} else {
+			return Tokenizer::NAME;
+		}
 	}
 
 	public function has($offset = 0) {
@@ -85,7 +91,9 @@ 
 		$pos = $this->pos + $offset;
 		$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);
 	}
@@ -95,7 +103,9 @@ 
 		$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);
 	}
 

src/Parser/Tokenizer/Brackets.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 
 class Brackets implements \Transphporm\Parser\Tokenize {
 
-	private $types =  [
+	private $types = [
 			Tokenizer::OPEN_BRACKET => ['(', ')'],
 			Tokenizer::OPEN_BRACE => ['{', '}'],
 			Tokenizer::OPEN_SQUARE_BRACKET => ['[', ']']

src/Parser/Tokenizer/Literals.php

Braces +9 added lines, -4 removed lines

@@ -32,9 +32,14 @@
 	}
 
 	private function processLiterals($tokens, $name, $str) {
-		if (is_numeric($name)) $tokens->add(['type' => Tokenizer::NUMERIC, 'value' => $name]);
-		else if ($name == 'true') $tokens->add(['type' => Tokenizer::BOOL, 'value' => true]);
-		else if ($name == 'false') $tokens->add(['type' => Tokenizer::BOOL, 'value' => false]);
-		else $tokens->add(['type' => Tokenizer::NAME, 'value' => $name, 'line' => $str->lineNo()]);
+		if (is_numeric($name)) {
+			$tokens->add(['type' => Tokenizer::NUMERIC, 'value' => $name]);
+		} else if ($name == 'true') {
+			$tokens->add(['type' => Tokenizer::BOOL, 'value' => true]);
+		} else if ($name == 'false') {
+			$tokens->add(['type' => Tokenizer::BOOL, 'value' => false]);
+		} else {
+			$tokens->add(['type' => Tokenizer::NAME, 'value' => $name, 'line' => $str->lineNo()]);
+		}
 	}
 }
\ No newline at end of file