Level-2 / Transphporm

src/Formatter/Number.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@
 
 	public function currency($num) {
 		$num = $this->decimal($num, $this->locale['currency_decimals']);
-		if ($this->locale['currency_position'] === 'before') return $this->locale['currency'] . $num;
-		else return $num . $this->locale['currency'];
+		if ($this->locale['currency_position'] === 'before') return $this->locale['currency'].$num;
+		else return $num.$this->locale['currency'];
 	}
 }
\ No newline at end of file

Braces +5 added lines, -2 removed lines

@@ -13,7 +13,10 @@
 
 	public function currency($num) {
 		$num = $this->decimal($num, $this->locale['currency_decimals']);
-		if ($this->locale['currency_position'] === 'before') return $this->locale['currency'] . $num;
-		else return $num . $this->locale['currency'];
+		if ($this->locale['currency_position'] === 'before') {
+			return $this->locale['currency'] . $num;
+		} else {
+			return $num . $this->locale['currency'];
+		}
 	}
 }
\ No newline at end of file

src/Rule.php

Spacing +2 added lines, -2 removed lines

@@ -39,9 +39,9 @@
 		$num = (int) $frequency;
 		$unit = strtoupper(trim(str_replace($num, '', $frequency)));
 			
-		$offset = $num * constant(self::class . '::' . $unit);
+		$offset = $num * constant(self::class.'::'.$unit);
 
-		if ($time > $this->lastRun + $offset) return true;
+		if ($time > $this->lastRun+$offset) return true;
 		else return false;
 	}
 

Indentation +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
 	private $pseudo;
 	private $depth;
 	private $index;
-    private $file;
+	private $file;
 	private $line;
 	private $properties = [];
 	private $lastRun = 0;
@@ -26,7 +26,7 @@ 
 		$this->pseudo = $pseudo;
 		$this->depth = $depth;
 		$this->index = $index;
-        $this->file = $file;
+		$this->file = $file;
 		$this->line = $line;
 		$this->properties = $properties;
 	}

Braces +15 added lines, -6 removed lines

@@ -44,23 +44,32 @@
 	}
 
 	private function timeFrequency($frequency, $time = null) {
-		if ($time === null) $time = time();
+		if ($time === null) {
+			$time = time();
+		}
 		$num = (int) $frequency;
 		$unit = strtoupper(trim(str_replace($num, '', $frequency)));
 
 		$offset = $num * constant(self::class . '::' . $unit);
 
-		if ($time > $this->lastRun + $offset) return true;
-		else return false;
+		if ($time > $this->lastRun + $offset) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	public function shouldRun($time = null) {
 		if (isset($this->properties['update-frequency']) && $this->lastRun !== 0) {
 			$frequency = $this->properties['update-frequency']->read();
 			$static = ['always' => true, 'never' => false];
-			if (isset($static[$frequency])) return $static[$frequency];
-			else return $this->timeFrequency($frequency, $time);
+			if (isset($static[$frequency])) {
+				return $static[$frequency];
+			} else {
+				return $this->timeFrequency($frequency, $time);
+			}
+		} else {
+			return true;
 		}
-		else return true;
 	}
 }

src/Hook/PostProcess.php

Braces +7 added lines, -3 removed lines

@@ -9,9 +9,13 @@
 class PostProcess implements \Transphporm\Hook {
 	public function run(\DomElement $element) {
 		$transphporm = $element->getAttribute('transphporm');
-		if ($transphporm === 'remove') $element->parentNode->removeChild($element);
-		else if ($transphporm === 'text') $element->parentNode->replaceChild($element->firstChild, $element);
-		else $element->removeAttribute('transphporm');
+		if ($transphporm === 'remove') {
+			$element->parentNode->removeChild($element);
+		} else if ($transphporm === 'text') {
+			$element->parentNode->replaceChild($element->firstChild, $element);
+		} else {
+			$element->removeAttribute('transphporm');
+		}
 	}
 
 }
\ No newline at end of file

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

src/Parser/Sheet.php

Indentation +8 added lines, -8 removed lines

@@ -102,14 +102,14 @@
 	}
 
 	private function getProperties($tokens) {
-        $rules = $tokens->splitOnToken(Tokenizer::SEMI_COLON);
+		$rules = $tokens->splitOnToken(Tokenizer::SEMI_COLON);
 
-        $return = [];
-        foreach ($rules as $rule) {
-            $name = $rule->from(Tokenizer::NAME, true)->to(Tokenizer::COLON)->read();
-            $return[$name] = $rule->from(Tokenizer::COLON)->trim();
-        }
+		$return = [];
+		foreach ($rules as $rule) {
+			$name = $rule->from(Tokenizer::NAME, true)->to(Tokenizer::COLON)->read();
+			$return[$name] = $rule->from(Tokenizer::COLON)->trim();
+		}
 
-        return $return;
-    }
+		return $return;
+	}
 }

