Completed
Push — master ( b10483...cba662 )
by Tom
02:21
created
src/Formatter/Date.php 1 patch
Braces   +16 added lines, -6 removed lines patch added patch discarded remove patch
@@ -44,8 +44,11 @@  discard block
 block discarded – undo
44 44
 
45 45
 		$diffDays = $diff->invert === 1 ? $diff->days : 0- $diff->days;
46 46
 
47
-		if ($diffDays !== 0) return $this->dayOffset($diffDays);
48
-		else return $this->timeOffset($diff);
47
+		if ($diffDays !== 0) {
48
+			return $this->dayOffset($diffDays);
49
+		} else {
50
+			return $this->timeOffset($diff);
51
+		}
49 52
 	}
50 53
 
51 54
 	/** Calculates offset in hours/minutes/seconds */
@@ -80,15 +83,22 @@  discard block
 block discarded – undo
80 83
 			[-365, -28, $strings['future'], 28, 'months'],
81 84
 			[-999999, -365, $strings['future'], 365, 'years'],
82 85
 		];
83
-		if (isset($strings['day_before_yesterday'])) array_unshift($ranges, [2, 2, $strings['day_before_yesterday'], 1, '']);
84
-		if (isset($strings['day_after_tomorrow'])) array_unshift($ranges, [-2, -2, $strings['day_after_tomorrow'], 1, '']);
86
+		if (isset($strings['day_before_yesterday'])) {
87
+			array_unshift($ranges, [2, 2, $strings['day_before_yesterday'], 1, '']);
88
+		}
89
+		if (isset($strings['day_after_tomorrow'])) {
90
+			array_unshift($ranges, [-2, -2, $strings['day_after_tomorrow'], 1, '']);
91
+		}
85 92
 		return $ranges;
86 93
 	}
87 94
 
88 95
 	/** Converts "week" to "weeks", "month" to "months" etc when plural is required using language from $locale */
89 96
 	private function getPlural($strings, $num, $interval) {
90
-		if ($interval !== '') return $num == 1 ? $strings[$interval . '_singular'] : $strings[$interval . '_plural'];
91
-		else return '';
97
+		if ($interval !== '') {
98
+			return $num == 1 ? $strings[$interval . '_singular'] : $strings[$interval . '_plural'];
99
+		} else {
100
+			return '';
101
+		}
92 102
 	}
93 103
 
94 104
 	/** Calculates offset in days/weeks/month/years */
Please login to merge, or discard this patch.
src/Formatter/Number.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,7 +13,10 @@
 block discarded – undo
13 13
 
14 14
 	public function currency($num) {
15 15
 		$num = $this->decimal($num, $this->locale['currency_decimals']);
16
-		if ($this->locale['currency_position'] === 'before') return $this->locale['currency'] . $num;
17
-		else return $num . $this->locale['currency'];
16
+		if ($this->locale['currency_position'] === 'before') {
17
+			return $this->locale['currency'] . $num;
18
+		} else {
19
+			return $num . $this->locale['currency'];
20
+		}
18 21
 	}
19 22
 }
20 23
\ No newline at end of file
Please login to merge, or discard this patch.
src/Template.php 1 patch
Braces   +14 added lines, -5 removed lines patch added patch discarded remove patch
@@ -33,14 +33,18 @@  discard block
 block discarded – undo
33 33
 	/** Loops through all assigned hooks, runs the Xpath query and calls the hook */
34 34
 	private function processHooks() {
35 35
 		foreach ($this->hooks as list($query, $hook)) {
36
-			foreach ($this->xpath->query($query) as $element) $hook->run($element);
36
+			foreach ($this->xpath->query($query) as $element) {
37
+				$hook->run($element);
38
+			}
37 39
 		}
38 40
 	}
39 41
 
40 42
 	/** Prints out the current DomDocument as HTML */
41 43
 	private function printDocument(\DomDocument $doc) {
42 44
 		$output = '';
43
-		foreach ($doc->documentElement->childNodes as $node) $output .= $doc->saveXML($node, LIBXML_NOEMPTYTAG);
45
+		foreach ($doc->documentElement->childNodes as $node) {
46
+			$output .= $doc->saveXML($node, LIBXML_NOEMPTYTAG);
47
+		}
44 48
 		return $output;
45 49
 	}
46 50
 
@@ -52,13 +56,18 @@  discard block
 block discarded – undo
