Level-2 / Transphporm

src/Property/Repeat.php

Doc Comments +12 added lines

@@ -11,6 +11,9 @@ 
 	private $line;
     private $filePath;
 
+	/**
+	 * @param integer $line
+	 */
 	public function __construct(\Transphporm\FunctionSet $functionSet, \Transphporm\Hook\ElementData $elementData, &$line, \Transphporm\FilePath $filePath) {
 		$this->functionSet = $functionSet;
 		$this->elementData = $elementData;
@@ -58,6 +61,12 @@ 
 		return $value;
 	}
 
+	/**
+	 * @param \DOMElement $element
+	 * @param integer $count
+	 *
+	 * @return \DOMElement
+	 */
 	private function cloneElement($element, $iteration, $key, $count) {
 		$clone = $element->cloneNode(true);
 		$this->tagElement($clone, $count);
@@ -77,6 +86,9 @@ 
 		return isset($values[1]) ? $values[1] : PHP_INT_MAX;
 	}
 
+	/**
+	 * @param \Transphporm\Hook\PseudoMatcher $pseudoMatcher
+	 */
 	private function createHook($newRules, $pseudoMatcher, $properties) {
 		$hook = new \Transphporm\Hook\PropertyHook($newRules, $this->line, null, $this->line, $pseudoMatcher, new \Transphporm\Parser\Value($this->functionSet), $this->functionSet, $this->filePath);
 		foreach ($properties as $name => $property) $hook->registerProperty($name, $property);

Indentation +2 added lines, -2 removed lines

@@ -9,13 +9,13 @@
 	private $functionSet;
 	private $elementData;
 	private $line;
-    private $filePath;
+	private $filePath;
 
 	public function __construct(\Transphporm\FunctionSet $functionSet, \Transphporm\Hook\ElementData $elementData, &$line, \Transphporm\FilePath $filePath) {
 		$this->functionSet = $functionSet;
 		$this->elementData = $elementData;
 		$this->line = &$line;
-        $this->filePath = $filePath;
+		$this->filePath = $filePath;
 	}
 
 	public function run(array $values, \DomElement $element, array $rules, \Transphporm\Hook\PseudoMatcher $pseudoMatcher, array $properties = []) {

Braces +18 added lines, -7 removed lines

@@ -20,7 +20,9 @@ 
 
 	public function run(array $values, \DomElement $element, array $rules, \Transphporm\Hook\PseudoMatcher $pseudoMatcher, array $properties = []) {
 		$values = $this->fixEmpty($values);
-		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;
 		$repeat = $this->getRepeatValue($values, $max);
@@ -29,7 +31,9 @@ 
 		$hook = $this->createHook($rules, $pseudoMatcher, $properties);
 
 		foreach ($repeat 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
 			$hook->run($clone);
@@ -41,8 +45,9 @@ 
 
 	private function getRepeatValue($values, &$max) {
 		$mode = $this->getMode($values);
-		if ($mode === 'each') $repeat = $values[0];
-		else if ($mode === 'loop') {
+		if ($mode === 'each') {
+			$repeat = $values[0];
+		} else if ($mode === 'loop') {
 			$repeat = range($values[0], $max);
 			$max++;
 		}
@@ -54,7 +59,9 @@ 
 	}
 
 	private function fixEmpty($value) {
-		if (empty($value[0])) $value[0] = [];
+		if (empty($value[0])) {
+			$value[0] = [];
+		}
 		return $value;
 	}
 
@@ -70,7 +77,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) {
@@ -79,7 +88,9 @@ 
 
 	private function createHook($newRules, $pseudoMatcher, $properties) {
 		$hook = new \Transphporm\Hook\PropertyHook($newRules, $this->line, null, $this->line, $pseudoMatcher, new \Transphporm\Parser\Value($this->functionSet), $this->functionSet, $this->filePath);
-		foreach ($properties as $name => $property) $hook->registerProperty($name, $property);
+		foreach ($properties as $name => $property) {
+			$hook->registerProperty($name, $property);
+		}
 		return $hook;
 	}
 }

src/Parser/Sheet.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 		if (is_file($tss)) {
 			$this->file = $tss;
 			$this->rules = $this->cache->load($tss);
-			$filePath->setBaseDir(dirname(realpath($tss)) . DIRECTORY_SEPARATOR);
+			$filePath->setBaseDir(dirname(realpath($tss)).DIRECTORY_SEPARATOR);
 			if (empty($this->rules)) $tss = file_get_contents($tss);
 			else return;
 		}

Braces +31 added lines, -13 removed lines

@@ -23,8 +23,11 @@ 
 			$this->file = $tss;
 			$this->rules = $this->cache->load($tss);
 			$filePath->setBaseDir(dirname(realpath($tss)) . DIRECTORY_SEPARATOR);
-			if (empty($this->rules)) $tss = file_get_contents($tss);
-			else return;
+			if (empty($this->rules)) {
+				$tss = file_get_contents($tss);
+			} else {
+				return;
+			}
 		}
 		$this->tss = $this->stripComments($tss, '//', "\n");
 		$this->tss = $this->stripComments($this->tss, '/*', '*/');
@@ -36,7 +39,9 @@ 
 	}
 
 	public function parse($indexStart = 0) {
-		if (!empty($this->rules)) return $this->rules['rules'];
+		if (!empty($this->rules)) {
+			return $this->rules['rules'];
+		}
 		$rules = $this->parseTokens($indexStart);
 		usort($rules, [$this, 'sortRules']);
 		$this->checkError($rules);
@@ -50,12 +55,12 @@ 
 			if ($processing = $this->processingInstructions($token, count($this->rules)+$indexStart)) {
 				$this->rules = array_merge($this->rules, $processing);
 				continue;
-			}
-			else if ($token['type'] === Tokenizer::NEW_LINE) {
+			} else if ($token['type'] === Tokenizer::NEW_LINE) {
 				$line++;
 				continue;
+			} else {
+				$this->addRules($token, $indexStart, $line);
 			}
-			else $this->addRules($token, $indexStart, $line);
 		}
 		return $this->rules;
 	}
@@ -63,14 +68,18 @@ 
 	private function addRules($token, $indexStart, $line) {
 		$selector = $this->tss->from($token['type'], true)->to(Tokenizer::OPEN_BRACE);
 		$this->tss->skip(count($selector));
-		if (count($selector) === 0) return;
+		if (count($selector) === 0) {
+			return;
+		}
 
 		$newRules = $this->cssToRules($selector, count($this->rules)+$indexStart, $this->getProperties($this->tss->current()['value']), $line);
 		$this->rules = $this->writeRule($this->rules, $newRules);
 	}
 
 	private function checkError($rules) {
-		if (empty($rules) && count($this->tss) > 0) throw new \Exception('No TSS rules parsed');
+		if (empty($rules) && count($this->tss) > 0) {
+			throw new \Exception('No TSS rules parsed');
+		}
 	}
 
 	private function CssToRules($selector, $index, $properties, $line) {
@@ -97,7 +106,9 @@ 
 	}
 
 	private function processingInstructions($token, $indexStart) {
-		if ($token['type'] !== Tokenizer::AT_SIGN) return false;
+		if ($token['type'] !== Tokenizer::AT_SIGN) {
+			return false;
+		}
 		$tokens = $this->tss->from(Tokenizer::AT_SIGN, false)->to(Tokenizer::SEMI_COLON, false);
 		$funcName = $tokens->from(Tokenizer::NAME, true)->read();
 		$args = $this->valueParser->parseTokens($tokens->from(Tokenizer::NAME));
@@ -109,8 +120,11 @@ 
 	}
 
 	private function import($args, $indexStart) {
-		if ($this->file !== null) $fileName = $fileName = $this->filePath->getFilePath($args[0]);
-		else $fileName = $args[0];
+		if ($this->file !== null) {
+			$fileName = $fileName = $this->filePath->getFilePath($args[0]);
+		} else {
+			$fileName = $args[0];
+		}
 		$this->import[] = $fileName;
 		$baseDirTemp = $this->filePath->getFilePath();
 		$sheet = new Sheet($fileName, $this->xPath, $this->valueParser, $this->cache, $this->filePath);
@@ -120,7 +134,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;
 	}
@@ -129,7 +145,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+strlen($close));
 		}
 

