@@ -14,7 +14,9 @@ discard block |
||
| 14 | 14 | } |
| 15 | 15 | |
| 16 | 16 | public function format($value, $rules) { |
| 17 | - if (!isset($rules['format'])) return $value; |
|
| 17 | + if (!isset($rules['format'])) { |
|
| 18 | + return $value; |
|
| 19 | + } |
|
| 18 | 20 | $tokens = $rules['format']; |
| 19 | 21 | |
| 20 | 22 | $functionName = $tokens->from(\Transphporm\Parser\Tokenizer::NAME, true)->read(); |
@@ -27,15 +29,16 @@ discard block |
||
| 27 | 29 | |
| 28 | 30 | try { |
| 29 | 31 | return $this->processFormat($options, $functionName, $value); |
| 30 | - } |
|
| 31 | - catch (\Exception $e) { |
|
| 32 | + } catch (\Exception $e) { |
|
| 32 | 33 | throw new \Transphporm\RunException(\Transphporm\Exception::FORMATTER, $functionName, $e); |
| 33 | 34 | } |
| 34 | 35 | } |
| 35 | 36 | |
| 36 | 37 | //TODO: Abstract all error reporting externally with a method for turning it on/off |
| 37 | 38 | private function assert($condition, $error) { |
| 38 | - if (!$condition) throw new \Exception($error); |
|
| 39 | + if (!$condition) { |
|
| 40 | + throw new \Exception($error); |
|
| 41 | + } |
|
| 39 | 42 | } |
| 40 | 43 | |
| 41 | 44 | private function processFormat($format, $functionName, $value) { |
@@ -66,7 +66,9 @@ discard block |
||
| 66 | 66 | /** Loops through all assigned hooks, runs the Xpath query and calls the hook */ |
| 67 | 67 | private function processHooks() { |
| 68 | 68 | foreach ($this->hooks as list($query, $hook)) { |
| 69 | - foreach ($this->xpath->query($query) as $element) $hook->run($element); |
|
| 69 | + foreach ($this->xpath->query($query) as $element) { |
|
| 70 | + $hook->run($element); |
|
| 71 | + } |
|
| 70 | 72 | } |
| 71 | 73 | $this->hooks = []; |
| 72 | 74 | } |
@@ -74,7 +76,9 @@ discard block |
||
| 74 | 76 | /** Prints out the current DomDocument as HTML */ |
| 75 | 77 | private function printDocument() { |
| 76 | 78 | $output = ''; |
| 77 | - foreach ($this->document->documentElement->childNodes as $node) $output .= call_user_func($this->save, $node); |
|
| 79 | + foreach ($this->document->documentElement->childNodes as $node) { |
|
| 80 | + $output .= call_user_func($this->save, $node); |
|
| 81 | + } |
|
| 78 | 82 | return $output; |
| 79 | 83 | } |
| 80 | 84 | |
@@ -86,12 +90,17 @@ discard block |
||
| 86 | 90 | //Generate the document by taking only the childnodes of the template, ignoring the <template> and </template> tags |
| 87 | 91 | //TODO: Is there a faster way of doing this without string manipulation on the output or this loop through childnodes? |
| 88 | 92 | //Either return a whole DomDocument or return the output HTML |
| 89 | - if ($document) return $this->document; |
|
| 93 | + if ($document) { |
|
| 94 | + return $this->document; |
|
| 95 | + } |
|
| 90 | 96 | |
| 91 | 97 | $output = ($this->document->doctype) ? call_user_func($this->save, $this->document->doctype) . "\n" : ''; |
| 92 | 98 | |
| 93 | - if ($this->document->documentElement->tagName !== 'template') $output .= call_user_func($this->save, $this->document->documentElement); |
|
| 94 | - else $output = $this->printDocument(); |
|
| 99 | + if ($this->document->documentElement->tagName !== 'template') { |
|
| 100 | + $output .= call_user_func($this->save, $this->document->documentElement); |
|
| 101 | + } else { |
|
| 102 | + $output = $this->printDocument(); |
|
| 103 | + } |
|
| 95 | 104 | |
| 96 | 105 | //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 |
| 97 | 106 | $output = str_replace(['></img>', '></br>', '></meta>', '></base>', '></link>', '></hr>', '></input>'], ' />', $output); |