Doc Comments +10 added lines

@@ -39,6 +39,9 @@ 
 		return $this->cache->write($this->file, $rules, $this->import);
 	}
 
+	/**
+	 * @param integer $indexStart
+	 */
 	private function parseTokens($indexStart) {
 		$this->rules = [];
 		foreach (new TokenFilterIterator($this->tss, [Tokenizer::WHITESPACE]) as $token) {
@@ -65,6 +68,10 @@ 
 		if (empty($rules) && count($this->tss) > 0) throw new \Exception('No TSS rules parsed');
 	}
 
+	/**
+	 * @param Tokens $selector
+	 * @param integer $index
+	 */
 	private function CssToRules($selector, $index, $properties, $line) {
 		$parts = $selector->trim()->splitOnToken(Tokenizer::ARG);
 		$rules = [];
@@ -88,6 +95,9 @@ 
 		return $rules;
 	}
 
+	/**
+	 * @param integer $indexStart
+	 */
 	private function processingInstructions($token, $indexStart) {
 		if ($token['type'] !== Tokenizer::AT_SIGN) return false;
 		$tokens = $this->tss->from(Tokenizer::AT_SIGN, false)->to(Tokenizer::SEMI_COLON, false);

Spacing +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
 
 
 	private function sortPseudo($a, $b) {
-		return count($a->pseudo) < count($b->pseudo)  ? -1  :1;
+		return count($a->pseudo) < count($b->pseudo) ? -1 : 1;
 	}
 
 	private function getProperties($tokens) {

Braces +27 added lines, -10 removed lines

@@ -25,14 +25,19 @@ 
 			$this->file = $tss;
 			$this->rules = $this->cache->load($tss);
 			$this->filePath->addPath(dirname(realpath($tss)));
-			if (empty($this->rules)) $tss = file_get_contents($tss);
-			else return;
+			if (empty($this->rules)) {
+				$tss = file_get_contents($tss);
+			} else {
+				return;
+			}
 		}
 		$this->tss = (new Tokenizer($tss))->getTokens();
 	}
 
 	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);
@@ -45,8 +50,9 @@ 
 		foreach (new TokenFilterIterator($this->tss, [Tokenizer::WHITESPACE]) as $token) {
 			if ($processing = $this->processingInstructions($token, count($this->rules)+$indexStart)) {
 				$this->rules = array_merge($this->rules, $processing);
+			} else if ($token['type'] !== Tokenizer::NEW_LINE) {
+				$this->addRules($token, $indexStart++);
 			}
-			else if ($token['type'] !== Tokenizer::NEW_LINE) $this->addRules($token, $indexStart++);
 		}
 
 		return $this->rules;
@@ -56,14 +62,18 @@ 
 		$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']), $token['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) {
@@ -91,7 +101,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));
@@ -111,10 +123,15 @@ 
 
 	private function sortRules($a, $b) {
 		//If they have the same depth, compare on index
-		if ($a->query === $b->query) return $this->sortPseudo($a, $b);
+		if ($a->query === $b->query) {
+			return $this->sortPseudo($a, $b);
+		}
 
-		if ($a->depth === $b->depth) $property = 'index';
-		else $property = 'depth'; 
+		if ($a->depth === $b->depth) {
+			$property = 'index';
+		} else {
+			$property = 'depth';
+		}
 		
 		return ($a->$property < $b->$property) ? -1 : 1;
 	}

src/Parser/TokenFilterIterator.php

Braces +3 added lines, -1 removed lines

