Level-2 / Transphporm

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

@@ -30,6 +30,9 @@ 
 		return $rules;
 	}
 
+	/**
+	 * @param integer $indexStart
+	 */
 	private function parseTokens($indexStart) {
 		$this->rules = [];
 		foreach (new TokenFilterIterator($this->tss, [Tokenizer::WHITESPACE]) as $token) {
@@ -55,6 +58,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 = [];
@@ -78,6 +85,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);

Braces +14 added lines, -5 removed lines

@@ -24,7 +24,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);
 		$this->checkError($rules);
 		return $rules;
@@ -35,8 +37,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 (!in_array($token['type'], [Tokenizer::NEW_LINE, Tokenizer::AT_SIGN])) {
+				$this->addRules($token, $indexStart++);
 			}
-			else if (!in_array($token['type'], [Tokenizer::NEW_LINE, Tokenizer::AT_SIGN])) $this->addRules($token, $indexStart++);
 		}
 
 		return $this->rules;
@@ -46,13 +49,17 @@ 
 		$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) {
@@ -79,7 +86,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();
 		$funcToks = $tokens->from(Tokenizer::NAME);

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/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/Formatter/HTMLFormatter.php

Doc Comments +3 added lines

@@ -7,6 +7,9 @@
         $this->templateFunction = $templateFunction;
     }
 
+    /**
+     * @param string $val
+     */
     public function html($val) {
 		return $this->templateFunction->run(['<template>' . $val . '</template>']);
 	}

Spacing +2 added lines, -2 removed lines

@@ -8,12 +8,12 @@
     }
 
     public function html($val) {
-		return $this->templateFunction->run(['<template>' . $val . '</template>']);
+		return $this->templateFunction->run(['<template>'.$val.'</template>']);
 	}
 
 	public function debug($val) {
 		ob_start();
 		var_dump($val);
-		return $this->html('<pre>' . ob_get_clean() . '</pre>');
+		return $this->html('<pre>'.ob_get_clean().'</pre>');
 	}
 }

Indentation +5 added lines, -5 removed lines

@@ -6,13 +6,13 @@
  * @version         1.2                                                             */
 namespace Transphporm\Formatter;
 class HTMLFormatter {
-    private $templateFunction;
+	private $templateFunction;
 
-    public function __construct(\Transphporm\TSSFunction\Template $templateFunction) {
-        $this->templateFunction = $templateFunction;
-    }
+	public function __construct(\Transphporm\TSSFunction\Template $templateFunction) {
+		$this->templateFunction = $templateFunction;
+	}
 
-    public function html($val) {
+	public function html($val) {
 		return $this->templateFunction->run(['<template>' . $val . '</template>']);
 	}
 

src/Rule.php

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

Spacing +3 added lines, -3 removed lines

@@ -48,7 +48,7 @@ 
 
 		$offset = $this->getUpdateFrequency($frequency);
 
-		if ($time > $this->lastRun + $offset) return true;
+		if ($time > $this->lastRun+$offset) return true;
 		else return false;
 	}
 
@@ -75,8 +75,8 @@ 
 		$num = (int) $frequency;
 		$unit = strtoupper(trim(str_replace($num, '', $frequency)));
 		if ($frequency == 'always') return 0;
-		else if ($frequency == 'never') return self::D*3650; //Not quite never, in 10 years will cause issues on 32 bit PHP builds re 2038 problem
+		else if ($frequency == 'never') return self::D * 3650; //Not quite never, in 10 years will cause issues on 32 bit PHP builds re 2038 problem
 
-		return $num * constant(self::class . '::' . $unit);
+		return $num * constant(self::class.'::'.$unit);
 	}
 }

Braces +26 added lines, -10 removed lines