src/Hook/PropertyHook.php

Indentation +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 	private $functionSet;
 
 	public function __construct(array $rules, &$configLine, $file, $line, PseudoMatcher $pseudoMatcher,
-            \Transphporm\Parser\Value $valueParser, \Transphporm\FunctionSet $functionSet, \Transphporm\FilePath $filePath) {
+			\Transphporm\Parser\Value $valueParser, \Transphporm\FunctionSet $functionSet, \Transphporm\FilePath $filePath) {
 		$this->rules = $rules;
 		$this->configLine = &$configLine;
 		$this->file = $file;

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 		$this->valueParser = $valueParser;
 		$this->pseudoMatcher = $pseudoMatcher;
 		$this->functionSet = $functionSet;
-		if ($this->file !== null) $filePath->setBaseDir(dirname(realpath($this->file)) . DIRECTORY_SEPARATOR);
+		if ($this->file !== null) $filePath->setBaseDir(dirname(realpath($this->file)).DIRECTORY_SEPARATOR);
 	}
 
 	public function run(\DomElement $element) {

Braces +14 added lines, -8 removed lines

@@ -25,7 +25,9 @@ 
 		$this->valueParser = $valueParser;
 		$this->pseudoMatcher = $pseudoMatcher;
 		$this->functionSet = $functionSet;
-		if ($this->file !== null) $filePath->setBaseDir(dirname(realpath($this->file)) . DIRECTORY_SEPARATOR);
+		if ($this->file !== null) {
+			$filePath->setBaseDir(dirname(realpath($this->file)) . DIRECTORY_SEPARATOR);
+		}
 	}
 
 	public function run(\DomElement $element) {
@@ -33,10 +35,11 @@ 
 		$this->configLine = $this->line;
 		try {
 			//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;
+			}
 			$this->callProperties($element);
-		}
-		catch (\Transphporm\RunException $e) {
+		} catch (\Transphporm\RunException $e) {
 			throw new \Transphporm\Exception($e, $this->file, $this->line);
 		}
 	}
