Completed
Push — master ( 7023df...5e8065 )
by Tom
01:30
created
src/SheetLoader/TSSFile.php 3 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -17,8 +17,8 @@  discard block
 block discarded – undo
17 17
 		$this->fileName = $fileName;
18 18
 		$this->filePath = $filePath;
19 19
 		$this->cache = $cache;
20
-	    $this->time = isset($time) ? $time : time();
21
-	    $this->cacheName = $this->fileName;
20
+		$this->time = isset($time) ? $time : time();
21
+		$this->cacheName = $this->fileName;
22 22
 	}
23 23
 
24 24
 	private function getRulesFromCache($file) {
@@ -77,15 +77,15 @@  discard block
 block discarded – undo
77 77
 	}
78 78
 
79 79
 	//write the sheet to cache
80
-    public function write($rules, $imports = []) {
80
+	public function write($rules, $imports = []) {
81 81
 		$existing = $this->cache->load($this->fileName, filemtime($this->fileName));
82 82
 		if (isset($existing['import']) && empty($imports)) $imports = $existing['import'];
83 83
 		$this->cache->write($this->cacheName, ['rules' => $rules, 'import' => $imports, 'minFreq' => $this->getMinUpdateFreq($rules), 'ctime' => $this->time, 'cacheKey' => $this->cacheKey]);
84 84
 
85 85
 		return $rules;
86
-    }
86
+	}
87 87
 
88
-    //Gets the minimum update-frequency for a sheet's rules
88
+	//Gets the minimum update-frequency for a sheet's rules
89 89
 	private function getMinUpdateFreq($rules) {
90 90
 		$min = \PHP_INT_MAX;
91 91
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@
 block discarded – undo
61 61
 		if ($this->cacheKey) {
62 62
 			$parser = new \Transphporm\Parser\Value($data);
63 63
 			$cacheKey = $parser->parseTokens($this->cacheKey)[0];
64
-			$this->cacheName = $cacheKey . $this->fileName;
64
+			$this->cacheName = $cacheKey.$this->fileName;
65 65
 			return $cacheKey;
66 66
 		}
67 67
 		else return $this->fileName;
Please login to merge, or discard this patch.
Braces   +22 added lines, -8 removed lines patch added patch discarded remove patch
@@ -32,7 +32,9 @@  discard block
 block discarded – undo
32 32
 		if ($rules) {
33 33
 			foreach ($rules['import'] as $file) {
34 34
 				//Check that the import file hasn't been changed since the cache was written
35
-				if (filemtime($file) > $rules['ctime']) return false;
35
+				if (filemtime($file) > $rules['ctime']) {
36
+					return false;
37
+				}
36 38
 			}
37 39
 		}
38 40
 
@@ -48,10 +50,14 @@  discard block
 block discarded – undo
48 50
 
49 51
 		$rules = $this->getRulesFromCache($this->fileName);
50 52
 		//Nothing was cached or the TSS file has changed, update is required
51
-		if (empty($rules)) return true;
53
+		if (empty($rules)) {
54
+			return true;
55
+		}
52 56
 
53 57
 		//Find the sheet's minimum update-frequency, if it hasn't passed then no updates are required
54
-		if ($rules['ctime']+$rules['minFreq'] <= $this->time) return true;
58
+		if ($rules['ctime']+$rules['minFreq'] <= $this->time) {
59
+			return true;
60
+		}
55 61
 
56 62
 		return false;
57 63
 	}
@@ -63,15 +69,19 @@  discard block
 block discarded – undo
63 69
 			$cacheKey = $parser->parseTokens($this->cacheKey)[0];
64 70
 			$this->cacheName = $cacheKey . $this->fileName;
65 71
 			return $cacheKey;
72
+		} else {
73
+			return $this->fileName;
66 74
 		}
67
-		else return $this->fileName;
68 75
 	}
69 76
 
70 77
 	public function getRules($cssToXpath, $valueParser, $sheetLoader, $indexStart) {
71 78
 		$rules = $this->getRulesFromCache($this->fileName);
72 79
 		$this->filePath->addPath(dirname(realpath($this->fileName)));
73
-		if (empty($rules)) $tss = file_get_contents($this->fileName);
74
-		else return $rules['rules'];
80
+		if (empty($rules)) {
81
+			$tss = file_get_contents($this->fileName);
82
+		} else {
83
+			return $rules['rules'];
84
+		}
75 85
 
76 86
 		return $tss == null ? [] : (new \Transphporm\Parser\Sheet($tss, $cssToXpath, $valueParser, $this->filePath, $sheetLoader))->parse($indexStart);
77 87
 	}