@@ -44,22 +44,31 @@ 
 	}
 
 	private function timeFrequency($frequency, $time = null) {
-		if ($time === null) $time = time();
+		if ($time === null) {
+			$time = time();
+		}
 
 		$offset = $this->getUpdateFrequency($frequency);
 
-		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;
 	}
 
 	public function getUpdateFrequency($frequency = null) {
@@ -67,15 +76,22 @@ 
 			$frequency = isset($this->properties['update-frequency']) ? $this->properties['update-frequency']->read() : false;
 		}
 
-		if (empty($frequency)) return 0;
-		else return $this->calcUpdateFrequency($frequency);
+		if (empty($frequency)) {
+			return 0;
+		} else {
+			return $this->calcUpdateFrequency($frequency);
+		}
 	}
 
 	private function calcUpdateFrequency($frequency) {
 		$num = (int) $frequency;
 		$unit = strtoupper(trim(str_replace($num, '', $frequency)));
-		if ($frequency == 'always') return 0;
-		else if ($frequency == 'never') return self::D*3650; //Not quite never, in 10 years will cause issues on 32 bit PHP builds re 2038 problem
+		if ($frequency == 'always') {
+			return 0;
+		} else if ($frequency == 'never') {
+			return self::D*3650;
+		}
+		//Not quite never, in 10 years will cause issues on 32 bit PHP builds re 2038 problem
 
 		return $num * constant(self::class . '::' . $unit);
 	}

src/Module/Format.php

Spacing +2 added lines, -2 removed lines

@@ -15,8 +15,8 @@
 
 	private function getLocale() {
 		if (is_array($this->locale)) return $this->locale;
-		else if (strlen($this->locale) > 0) return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . $this->locale . '.json'), true);
-		else return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . 'enGB.json'), true);
+		else if (strlen($this->locale) > 0) return json_decode(file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'../Formatter'.DIRECTORY_SEPARATOR.'Locale'.DIRECTORY_SEPARATOR.$this->locale.'.json'), true);
+		else return json_decode(file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'../Formatter'.DIRECTORY_SEPARATOR.'Locale'.DIRECTORY_SEPARATOR.'enGB.json'), true);
 	}
 
 	public function load(\Transphporm\Config $config) {

Braces +7 added lines, -3 removed lines

@@ -14,9 +14,13 @@
 	}
 
 	private function getLocale() {
-		if (is_array($this->locale)) return $this->locale;
-		else if (strlen($this->locale) > 0) return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . $this->locale . '.json'), true);
-		else return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . 'enGB.json'), true);
+		if (is_array($this->locale)) {
+			return $this->locale;
+		} else if (strlen($this->locale) > 0) {
+			return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . $this->locale . '.json'), true);
+		} else {
+			return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . 'enGB.json'), true);
+		}
 	}
 
 	public function load(\Transphporm\Config $config) {

src/Cache.php

Braces +2 added lines, -1 removed lines

@@ -21,7 +21,8 @@
 		$key = md5($key);
 		if (isset($this->cache[$key]) && $this->cache[$key]['timestamp'] >= $modified) {
 			return $this->cache[$key]['content'];
+		} else {
+			return false;
 		}
-		else return false;
 	}
 }
\ No newline at end of file

src/Hook/Formatter.php

Braces +7 added lines, -4 removed lines

@@ -14,7 +14,9 @@ 
 	}
 
 	public function format($value, $rules) {
-		if (!isset($rules['format'])) return $value;
+		if (!isset($rules['format'])) {
+			return $value;
+		}
 		$tokens = $rules['format'];
 
 		$functionName = $tokens->from(\Transphporm\Parser\Tokenizer::NAME, true)->read();
@@ -27,15 +29,16 @@ 
 
 		try {
 			return $this->processFormat($options, $functionName, $value);
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 			throw new \Transphporm\RunException(\Transphporm\Exception::FORMATTER, $functionName, $e);
 		}
 	}
 
 	//TODO: Abstract all error reporting externally with a method for turning it on/off
 	private function assert($condition, $error) {
-		if (!$condition) throw new \Exception($error);
+		if (!$condition) {
+			throw new \Exception($error);
+		}
 	}
 
 	private function processFormat($format, $functionName, $value) {