@@ -47,7 +50,9 @@ 
 	private function callProperties($element) {
 		foreach ($this->rules as $name => $value) {
 			$result = $this->callProperty($name, $element, $this->getArgs($value));
-			if ($result === false) break;
+			if ($result === false) {
+				break;
+			}
 		}
 	}
 	private function getArgs($value) {
@@ -62,9 +67,10 @@ 
 		if (isset($this->properties[$name])) {
 			try {
 				return $this->properties[$name]->run($value, $element, $this->rules, $this->pseudoMatcher, $this->properties);
-			}
-			catch (\Exception $e) {
-				if ($e instanceof \Transphporm\RunException) throw $e;
+			} catch (\Exception $e) {
+				if ($e instanceof \Transphporm\RunException) {
+					throw $e;
+				}
 				throw new \Transphporm\RunException(\Transphporm\Exception::PROPERTY, $name, $e);
 			}
 		}

src/Builder.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 
 		$cachedOutput = $this->loadTemplate();
 		//To be a valid XML document it must have a root element, automatically wrap it in <template> to ensure it does
-		$template = new Template($this->isValidDoc($cachedOutput['body']) ? str_ireplace('<!doctype', '<!DOCTYPE', $cachedOutput['body']) : '<template>' . $cachedOutput['body'] . '</template>' );
+		$template = new Template($this->isValidDoc($cachedOutput['body']) ? str_ireplace('<!doctype', '<!DOCTYPE', $cachedOutput['body']) : '<template>'.$cachedOutput['body'].'</template>');
 		$valueParser = new Parser\Value($functionSet);
 		$config = new Config($functionSet, $valueParser, $elementData, new Hook\Formatter(), new Parser\CssToXpath($functionSet, $template->getPrefix()), new FilePath($this->rootDir), $headers);
 

Braces +11 added lines, -4 removed lines

@@ -26,7 +26,9 @@ 
 		$this->cache = new Cache(new \ArrayObject());
 
 		$modules = is_array($modules) ? $modules : $this->defaultModules;
-		foreach ($modules as $module) $this->loadModule(new $module);
+		foreach ($modules as $module) {
+			$this->loadModule(new $module);
+		}
 	}
 
 	//Allow setting the time used by Transphporm for caching. This is for testing purposes