@@ -79,7 +89,9 @@  discard block
 block discarded – undo
79 89
 	//write the sheet to cache
80 90
     public function write($rules, $imports = []) {
81 91
 		$existing = $this->cache->load($this->fileName, filemtime($this->fileName));
82
-		if (isset($existing['import']) && empty($imports)) $imports = $existing['import'];
92
+		if (isset($existing['import']) && empty($imports)) {
93
+			$imports = $existing['import'];
94
+		}
83 95
 		$this->cache->write($this->cacheName, ['rules' => $rules, 'import' => $imports, 'minFreq' => $this->getMinUpdateFreq($rules), 'ctime' => $this->time, 'cacheKey' => $this->cacheKey]);
84 96
 
85 97
 		return $rules;
@@ -91,7 +103,9 @@  discard block
 block discarded – undo
91 103
 
92 104
 		foreach ($rules as $rule) {
93 105
 			$ruleFreq = $rule->getUpdateFrequency();
94
-			if ($ruleFreq < $min) $min = $ruleFreq;
106
+			if ($ruleFreq < $min) {
107
+				$min = $ruleFreq;
108
+			}
95 109
 		}
96 110
 
97 111
 		return $min;
Please login to merge, or discard this patch.
src/TSSFunction/Constant.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@
 block discarded – undo
10 10
 	public function run(array $args, \DomElement $element) {
11 11
 		$const_name = strtoupper(trim($args[0]));
12 12
 		if (!defined($const_name)) {
13
-			throw new \Exception($const_name . ' is not a defined constant');
13
+			throw new \Exception($const_name.' is not a defined constant');
14 14
 		}
15 15
 		return constant($const_name);
16 16
 	}
Please login to merge, or discard this patch.
src/Module/Functions.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 		$templateFunction = new \Transphporm\TSSFunction\Template($config->getElementData(), $config->getCssToXpath(), $baseDir);
22 22
 		$functionSet->addFunction('template', $templateFunction);
23 23
 		$functionSet->addFunction('json', new \Transphporm\TSSFunction\Json($baseDir));
24
-        $functionSet->addFunction('constant', new \Transphporm\TSSFunction\Constant());
24
+		$functionSet->addFunction('constant', new \Transphporm\TSSFunction\Constant());
25 25
 
26 26
 		// Register HTML formatter here because it uses the template function
27 27
 		$config->registerFormatter(new \Transphporm\Formatter\HTMLFormatter($templateFunction));
Please login to merge, or discard this patch.
src/Parser/Tokens.php 3 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 	}
40 40
 
41 41
 	public function add($token) {
42
-		if ($token instanceof Tokens) $this->tokens = array_merge($this->tokens,  $token->tokens);
42
+		if ($token instanceof Tokens) $this->tokens = array_merge($this->tokens, $token->tokens);
43 43
 		else $this->tokens[] = $token;
44 44
 	}
45 45
 
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 			if ($token['type'] === $tokenType) $i++;
88 88
 			else $splitTokens[$i][] = $token;
89 89
 		}