@@ -35,7 +35,9 @@
 
     public function rewind() {
         $this->tokens->rewind();
-        while ($this->shouldContinue()) $this->tokens->next();
+        while ($this->shouldContinue()) {
+        	$this->tokens->next();
+        }
     }
 
     private function shouldContinue() {

Indentation +28 added lines, -28 removed lines

@@ -6,39 +6,39 @@
  * @version         1.2                                                             */
 namespace Transphporm\Parser;
 class TokenFilterIterator implements \Iterator {
-    private $ignore;
-    private $tokens;
+	private $ignore;
+	private $tokens;
 
-    public function __construct(Tokens $tokens, array $ignore) {
-        $this->ignore = $ignore;
-        $this->tokens = $tokens;
-    }
+	public function __construct(Tokens $tokens, array $ignore) {
+		$this->ignore = $ignore;
+		$this->tokens = $tokens;
+	}
 
-    public function current() {
-        return $this->tokens->current();
-    }
+	public function current() {
+		return $this->tokens->current();
+	}
 
-    public function key() {
-        return $this->tokens->key();
-    }
+	public function key() {
+		return $this->tokens->key();
+	}
 
-    public function valid() {
-        return $this->tokens->valid();
-    }
+	public function valid() {
+		return $this->tokens->valid();
+	}
 
-    public function next() {
-        do {
-            $this->tokens->next();
-        }
-        while ($this->shouldContinue());
-    }
+	public function next() {
+		do {
+			$this->tokens->next();
+		}
+		while ($this->shouldContinue());
+	}
 
-    public function rewind() {
-        $this->tokens->rewind();
-        while ($this->shouldContinue()) $this->tokens->next();
-    }
+	public function rewind() {
+		$this->tokens->rewind();
+		while ($this->shouldContinue()) $this->tokens->next();
+	}
 
-    private function shouldContinue() {
-        return $this->tokens->valid() && in_array($this->tokens->current()['type'], $this->ignore);
-    }
+	private function shouldContinue() {
+		return $this->tokens->valid() && in_array($this->tokens->current()['type'], $this->ignore);
+	}
 }

src/Builder.php

Doc Comments +8 added lines

@@ -62,6 +62,10 @@ 
 		return (object) $result;
 	}
 
+	/**
+	 * @param Template $template
+	 * @param Config $config
+	 */
 	private function processRules($template, $config) {
 		$rules = $this->getRules($template, $config);
 
@@ -71,6 +75,10 @@ 
 	}
 
 	//Add a postprocessing hook. This cleans up anything transphporm has added to the markup which needs to be removed
+
+	/**
+	 * @param Template $template
+	 */
 	private function doPostProcessing($template) {
 		$template->addHook('//*[@transphporm]', new Hook\PostProcess());
 		return $template;

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,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);
 		$this->config = new Config($functionSet, $valueParser, $elementData, new Hook\Formatter(), new Parser\CssToXpath($functionSet, $template->getPrefix(), md5($this->tss)), $this->filePath, $headers);
 

Braces +15 added lines, -5 removed lines

@@ -27,7 +27,9 @@ 
 		$this->cache = new Cache(new \ArrayObject());
 		$this->filePath = new FilePath();
 		$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
@@ -56,7 +58,9 @@ 
 		$valueParser = new Parser\Value($functionSet);
 		$this->config = new Config($functionSet, $valueParser, $elementData, new Hook\Formatter(), new Parser\CssToXpath($functionSet, $template->getPrefix(), md5($this->tss)), $this->filePath, $headers);
 
-		foreach ($this->modules as $module) $module->load($this->config);
+		foreach ($this->modules as $module) {
+			$module->load($this->config);
+		}
 
 		$this->processRules($template, $this->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);
+			}
 		}
 	}
 
@@ -93,7 +99,9 @@ 
 	//Load a template, firstly check if it's a file or a valid string
 	private function loadTemplate() {
         $result = ['body' => $this->template, 'headers' => []];
-		if (file_exists($this->template)) $result = $this->loadTemplateFromFile($this->template);
+		if (file_exists($this->template)) {
+			$result = $this->loadTemplateFromFile($this->template);
+		}
 		return $result;
 	}
 
@@ -119,6 +127,8 @@ 
 
 	public function __destruct() {
 		//Required hack as DomXPath can only register static functions clear, the statically stored instance to avoid memory leaks
-		if (isset($this->config)) $this->config->getCssToXpath()->cleanup();
+		if (isset($this->config)) {
+			$this->config->getCssToXpath()->cleanup();
+		}
 	}
 }

Indentation +8 added lines, -8 removed lines