@@ -55,7 +57,9 @@ 
 		$valueParser = new Parser\Value($functionSet);
 		$config = new Config($functionSet, $valueParser, $elementData, new Hook\Formatter(), new Parser\CssToXpath($functionSet, $template->getPrefix()), new FilePath($this->rootDir), $headers);
 
-		foreach ($this->modules as $module) $module->load($config);
+		foreach ($this->modules as $module) {
+			$module->load($config);
+		}
 
 		$this->processRules($template, $config);
 
@@ -70,7 +74,9 @@ 
 		$rules = $this->getRules($template, $config);
 
 		foreach ($rules as $rule) {
-			if ($rule->shouldRun($this->time)) $this->executeTssRule($rule, $template, $config);
+			if ($rule->shouldRun($this->time)) {
+				$this->executeTssRule($rule, $template, $config);
+			}
 		}
 	}
 
@@ -95,8 +101,9 @@ 
 		if (trim($this->template)[0] !== '<') {
 			$xml = $this->cache->load($this->template, filemtime($this->template));
 			return $xml ? $xml : ['body' => file_get_contents($this->template), 'headers' => []];
+		} else {
+			return ['body' => $this->template, 'headers' => []];
 		}
-		else return ['body' => $this->template, 'headers' => []];
 	}
 
 	//Load the TSS rules either from a file or as a string

src/FilePath.php

Indentation +11 added lines, -11 removed lines

@@ -2,20 +2,20 @@
 namespace Transphporm;
 
 class FilePath {
-    private $baseDir;
-    private $customBase;
+	private $baseDir;
+	private $customBase;
 
-    public function __construct($customBase = null) {
-        $this->baseDir = "";
-        if ($customBase === null) $this->customBase = getcwd();
-        else $this->customBase = rtrim($customBase, '/');
-    }
+	public function __construct($customBase = null) {
+		$this->baseDir = "";
+		if ($customBase === null) $this->customBase = getcwd();
+		else $this->customBase = rtrim($customBase, '/');
+	}
 
-    public function setBaseDir($baseDir) {
-        $this->baseDir = $baseDir;
-    }
+	public function setBaseDir($baseDir) {
+		$this->baseDir = $baseDir;
+	}
 
-    public function getFilePath($filePath = "") {
+	public function getFilePath($filePath = "") {
 		if (isset($filePath[0]) && $filePath[0] == "/") return $this->customBase . $filePath;
 		else return $this->baseDir . $filePath;
 	}

Braces +10 added lines, -4 removed lines

@@ -7,8 +7,11 @@ 
 
     public function __construct($customBase = null) {
         $this->baseDir = "";
-        if ($customBase === null) $this->customBase = getcwd();
-        else $this->customBase = rtrim($customBase, '/');
+        if ($customBase === null) {
+        	$this->customBase = getcwd();
+        } else {
+        	$this->customBase = rtrim($customBase, '/');
+        }
     }
 
     public function setBaseDir($baseDir) {
@@ -16,7 +19,10 @@ 
     }
 
     public function getFilePath($filePath = "") {
-		if (isset($filePath[0]) && $filePath[0] == "/") return $this->customBase . $filePath;
-		else return $this->baseDir . $filePath;
+		if (isset($filePath[0]) && $filePath[0] == "/") {
+			return $this->customBase . $filePath;
+		} else {
+			return $this->baseDir . $filePath;
+		}
 	}
 }