90
-		return array_map(function ($tokens) {
90
+		return array_map(function($tokens) {
91 91
 			return new Tokens($tokens);
92 92
 		}, $splitTokens);
93 93
 		//return $splitTokens;
Please login to merge, or discard this patch.
Braces   +30 added lines, -11 removed lines patch added patch discarded remove patch
@@ -39,8 +39,11 @@  discard block
 block discarded – undo
39 39
 	}
40 40
 
41 41
 	public function add($token) {
42
-		if ($token instanceof Tokens) $this->tokens = array_merge($this->tokens,  $token->tokens);
43
-		else $this->tokens[] = $token;
42
+		if ($token instanceof Tokens) {
43
+			$this->tokens = array_merge($this->tokens,  $token->tokens);
44
+		} else {
45
+			$this->tokens[] = $token;
46
+		}
44 47
 	}
45 48
 
46 49
 
@@ -54,9 +57,13 @@  discard block
 block discarded – undo
54 57
 
55 58
 	private function getKeyToSlice($tokenType) {
56 59
 		$keys = $this->getKeysOfTokenType($tokenType);
57
-		if (empty($keys)) return false;
60
+		if (empty($keys)) {
61
+			return false;
62
+		}
58 63
 		$key = $keys[0];
59
-		for ($i = 0; $key < $this->iterator && isset($keys[$i]); $i++) $key = $keys[$i];
64
+		for ($i = 0; $key < $this->iterator && isset($keys[$i]); $i++) {
65
+			$key = $keys[$i];
66
+		}
60 67
 		return $key;
61 68
 	}
62 69
 
@@ -70,10 +77,17 @@  discard block
 block discarded – undo
70 77
 
71 78
 	private function sliceTokens($tokenType, $type, $increment = false) {
72 79
 		$key = $this->getKeyToSlice($tokenType);
73
-		if ($key === false) return new Tokens([]);
74
-		if ($increment) $key++;
75
-		if ($type === "from") return new Tokens(array_slice($this->tokens, $key));
76
-		else return new Tokens(array_slice($this->tokens, $this->iterator, $key));
80
+		if ($key === false) {
81
+			return new Tokens([]);
82
+		}
83
+		if ($increment) {
84
+			$key++;
85
+		}
86
+		if ($type === "from") {
87
+			return new Tokens(array_slice($this->tokens, $key));
88
+		} else {
89
+			return new Tokens(array_slice($this->tokens, $this->iterator, $key));
90
+		}
77 91
 	}
78 92
 
79 93
 	public function skip($count) {
@@ -84,8 +98,11 @@  discard block
 block discarded – undo
84 98
 		$splitTokens = [];
85 99
 		$i = 0;
86 100
 		foreach ($this->tokens as $token) {
87
-			if ($token['type'] === $tokenType) $i++;
88
-			else $splitTokens[$i][] = $token;
101
+			if ($token['type'] === $tokenType) {
102
+				$i++;
103
+			} else {
104
+				$splitTokens[$i][] = $token;
105
+			}
89 106
 		}
90 107
 		return array_map(function ($tokens) {
91 108
 			return new Tokens($tokens);
@@ -109,7 +126,9 @@  discard block
 block discarded – undo
109 126
 
110 127
 	public function removeLine() {
111 128
 		$tokens = $this->tokens;
112
-		foreach ($tokens as &$token) unset($token['line']);
129
+		foreach ($tokens as &$token) {
130
+			unset($token['line']);
131
+		}
113 132
 		return new Tokens($tokens);
114 133
 	}
115 134
 
Please login to merge, or discard this patch.
Doc Comments   +9 added lines patch added patch discarded remove patch
@@ -52,6 +52,9 @@  discard block
 block discarded – undo
52 52
 		return array_keys(array_column($this->tokens, 'type'), $tokenType);
53 53
 	}
54 54
 
55
+	/**
56
+	 * @return integer|null
57
+	 */
55 58
 	private function getKeyToSlice($tokenType) {
56 59
 		$keys = $this->getKeysOfTokenType($tokenType);
57 60
 		if (empty($keys)) return false;
@@ -68,6 +71,9 @@  discard block
 block discarded – undo
68 71
 		return $this->sliceTokens($tokenType, "to", $inclusive);
69 72
 	}
70 73
 
74
+	/**
75
+	 * @param string $type
76
+	 */
71 77
 	private function sliceTokens($tokenType, $type, $increment = false) {
72 78
 		$key = $this->getKeyToSlice($tokenType);
73 79
 		if ($key === false) return new Tokens([]);
@@ -76,6 +82,9 @@  discard block
 block discarded – undo
76 82
 		else return new Tokens(array_slice($this->tokens, $this->iterator, $key));
77 83
 	}
78 84
 
85
+	/**
86
+	 * @param integer $count
87
+	 */
79 88
 	public function skip($count) {
80 89
 		$this->iterator += $count;
81 90
 	}
Please login to merge, or discard this patch.
src/Formatter/Number.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -14,12 +14,12 @@
 block discarded – undo
14 14
 
15 15
 	public function decimal($num, $decimals) {
16 16
 		if (!is_numeric($num)) return $num;
17
-		return number_format((float)$num, $decimals, $this->locale['decimal_separator'], $this->locale['thousands_separator']);
17
+		return number_format((float) $num, $decimals, $this->locale['decimal_separator'], $this->locale['thousands_separator']);
18 18
 	}
19 19
 
20 20
 	public function currency($num) {
21 21
 		$num = $this->decimal($num, $this->locale['currency_decimals']);
22
-		if ($this->locale['currency_position'] === 'before') return $this->locale['currency'] . $num;
23
-		else return $num . $this->locale['currency'];
22
+		if ($this->locale['currency_position'] === 'before') return $this->locale['currency'].$num;
23
+		else return $num.$this->locale['currency'];
24 24
 	}
25 25
 }
Please login to merge, or discard this patch.
Braces   +8 added lines, -3 removed lines patch added patch discarded remove patch
@@ -13,13 +13,18 @@
 block discarded – undo
13 13
 	}
14 14
 
15 15
 	public function decimal($num, $decimals) {
16
-		if (!is_numeric($num)) return $num;
16
+		if (!is_numeric($num)) {
17
+			return $num;
18
+		}
17 19
 		return number_format((float)$num, $decimals, $this->locale['decimal_separator'], $this->locale['thousands_separator']);
18 20
 	}
19 21
 
20 22
 	public function currency($num) {
21 23
 		$num = $this->decimal($num, $this->locale['currency_decimals']);
22
-		if ($this->locale['currency_position'] === 'before') return $this->locale['currency'] . $num;
23
-		else return $num . $this->locale['currency'];
24
+		if ($this->locale['currency_position'] === 'before') {
25
+			return $this->locale['currency'] . $num;
26
+		} else {
27
+			return $num . $this->locale['currency'];
28
+		}
24 29
 	}
25 30
 }
