@@ -37,8 +37,9 @@ discard block |
||
| 37 | 37 | $selector = $this->createSelector(); |
| 38 | 38 | $selector->type = $css[$i]; |
| 39 | 39 | $selectors[] = $selector; |
| 40 | + } else { |
|
| 41 | + $selector->string .= $css[$i]; |
|
| 40 | 42 | } |
| 41 | - else $selector->string .= $css[$i]; |
|
| 42 | 43 | } |
| 43 | 44 | return $selectors; |
| 44 | 45 | } |
@@ -49,7 +50,9 @@ discard block |
||
| 49 | 50 | $this->depth = count($selectors); |
| 50 | 51 | $xpath = '/'; |
| 51 | 52 | foreach ($selectors as $selector) { |
| 52 | - if (isset($this->translators[$selector->type])) $xpath .= $this->translators[$selector->type]($selector->string); |
|
| 53 | + if (isset($this->translators[$selector->type])) { |
|
| 54 | + $xpath .= $this->translators[$selector->type]($selector->string); |
|
| 55 | + } |
|
| 53 | 56 | } |
| 54 | 57 | |
| 55 | 58 | $xpath = str_replace('/[', '/*[', $xpath); |
@@ -44,8 +44,11 @@ discard block |
||
| 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 |
||
| 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 */ |
@@ -13,7 +13,10 @@ |
||
| 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 |
@@ -22,12 +22,16 @@ discard block |
||
| 22 | 22 | |
| 23 | 23 | private function attribute($pseudo, $element) { |
| 24 | 24 | $pos = strpos($pseudo, '['); |
| 25 | - if ($pos === false) return true; |
|
| 25 | + if ($pos === false) { |
|
| 26 | + return true; |
|
| 27 | + } |
|
| 26 | 28 | $end = strpos($pseudo, ']', $pos); |
| 27 | 29 | |
| 28 | 30 | $name = substr($pseudo, 0, $pos); |
| 29 | 31 | |
| 30 | - if (strpos($pseudo, '=') === false) return true; |
|
| 32 | + if (strpos($pseudo, '=') === false) { |
|
| 33 | + return true; |
|
| 34 | + } |
|
| 31 | 35 | |
| 32 | 36 | $criteria = substr($pseudo, $pos+1, $end-$pos-1); |
| 33 | 37 | list ($field, $value) = explode('=', $criteria); |
@@ -42,16 +46,21 @@ discard block |
||
| 42 | 46 | } |
| 43 | 47 | |
| 44 | 48 | private function parseValue($value) { |
| 45 | - if ($value == 'true') return true; |
|
| 46 | - else if ($value == 'false') return false; |
|
| 47 | - else return $value; |
|
| 49 | + if ($value == 'true') { |
|
| 50 | + return true; |
|
| 51 | + } else if ($value == 'false') { |
|
| 52 | + return false; |
|
| 53 | + } else { |
|
| 54 | + return $value; |
|
| 55 | + } |
|
| 48 | 56 | } |
| 49 | 57 | |
| 50 | 58 | private function getOperator($field) { |
| 51 | 59 | if ($field[strlen($field)-1] == '!') { |
| 52 | 60 | return '!'; |
| 61 | + } else { |
|
| 62 | + return ''; |
|
| 53 | 63 | } |
| 54 | - else return ''; |
|
| 55 | 64 | } |
| 56 | 65 | |
| 57 | 66 | private function nth($pseudo, $element) { |
@@ -59,8 +68,11 @@ discard block |
||
| 59 | 68 | $criteria = $this->getBetween($pseudo, '(', ')'); |
| 60 | 69 | $num = $this->getBetween($element->getNodePath(), '[', ']'); |
| 61 | 70 | |
| 62 | - if (is_callable([$this, $criteria])) return $this->$criteria($num); |
|
| 63 | - else return $num == $criteria; |
|
| 71 | + if (is_callable([$this, $criteria])) { |
|
| 72 | + return $this->$criteria($num); |
|
| 73 | + } else { |
|
| 74 | + return $num == $criteria; |
|
| 75 | + } |
|
| 64 | 76 | |
| 65 | 77 | } |
| 66 | 78 | return true; |
@@ -80,7 +92,9 @@ discard block |
||
| 80 | 92 | public function header($element) { |
| 81 | 93 | if ($this->matches($element)) { |
| 82 | 94 | foreach ($this->pseudo as $pseudo) { |
| 83 | - if (strpos($pseudo, 'header') === 0) return $this->getBetween($pseudo, '[', ']'); |
|
| 95 | + if (strpos($pseudo, 'header') === 0) { |
|
| 96 | + return $this->getBetween($pseudo, '[', ']'); |
|
| 97 | + } |
|
| 84 | 98 | } |
| 85 | 99 | } |
| 86 | 100 | } |
@@ -95,7 +109,9 @@ discard block |
||
| 95 | 109 | |
| 96 | 110 | private function getBetween($string, $start, $end) { |
| 97 | 111 | $open = strpos($string, $start); |
| 98 | - if ($open === false) return false; |
|
| 112 | + if ($open === false) { |
|
| 113 | + return false; |
|
| 114 | + } |
|
| 99 | 115 | $close = strpos($string, $end, $open); |
| 100 | 116 | return substr($string, $open+1, $close-$open-1); |
| 101 | 117 | } |
@@ -16,7 +16,9 @@ |
||
| 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 | } |
@@ -33,14 +33,18 @@ discard block |
||
| 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 |
||
| 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); |
@@ -20,7 +20,8 @@ |
||
| 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 |
@@ -31,7 +31,9 @@ discard block |
||
| 31 | 31 | $rules = $this->writeRule($rules, $selector, $rule); |
| 32 | 32 | } |
| 33 | 33 | //there may be processing instructions at the end |
| 34 | - if ($processing = $this->processingInstructions($this->tss, $pos, strlen($this->tss))) $rules = array_merge($processing['rules'], $rules); |
|
| 34 | + if ($processing = $this->processingInstructions($this->tss, $pos, strlen($this->tss))) { |
|
| 35 | + $rules = array_merge($processing['rules'], $rules); |
|
| 36 | + } |
|
| 35 | 37 | usort($rules, [$this, 'sortRules']); |
| 36 | 38 | return $rules; |
| 37 | 39 | } |
@@ -43,7 +45,9 @@ discard block |
||
| 43 | 45 | } |
| 44 | 46 | |
| 45 | 47 | private function writeRule($rules, $selector, $newRule) { |
| 46 | - if (isset($rules[$selector])) $newRule->properties = array_merge($rules[$selector], $newRule->properties); |
|
| 48 | + if (isset($rules[$selector])) { |
|
| 49 | + $newRule->properties = array_merge($rules[$selector], $newRule->properties); |
|
| 50 | + } |
|
| 47 | 51 | $rules[$selector] = $newRule; |
| 48 | 52 | |
| 49 | 53 | return $rules; |
@@ -58,8 +62,7 @@ discard block |
||
| 58 | 62 | $pos = strpos($tss, ';', $spacePos); |
| 59 | 63 | $args = substr($tss, $spacePos+1, $pos-$spacePos-1); |
| 60 | 64 | $rules = array_merge($rules, $this->$funcName($args)); |
| 61 | - } |
|
| 62 | - else { |
|
| 65 | + } else { |
|
| 63 | 66 | break; |
| 64 | 67 | } |
| 65 | 68 | } |
@@ -74,7 +77,9 @@ discard block |
||
| 74 | 77 | |
| 75 | 78 | private function sortRules($a, $b) { |
| 76 | 79 | //If they have the same depth, compare on index |
| 77 | - if ($a->depth === $b->depth) return $a->index < $b->index ? -1 : 1; |
|
| 80 | + if ($a->depth === $b->depth) { |
|
| 81 | + return $a->index < $b->index ? -1 : 1; |
|
| 82 | + } |
|
| 78 | 83 | |
| 79 | 84 | return ($a->depth < $b->depth) ? -1 : 1; |
| 80 | 85 | } |
@@ -95,7 +100,9 @@ discard block |
||
| 95 | 100 | $return = []; |
| 96 | 101 | |
| 97 | 102 | foreach ($rules as $rule) { |
| 98 | - if (trim($rule) === '') continue; |
|
| 103 | + if (trim($rule) === '') { |
|
| 104 | + continue; |
|
| 105 | + } |
|
| 99 | 106 | $parts = explode(':', $rule, 2); |
| 100 | 107 | |
| 101 | 108 | $parts[1] = $stringExtractor->rebuild($parts[1]); |
@@ -35,24 +35,33 @@ |
||
| 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 |