52 56
 		//Generate the document by taking only the childnodes of the template, ignoring the <template> and </template> tags
53 57
 		//TODO: Is there a faster way of doing this without string manipulation on the output or this loop through childnodes?
54 58
 		 //Either return a whole DomDocument or return the output HTML
55
-		if ($document) return $this->document;
59
+		if ($document) {
60
+			return $this->document;
61
+		}
56 62
 
57 63
 
58 64
 		$output = ($this->document->doctype) ? $this->document->saveXml($this->document->doctype) . "\n" : '';
59 65
 
60
-		if ($this->document->documentElement->tagName !== 'template') $output .= $this->document->saveXml($this->document->documentElement, LIBXML_NOEMPTYTAG);
61
-		else $output = $this->printDocument($this->document);
66
+		if ($this->document->documentElement->tagName !== 'template') {
67
+			$output .= $this->document->saveXml($this->document->documentElement, LIBXML_NOEMPTYTAG);
68
+		} else {
69
+			$output = $this->printDocument($this->document);
70
+		}
62 71
 
63 72
 		//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
64 73
 		$output = str_replace(['></img>', '></br>', '></meta>', '></base>', '></link>', '></hr>', '></input>'], ' />', $output);
Please login to merge, or discard this patch.
src/Cache.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,8 @@
 block discarded – undo
20 20
 	public function load($key, $modified = 0) {
21 21
 		if (isset($this->cache[$key]) && $this->cache[$key]['timestamp'] >= $modified) {
22 22
 			return $this->cache[$key]['content'];
23
+		} else {
24
+			return false;
23 25
 		}
24
-		else return false;
25 26
 	}
26 27
 }
27 28
\ No newline at end of file
Please login to merge, or discard this patch.
src/Rule.php 1 patch
Braces   +15 added lines, -6 removed lines patch added patch discarded remove patch
@@ -35,24 +35,33 @@
 block discarded – undo
35 35
 	}
36 36
 
37 37
 	private function timeFrequency($frequency, $time = null) {
38
-		if ($time === null) $time = time();
38
+		if ($time === null) {
39
+			$time = time();
40
+		}
39 41
 		$num = (int) $frequency;
40 42
 		$unit = strtoupper(trim(str_replace($num, '', $frequency)));
41 43
 			
42 44
 		$offset = $num * constant(self::class . '::' . $unit);
43 45
 
44
-		if ($time > $this->lastRun + $offset) return true;
45
-		else return false;
46
+		if ($time > $this->lastRun + $offset) {
47
+			return true;
48
+		} else {
49
+			return false;
50
+		}
46 51
 	}
47 52
 
48 53
 	public function shouldRun($time = null) {
49 54
 		if (isset($this->properties['update-frequency']) && $this->lastRun !== 0) {
50 55
 			$frequency = $this->properties['update-frequency'];
51 56
 			$static = ['always' => true, 'never' => false];
52
-			if (isset($static[$frequency])) return $static[$frequency];
53
-			else return $this->timeFrequency($frequency, $time);
57
+			if (isset($static[$frequency])) {
58
+				return $static[$frequency];
59
+			} else {
60
+				return $this->timeFrequency($frequency, $time);
61
+			}
54 62
 
63
+		} else {
64
+			return true;
55 65
 		}
56
-		else return true;
57 66
 	}
58 67
 }
59 68
\ No newline at end of file
Please login to merge, or discard this patch.
src/Hook/Formatter.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -8,11 +8,15 @@
 block discarded – undo
8 8
 	}
9 9
 
10 10
 	public function format($value, $rules) {
11
-		if (!isset($rules['format'])) return $value;
11
+		if (!isset($rules['format'])) {
12
+			return $value;
13
+		}
12 14
 		$format = new \Transphporm\StringExtractor($rules['format']);
13 15
 		$options = explode(' ', $format);
14 16
 		$functionName = array_shift($options);
15
-		foreach ($options as &$f) $f = trim($format->rebuild($f), '"');
17
+		foreach ($options as &$f) {
18
+			$f = trim($format->rebuild($f), '"');
19
+		}
16 20
 
17 21
 		return $this->processFormat($options, $functionName, $value);		
18 22
 	}
Please login to merge, or discard this patch.
src/Parser/StringExtractor.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,9 @@
 block discarded – undo
16 16
 		$strings = [];