Please login to merge, or discard this patch.
src/Hook/PostProcess.php 1 patch
Braces   +7 added lines, -3 removed lines patch added patch discarded remove patch
@@ -9,9 +9,13 @@
 block discarded – undo
9 9
 class PostProcess implements \Transphporm\Hook {
10 10
 	public function run(\DomElement $element) {
11 11
 		$transphporm = $element->getAttribute('transphporm');
12
-		if ($transphporm === 'remove') $element->parentNode->removeChild($element);
13
-		else if ($transphporm === 'text') $element->parentNode->replaceChild($element->firstChild, $element);
14
-		else $element->removeAttribute('transphporm');
12
+		if ($transphporm === 'remove') {
13
+			$element->parentNode->removeChild($element);
14
+		} else if ($transphporm === 'text') {
15
+			$element->parentNode->replaceChild($element->firstChild, $element);
16
+		} else {
17
+			$element->removeAttribute('transphporm');
18
+		}
15 19
 	}
16 20
 
17 21
 	public function runOnImmutableElements(): bool {
Please login to merge, or discard this patch.
src/Property/Repeat.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,13 +9,13 @@
 block discarded – undo
9 9
 	private $functionSet;
10 10
 	private $elementData;
11 11
 	private $line;
12
-    private $filePath;
12
+	private $filePath;
13 13
 
14 14
 	public function __construct(\Transphporm\FunctionSet $functionSet, \Transphporm\Hook\ElementData $elementData, &$line, \Transphporm\FilePath $filePath) {
15 15
 		$this->functionSet = $functionSet;
16 16
 		$this->elementData = $elementData;
17 17
 		$this->line = &$line;
18
-        $this->filePath = $filePath;
18
+		$this->filePath = $filePath;
19 19
 	}
20 20
 
21 21
 
Please login to merge, or discard this patch.
Braces   +15 added lines, -5 removed lines patch added patch discarded remove patch
@@ -22,7 +22,9 @@  discard block
 block discarded – undo
22 22
 
23 23
 	public function run(array $values, \DomElement $element, array $rules, \Transphporm\Hook\PseudoMatcher $pseudoMatcher, array $properties = []) {
24 24
 		$values = $this->fixEmpty($values);
25
-		if ($element->getAttribute('transphporm') === 'added') return $element->parentNode->removeChild($element);
25
+		if ($element->getAttribute('transphporm') === 'added') {
26
+			return $element->parentNode->removeChild($element);
27
+		}
26 28
 		$this->handleContentModeAppend($element, $rules);
27 29
 		$max = $this->getMax($values);
28 30
 		$count = 0;
@@ -32,7 +34,9 @@  discard block
 block discarded – undo
32 34
 		$hook = $this->createHook($rules, $pseudoMatcher, $properties);
33 35
 
34 36
 		foreach ($repeat as $key => $iteration) {
35
-			if ($count+1 > $max) break;
37
+			if ($count+1 > $max) {
38
+				break;
39
+			}
36 40
 			$clone = $this->cloneElement($element, $iteration, $key, $count++);
37 41
 			//Re-run the hook on the new element, but use the iterated data
38 42
 			$hook->run($clone);
@@ -68,7 +72,9 @@  discard block
 block discarded – undo
68 72
 	}
69 73
 
70 74
 	private function fixEmpty($value) {
71
-		if (empty($value[0])) $value[0] = [];
75
+		if (empty($value[0])) {
76
+			$value[0] = [];
77
+		}
72 78
 		return $value;
73 79
 	}
74 80
 
@@ -84,7 +90,9 @@  discard block
 block discarded – undo
84 90
 
85 91
 	private function tagElement($element, $count) {
86 92
 		//Mark all but one of the nodes as having been added by transphporm, when the hook is run again, these are removed
87
-		if ($count > 0) $element->setAttribute('transphporm', 'added');
93
+		if ($count > 0) {
94
+			$element->setAttribute('transphporm', 'added');
95
+		}
88 96
 	}
89 97
 
90 98
 	private function getMax($values) {
@@ -93,7 +101,9 @@  discard block
 block discarded – undo
93 101
 
94 102
 	private function createHook($newRules, $pseudoMatcher, $properties) {
95 103
 		$hook = new \Transphporm\Hook\PropertyHook($newRules, $this->line, null, $this->line, $pseudoMatcher, new \Transphporm\Parser\Value($this->functionSet), $this->functionSet, $this->filePath);
96
-		foreach ($properties as $name => $property) $hook->registerProperty($name, $property);
104
+		foreach ($properties as $name => $property) {
105
+			$hook->registerProperty($name, $property);
106
+		}
97 107
 		return $hook;
98 108
 	}
99 109
 }
Please login to merge, or discard this patch.
src/Hook/PseudoMatcher.php 1 patch
Braces   +25 added lines, -12 removed lines patch added patch discarded remove patch
@@ -27,7 +27,9 @@  discard block
 block discarded – undo
27 27
 			$parts = $this->getFuncParts($i, $tokens);
28 28
 			foreach ($this->functions as $function) {
29 29
 				$matches = $this->match($parts, $function, $element);
30
-				if ($matches === false) return false;
30
+				if ($matches === false) {
31
+					return false;
32
+				}
31 33
 			}
32 34
 		}
33 35
 		return true;
@@ -36,14 +38,17 @@  discard block
 block discarded – undo
36 38
 	private function match($parts, $function, $element) {
37 39
 		try {
38 40
 			$matches = $function->match($parts['name'], $parts['args'], $element);
39
-			if ($matches === false) return false;
40
-		}
41
-		catch (\Exception $e) {
41
+			if ($matches === false) {
42
+				return false;
43
+			}
44
+		} catch (\Exception $e) {
42 45
 			throw new \Transphporm\RunException(\Transphporm\Exception::PSEUDO, $parts['name'], $e);
43 46
 		}
44 47
 	}
45 48
 	private function getFuncParts($i, $tokens) {
46
-		if (isset($this->funcParts[$i])) return $this->funcParts[$i];
49
+		if (isset($this->funcParts[$i])) {
50
+			return $this->funcParts[$i];
51
+		}
47 52
 		$parts = [];
48 53
 		$canCache = true;
49 54
 		$parts['name'] = $this->getFuncName($tokens);
@@ -51,32 +56,40 @@  discard block
 block discarded – undo
51 56
 			//If the args are dynamic, it can't be cached as it may change between calls
52 57
 			$canCache = false;
53 58
 			$parts['args'] = $this->valueParser->parseTokens($tokens);
54
-		}
55
-		else if (count($tokens) > 1) {
59
+		} else if (count($tokens) > 1) {
56 60
 			$tokens->rewind();
57 61
 			$tokens->next();
58 62
 			$parts['args'] = $this->valueParser->parseTokens($tokens->current()['value']);
63
+		} else {
64
+			$parts['args'] = [['']];
65
+		}
66
+		if ($canCache) {
67
+			$this->funcParts[$i] = $parts;
59 68
 		}
60
-		else $parts['args'] = [['']];
61
-		if ($canCache) $this->funcParts[$i] = $parts;
62 69
 		return $parts;
63 70
 	}
64 71
 
65 72
 	private function getFuncName($tokens) {
66
-		if ($tokens->type() === Tokenizer::NAME) return $tokens->read();
73
+		if ($tokens->type() === Tokenizer::NAME) {
74
+			return $tokens->read();
75
+		}
67 76
 		return null;
68 77
 	}
69 78
 
70 79
 	public function hasFunction($name) {
71 80
 		foreach ($this->pseudo as $tokens) {
72
-			if ($name === $this->getFuncName($tokens)) return true;
81
+			if ($name === $this->getFuncName($tokens)) {
82
+				return true;
83
+			}
73 84
 		}
74 85
 	}
75 86
 
76 87
 	public function getFuncArgs($name) {
77 88
 		foreach ($this->pseudo as $i => $tokens) {
78 89
 			$parts = $this->getFuncParts($i, $tokens);
79
-			if ($name === $parts['name']) return $parts['args'];
90
+			if ($name === $parts['name']) {
91
+				return $parts['args'];
92
+			}
80 93
 		}
81 94
 	}
82 95
 }
Please login to merge, or discard this patch.