@@ -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 |
@@ -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 |
@@ -9,9 +9,13 @@ |
||
| 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 | } |
| 18 | 22 | \ No newline at end of file |
@@ -20,11 +20,15 @@ discard block |
||
| 20 | 20 | |
| 21 | 21 | public function run(\DomElement $element) { |
| 22 | 22 | //Don't run if there's a pseudo element like nth-child() and this element doesn't match it |
| 23 | - if (!$this->pseudoMatcher->matches($element)) return; |
|
| 23 | + if (!$this->pseudoMatcher->matches($element)) { |
|
| 24 | + return; |
|
| 25 | + } |
|
| 24 | 26 | |
| 25 | 27 | foreach ($this->rules as $name => $value) { |
| 26 | 28 | $result = $this->callProperty($name, $element, $this->valueParser->parse(trim($value), $element)); |
| 27 | - if ($result === false) break; |
|
| 29 | + if ($result === false) { |
|
| 30 | + break; |
|
| 31 | + } |
|
| 28 | 32 | } |
| 29 | 33 | } |
| 30 | 34 | |
@@ -45,7 +49,9 @@ discard block |
||
| 45 | 49 | } |
| 46 | 50 | |
| 47 | 51 | private function callProperty($name, $element, $value) { |
| 48 | - if (isset($this->properties[$name])) return $this->properties[$name]->run($value, $element, $this->rules, $this->pseudoMatcher, $this->properties); |
|
| 52 | + if (isset($this->properties[$name])) { |
|
| 53 | + return $this->properties[$name]->run($value, $element, $this->rules, $this->pseudoMatcher, $this->properties); |
|
| 54 | + } |
|
| 49 | 55 | return false; |
| 50 | 56 | } |
| 51 | 57 | } |
@@ -13,9 +13,13 @@ |
||
| 13 | 13 | } |
| 14 | 14 | |
| 15 | 15 | private function getLocale() { |
| 16 | - if (is_array($this->locale)) return $this->locale; |
|
| 17 | - 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); |
|
| 18 | - else return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . 'enGB.json'), true); |
|
| 16 | + if (is_array($this->locale)) { |
|
| 17 | + return $this->locale; |
|
| 18 | + } else if (strlen($this->locale) > 0) { |
|
| 19 | + return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . $this->locale . '.json'), true); |
|
| 20 | + } else { |
|
| 21 | + return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . 'enGB.json'), true); |
|
| 22 | + } |
|
| 19 | 23 | } |
| 20 | 24 | |
| 21 | 25 | public function load(\Transphporm\FeatureSet $featureSet) { |
@@ -30,7 +30,9 @@ discard block |
||
| 30 | 30 | $newTemplate = new \Transphporm\Builder($this->baseDir . $args[0], $tss ? $this->baseDir . $tss : null); |
| 31 | 31 | |
| 32 | 32 | $doc = $newTemplate->output($this->elementData->getData($element), true)->body; |
| 33 | - if ($selector != '') return $this->templateSubsection($doc, $selector); |
|
| 33 | + if ($selector != '') { |
|
| 34 | + return $this->templateSubsection($doc, $selector); |
|
| 35 | + } |
|
| 34 | 36 | |
| 35 | 37 | return $this->getTemplateContent($doc, $tss); |
| 36 | 38 | |
@@ -60,7 +62,9 @@ discard block |
||
| 60 | 62 | |
| 61 | 63 | private function getClonedElement($node, $tss) { |
| 62 | 64 | $clone = $node->cloneNode(true); |
| 63 | - if ($tss != null && $clone instanceof \DomElement) $clone->setAttribute('transphporm', 'includedtemplate'); |
|
| 65 | + if ($tss != null && $clone instanceof \DomElement) { |
|
| 66 | + $clone->setAttribute('transphporm', 'includedtemplate'); |
|
| 67 | + } |
|
| 64 | 68 | return $clone; |
| 65 | 69 | } |
| 66 | 70 | } |
@@ -31,7 +31,9 @@ |
||
| 31 | 31 | /** Returns the data that has been bound to $element, or, if no data is bound to $element climb the DOM tree to find the data bound to a parent node*/ |
| 32 | 32 | public function getData(\DomElement $element = null, $type = 'data') { |
| 33 | 33 | while ($element) { |
| 34 | - if (isset($this->elementMap[$element]) && isset($this->elementMap[$element][$type])) return $this->elementMap[$element][$type]; |
|
| 34 | + if (isset($this->elementMap[$element]) && isset($this->elementMap[$element][$type])) { |
|
| 35 | + return $this->elementMap[$element][$type]; |
|
| 36 | + } |
|
| 35 | 37 | $element = $element->parentNode; |
| 36 | 38 | } |
| 37 | 39 | return $this->data; |