@@ -41,9 +41,9 @@ 
 	}
 	
 	public function setLocale($locale) {
-                $format = new \Transphporm\Module\Format($locale);
-                $this->modules[get_class($format)] = $format;
-        }
+				$format = new \Transphporm\Module\Format($locale);
+				$this->modules[get_class($format)] = $format;
+		}
 
 	public function addPath($dir) {
 		$this->filePath->addPath($dir);
@@ -97,15 +97,15 @@ 
 
 	//Load a template, firstly check if it's a file or a valid string
 	private function loadTemplate() {
-        $result = ['body' => $this->template, 'headers' => []];
+		$result = ['body' => $this->template, 'headers' => []];
 		if (file_exists($this->template)) $result = $this->loadTemplateFromFile($this->template);
 		return $result;
 	}
 
-    private function loadTemplateFromFile($file) {
-        $xml = $this->cache->load($this->template, filemtime($this->template));
-        return $xml ? $xml : ['body' => file_get_contents($this->template) ?: "", 'headers' => []];
-    }
+	private function loadTemplateFromFile($file) {
+		$xml = $this->cache->load($this->template, filemtime($this->template));
+		return $xml ? $xml : ['body' => file_get_contents($this->template) ?: "", 'headers' => []];
+	}
 
 	//Load the TSS rules either from a file or as a string
 	//N.b. only files can be cached

src/Exception.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
     const FORMATTER = 'formatter';
 
     public function __construct(RunException $runException, $file, $line) {
-        $message = $runException->getMessage() . ' on Line ' . $line . ' of ' . ($file === null ? 'tss' : $file);
+        $message = $runException->getMessage().' on Line '.$line.' of '.($file === null ? 'tss' : $file);
 
         parent::__construct($message, 0, $runException->getPrevious());
     }

Indentation +8 added lines, -8 removed lines

@@ -6,14 +6,14 @@
  * @version         1.2                                                             */
 namespace Transphporm;
 class Exception extends \Exception {
-    const PROPERTY = 'property';
-    const TSS_FUNCTION = 'function';
-    const PSEUDO = 'pseudo';
-    const FORMATTER = 'formatter';
+	const PROPERTY = 'property';
+	const TSS_FUNCTION = 'function';
+	const PSEUDO = 'pseudo';
+	const FORMATTER = 'formatter';
 
-    public function __construct(RunException $runException, $file, $line) {
-        $message = $runException->getMessage() . ' on Line ' . $line . ' of ' . ($file === null ? 'tss' : $file);
+	public function __construct(RunException $runException, $file, $line) {
+		$message = $runException->getMessage() . ' on Line ' . $line . ' of ' . ($file === null ? 'tss' : $file);
 
-        parent::__construct($message, 0, $runException->getPrevious());
-    }
+		parent::__construct($message, 0, $runException->getPrevious());
+	}
 }

src/TSSCache.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 	}
 
 	private function getCacheKey($file) {
-		return $file . $this->prefix . dirname(realpath($file)) . DIRECTORY_SEPARATOR;
+		return $file.$this->prefix.dirname(realpath($file)).DIRECTORY_SEPARATOR;
 	}
 
     public function load($tss) {

Braces +6 added lines, -2 removed lines

@@ -18,7 +18,9 @@ 
 		$rules = $this->cache->load($key, filemtime($file));
 		if ($rules) {
 			foreach ($rules['import'] as $file) {
-				if (!$this->cache->load($this->getCacheKey($file), filemtime($file))) return false;
+				if (!$this->cache->load($this->getCacheKey($file), filemtime($file))) {
+					return false;
+				}
 			}
 		}
 		return $rules;
@@ -33,7 +35,9 @@ 
     }
 
     public function write($file, $rules, $imports = []) {
-        if (is_file($file)) $this->cache->write($this->getCacheKey($file), ['rules' => $rules, 'import' => $imports]);
+        if (is_file($file)) {
+        	$this->cache->write($this->getCacheKey($file), ['rules' => $rules, 'import' => $imports]);
+        }
         return $rules;
     }
 }

Indentation +13 added lines, -13 removed lines

@@ -6,13 +6,13 @@ 
  * @version         1.2                                                             */
 namespace Transphporm;
 class TSSCache {
-    private $cache;
-    private $prefix;
+	private $cache;
+	private $prefix;
 
-    public function __construct(Cache $cache, $prefix) {
-        $this->cache = $cache;
-        $this->prefix = $prefix;
-    }
+	public function __construct(Cache $cache, $prefix) {
+		$this->cache = $cache;
+		$this->prefix = $prefix;
+	}
 
 	private function getRulesFromCache($file) {
 		//The cache for the key: the filename and template prefix
@@ -33,12 +33,12 @@ 
 		return $file . $this->prefix . dirname(realpath($file)) . DIRECTORY_SEPARATOR;
 	}
 
-    public function load($tss) {
-        return $this->getRulesFromCache($tss);
-    }
+	public function load($tss) {
+		return $this->getRulesFromCache($tss);
+	}
 
-    public function write($file, $rules, $imports = []) {
-        if (is_file($file)) $this->cache->write($this->getCacheKey($file), ['rules' => $rules, 'import' => $imports]);
-        return $rules;
-    }
+	public function write($file, $rules, $imports = []) {
+		if (is_file($file)) $this->cache->write($this->getCacheKey($file), ['rules' => $rules, 'import' => $imports]);
+		return $rules;
+	}
 }