17 17
 		while (($pos = strpos($str, '"', $pos+1)) !== false) {
18 18
 			$end = strpos($str, '"', $pos+1);
19
-			while ($str[$end-1] == '\\') $end = strpos($str, '"', $end+1);
19
+			while ($str[$end-1] == '\\') {
20
+				$end = strpos($str, '"', $end+1);
21
+			}
20 22
 			$strings['$+STR' . ++$num] = substr($str, $pos, $end-$pos+1);
21 23
 			$str = substr_replace($str, '$+STR' . $num, $pos, $end-$pos+1);
22 24
 		}
Please login to merge, or discard this patch.
src/Parser/CssToXpath.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -51,8 +51,11 @@  discard block
 block discarded – undo
51 51
 	}
52 52
 
53 53
 	private static function compare($comparator, $a, $b) {
54
-		if ($comparator == '=') return $a == $b;
55
-		else if ($comparator == '!=') return $a != $b;
54
+		if ($comparator == '=') {
55
+			return $a == $b;
56
+		} else if ($comparator == '!=') {
57
+			return $a != $b;
58
+		}
56 59
 	}
57 60
 
58 61
 	//split the css into indivudal functions
@@ -66,8 +69,9 @@  discard block
 block discarded – undo
66 69
 				$selector = $this->createSelector();
67 70
 				$selector->type = $css[$i];
68 71
 				$selectors[] = $selector;
72
+			} else {
73
+				$selector->string .= $css[$i];
69 74
 			}
70
-			else $selector->string .= $css[$i];			
71 75
 		}
72 76
 		return $selectors;
73 77
 	}
@@ -78,7 +82,9 @@  discard block
 block discarded – undo
78 82
 		$this->depth = count($selectors);
79 83
 		$xpath = '/';
80 84
 		foreach ($selectors as $selector) {
81
-			if (isset($this->translators[$selector->type])) $xpath .= $this->translators[$selector->type]($selector->string, $xpath);
85
+			if (isset($this->translators[$selector->type])) {
86
+				$xpath .= $this->translators[$selector->type]($selector->string, $xpath);
87
+			}
82 88
 		}
83 89
 
84 90
 		$xpath = str_replace('/[', '/*[', $xpath);
Please login to merge, or discard this patch.
src/Parser/Sheet.php 1 patch
Braces   +10 added lines, -5 removed lines patch added patch discarded remove patch
@@ -33,7 +33,9 @@  discard block
 block discarded – undo
33 33
 			$rules = $this->writeRule($rules, $selector, $rule);
34 34
 		}
35 35
 		//there may be processing instructions at the end
36
-		if ($processing = $this->processingInstructions($this->tss, $pos, strlen($this->tss), count($rules)+$indexStart)) $rules = array_merge($rules, $processing['rules']);
36
+		if ($processing = $this->processingInstructions($this->tss, $pos, strlen($this->tss), count($rules)+$indexStart)) {
37
+			$rules = array_merge($rules, $processing['rules']);
38
+		}
37 39
 		usort($rules, [$this, 'sortRules']);
38 40
 		return $rules;
39 41
 	}
@@ -63,8 +65,7 @@  discard block
 block discarded – undo
63 65
 				$pos = strpos($tss, ';', $spacePos);
64 66
 				$args = substr($tss, $spacePos+1, $pos-$spacePos-1);
65 67
 				$rules = array_merge($rules, $this->$funcName($args, $indexStart));
66
-			}
67
-			else {
68
+			} else {
68 69
 				break;	
69 70
 			} 
70 71
 		}
@@ -79,7 +80,9 @@  discard block
 block discarded – undo
79 80
 
80 81
 	private function sortRules($a, $b) {
81 82
 		//If they have the same depth, compare on index
82
-		if ($a->depth === $b->depth) return $a->index < $b->index ? -1 : 1;
83
+		if ($a->depth === $b->depth) {
84
+			return $a->index < $b->index ? -1 : 1;
85
+		}
83 86
 
84 87
 		return ($a->depth < $b->depth) ? -1 : 1;
85 88
 	}
@@ -100,7 +103,9 @@  discard block
 block discarded – undo
100 103
 		$return = [];
101 104
 
102 105
 		foreach ($rules as $rule) {
103
-			if (trim($rule) === '') continue;
106
+			if (trim($rule) === '') {
107
+				continue;
108
+			}
104 109
 			$parts = explode(':', $rule, 2);
105 110
 
106 111
 			$parts[1] = $stringExtractor->rebuild($parts[1]);
Please login to merge, or discard this patch.