@@ -7,6 +7,9 @@ |
||
| 7 | 7 | $this->templateFunction = $templateFunction; |
| 8 | 8 | } |
| 9 | 9 | |
| 10 | + /** |
|
| 11 | + * @param string $val |
|
| 12 | + */ |
|
| 10 | 13 | public function html($val) { |
| 11 | 14 | return $this->templateFunction->run(['<template>' . $val . '</template>']); |
| 12 | 15 | } |
@@ -1,13 +1,13 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace Transphporm\Formatter; |
| 3 | 3 | class HTMLFormatter { |
| 4 | - private $templateFunction; |
|
| 4 | + private $templateFunction; |
|
| 5 | 5 | |
| 6 | - public function __construct(\Transphporm\TSSFunction\Template $templateFunction) { |
|
| 7 | - $this->templateFunction = $templateFunction; |
|
| 8 | - } |
|
| 6 | + public function __construct(\Transphporm\TSSFunction\Template $templateFunction) { |
|
| 7 | + $this->templateFunction = $templateFunction; |
|
| 8 | + } |
|
| 9 | 9 | |
| 10 | - public function html($val) { |
|
| 10 | + public function html($val) { |
|
| 11 | 11 | return $this->templateFunction->run(['<template>' . $val . '</template>']); |
| 12 | 12 | } |
| 13 | 13 | |
@@ -8,12 +8,12 @@ |
||
| 8 | 8 | } |
| 9 | 9 | |
| 10 | 10 | public function html($val) { |
| 11 | - return $this->templateFunction->run(['<template>' . $val . '</template>']); |
|
| 11 | + return $this->templateFunction->run(['<template>'.$val.'</template>']); |
|
| 12 | 12 | } |
| 13 | 13 | |
| 14 | 14 | public function debug($val) { |
| 15 | 15 | ob_start(); |
| 16 | 16 | var_dump($val); |
| 17 | - return $this->html('<pre>' . ob_get_clean() . '</pre>'); |
|
| 17 | + return $this->html('<pre>'.ob_get_clean().'</pre>'); |
|
| 18 | 18 | } |
| 19 | 19 | } |
@@ -28,6 +28,9 @@ discard block |
||
| 28 | 28 | } |
| 29 | 29 | } |
| 30 | 30 | |
| 31 | + /** |
|
| 32 | + * @param \DOMElement $element |
|
| 33 | + */ |
|
| 31 | 34 | private function shouldRun($element) { |
| 32 | 35 | do { |
| 33 | 36 | if ($element->getAttribute('transphporm') == 'includedtemplate') return false; |
@@ -40,6 +43,10 @@ discard block |
||
| 40 | 43 | return (isset($rules['content-mode'])) ? $rules['content-mode']->read() : 'append'; |
| 41 | 44 | } |
| 42 | 45 | |
| 46 | + /** |
|
| 47 | + * @param \DOMElement $element |
|
| 48 | + * @param \Transphporm\Hook\PseudoMatcher $pseudoMatcher |
|
| 49 | + */ |
|
| 43 | 50 | private function processPseudo($value, $element, $pseudoMatcher) { |
| 44 | 51 | $pseudoContent = ['attr', 'header', 'before', 'after']; |
| 45 | 52 | foreach ($pseudoContent as $pseudo) { |
@@ -101,6 +108,9 @@ discard block |
||
| 101 | 108 | } |
| 102 | 109 | } |
| 103 | 110 | |
| 111 | + /** |
|
| 112 | + * @param \DOMElement $element |
|
| 113 | + */ |
|
| 104 | 114 | private function replaceContent($element, $content) { |
| 105 | 115 | //If this rule was cached, the elements that were added last time need to be removed prior to running the rule again. |
| 106 | 116 | foreach ($this->getNode($content, $element->ownerDocument) as $node) { |
@@ -109,12 +119,18 @@ discard block |
||
| 109 | 119 | $element->setAttribute('transphporm', 'remove'); |
| 110 | 120 | } |
| 111 | 121 | |
| 122 | + /** |
|
| 123 | + * @param \DOMElement $element |
|
| 124 | + */ |
|
| 112 | 125 | private function appendContent($element, $content) { |
| 113 | 126 | foreach ($this->getNode($content, $element->ownerDocument) as $node) { |
| 114 | 127 | $element->appendChild($node); |
| 115 | 128 | } |
| 116 | 129 | } |
| 117 | 130 | |
| 131 | + /** |
|
| 132 | + * @param \DOMElement $element |
|
| 133 | + */ |
|
| 118 | 134 | private function removeAllChildren($element) { |
| 119 | 135 | while ($element->hasChildNodes()) $element->removeChild($element->firstChild); |
| 120 | 136 | } |
@@ -15,7 +15,9 @@ discard block |
||
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | public function run(array $values, \DomElement $element, array $rules, \Transphporm\Hook\PseudoMatcher $pseudoMatcher, array $properties = []) { |
| 18 | - if (!$this->shouldRun($element)) return false; |
|
| 18 | + if (!$this->shouldRun($element)) { |
|
| 19 | + return false; |
|
| 20 | + } |
|
| 19 | 21 | |
| 20 | 22 | $values = $this->formatter->format($values, $rules); |
| 21 | 23 | |
@@ -23,14 +25,19 @@ discard block |
||
| 23 | 25 | //Remove the current contents |
| 24 | 26 | $this->removeAllChildren($element); |
| 25 | 27 | //Now make a text node |
| 26 | - if ($this->getContentMode($rules) === 'replace') $this->replaceContent($element, $values); |
|
| 27 | - else $this->appendContent($element, $values); |
|
| 28 | + if ($this->getContentMode($rules) === 'replace') { |
|
| 29 | + $this->replaceContent($element, $values); |
|
| 30 | + } else { |
|
| 31 | + $this->appendContent($element, $values); |
|
| 32 | + } |
|
| 28 | 33 | } |
| 29 | 34 | } |
| 30 | 35 | |
| 31 | 36 | private function shouldRun($element) { |
| 32 | 37 | do { |
| 33 | - if ($element->getAttribute('transphporm') == 'includedtemplate') return false; |
|
| 38 | + if ($element->getAttribute('transphporm') == 'includedtemplate') { |
|
| 39 | + return false; |
|
| 40 | + } |
|
| 34 | 41 | } |
| 35 | 42 | while (($element = $element->parentNode) instanceof \DomElement); |
| 36 | 43 | return true; |
@@ -54,9 +61,10 @@ discard block |
||
| 54 | 61 | private function getNode($node, $document) { |
| 55 | 62 | foreach ($node as $n) { |
| 56 | 63 | if (is_array($n)) { |
| 57 | - foreach ($this->getNode($n, $document) as $new) yield $new; |
|
| 58 | - } |
|
| 59 | - else { |
|
| 64 | + foreach ($this->getNode($n, $document) as $new) { |
|
| 65 | + yield $new; |
|
| 66 | + } |
|
| 67 | + } else { |
|
| 60 | 68 | yield $this->convertNode($n, $document); |
| 61 | 69 | } |
| 62 | 70 | } |
@@ -67,9 +75,10 @@ discard block |
||
| 67 | 75 | $new = $document->importNode($node, true); |
| 68 | 76 | //Removing this might cause problems with caching... |
| 69 | 77 | //$new->setAttribute('transphporm', 'added'); |
| 70 | - } |
|
| 71 | - else { |
|
| 72 | - if ($node instanceof \DomText) $node = $node->nodeValue; |
|
| 78 | + } else { |
|
| 79 | + if ($node instanceof \DomText) { |
|
| 80 | + $node = $node->nodeValue; |
|
| 81 | + } |
|
| 73 | 82 | $new = $document->createElement('text'); |
| 74 | 83 | |
| 75 | 84 | $new->appendChild($document->createTextNode($node)); |
@@ -116,6 +125,8 @@ discard block |
||
| 116 | 125 | } |
| 117 | 126 | |
| 118 | 127 | private function removeAllChildren($element) { |
| 119 | - while ($element->hasChildNodes()) $element->removeChild($element->firstChild); |
|
| 128 | + while ($element->hasChildNodes()) { |
|
| 129 | + $element->removeChild($element->firstChild); |
|
| 130 | + } |
|
| 120 | 131 | } |
| 121 | 132 | } |
@@ -54,7 +54,9 @@ discard block |
||
| 54 | 54 | $this->last = null; |
| 55 | 55 | $this->traversing = false; |
| 56 | 56 | |
| 57 | - if (count($tokens) <= 0) return [$data]; |
|
| 57 | + if (count($tokens) <= 0) { |
|
| 58 | + return [$data]; |
|
| 59 | + } |
|
| 58 | 60 | |
| 59 | 61 | foreach (new TokenFilterIterator($tokens, [Tokenizer::WHITESPACE, Tokenizer::NEW_LINE]) as $token) { |
| 60 | 62 | $this->{$this->tokenFuncs[$token['type']]}($token); |
@@ -76,16 +78,16 @@ discard block |
||
| 76 | 78 | //Reads the last selected value from $data regardless if it's an array or object and overrides $this->data with the new value |
| 77 | 79 | //Dot moves $data to the next object in $data foo.bar moves the $data pointer from `foo` to `bar` |
| 78 | 80 | private function processDot($token) { |
| 79 | - if ($this->last !== null) $this->data->traverse($this->last); |
|
| 80 | - else { |
|
| 81 | + if ($this->last !== null) { |
|
| 82 | + $this->data->traverse($this->last); |
|
| 83 | + } else { |
|
| 81 | 84 | //When . is not preceeded by anything, treat it as part of the string instead of an operator |
| 82 | 85 | // foo.bar is treated as looking up `bar` in `foo` whereas .foo is treated as the string ".foo" |
| 83 | 86 | $lastResult = $this->result->pop(); |
| 84 | 87 | if ($lastResult) { |
| 85 | 88 | $this->data = new ValueData($lastResult); |
| 86 | 89 | $this->traversing = true; |
| 87 | - } |
|
| 88 | - else { |
|
| 90 | + } else { |
|
| 89 | 91 | $this->processString(['value' => '.']); |
| 90 | 92 | $this->result->setMode(Tokenizer::CONCAT); |
| 91 | 93 | } |
@@ -98,15 +100,19 @@ discard block |
||
| 98 | 100 | $parser = new Value($this->baseData, $this->autoLookup); |
| 99 | 101 | if ($this->baseData instanceof \Transphporm\Functionset && $this->baseData->hasFunction($this->last)) { |
| 100 | 102 | $this->callTransphpormFunctions($token); |
| 101 | - } |
|
| 102 | - else { |
|
| 103 | - if ($this->last !== null) $this->data->traverse($this->last); |
|
| 104 | - else { |
|
| 103 | + } else { |
|
| 104 | + if ($this->last !== null) { |
|
| 105 | + $this->data->traverse($this->last); |
|
| 106 | + } else { |
|
| 105 | 107 | $lastResult = $this->result->pop(); |
| 106 | - if ($lastResult) $this->data = new ValueData($lastResult); |
|
| 108 | + if ($lastResult) { |
|
| 109 | + $this->data = new ValueData($lastResult); |
|
| 110 | + } |
|
| 107 | 111 | } |
| 108 | 112 | $this->last = $parser->parseTokens($token['value'], null)[0]; |
| 109 | - if (!is_bool($this->last)) $this->traversing = true; |
|
| 113 | + if (!is_bool($this->last)) { |
|
| 114 | + $this->traversing = true; |
|
| 115 | + } |
|
| 110 | 116 | } |
| 111 | 117 | } |
| 112 | 118 | |
@@ -126,8 +132,7 @@ discard block |
||
| 126 | 132 | if ($this->baseData instanceof \Transphporm\Functionset && $this->baseData->hasFunction($this->last) |
| 127 | 133 | && !$this->data->methodExists($this->last)) { |
| 128 | 134 | $this->callTransphpormFunctions($token); |
| 129 | - } |
|
| 130 | - else { |
|
| 135 | + } else { |
|
| 131 | 136 | $this->processNested($token); |
| 132 | 137 | } |
| 133 | 138 | } |
@@ -144,7 +149,9 @@ discard block |
||
| 144 | 149 | foreach ($this->result->getResult() as $i => $value) { |
| 145 | 150 | if (is_scalar($value)) { |
| 146 | 151 | $val = $this->data->read($value); |
| 147 | - if ($val) $this->result[$i] = $val; |
|
| 152 | + if ($val) { |
|
| 153 | + $this->result[$i] = $val; |
|
| 154 | + } |
|
| 148 | 155 | } |
| 149 | 156 | } |
| 150 | 157 | $this->last = null; |
@@ -156,12 +163,10 @@ discard block |
||
| 156 | 163 | try { |
| 157 | 164 | $value = $this->data->extract($this->last, $this->autoLookup, $this->traversing); |
| 158 | 165 | $this->result->processValue($value); |
| 159 | - } |
|
| 160 | - catch (\UnexpectedValueException $e) { |
|
| 166 | + } catch (\UnexpectedValueException $e) { |
|
| 161 | 167 | if (!($this->autoLookup || $this->traversing)) { |
| 162 | 168 | $this->result->processValue($this->last); |
| 163 | - } |
|
| 164 | - else { |
|
| 169 | + } else { |
|
| 165 | 170 | $this->result->clear(); |
| 166 | 171 | $this->result[0] = false; |
| 167 | 172 | } |
@@ -15,8 +15,8 @@ |
||
| 15 | 15 | |
| 16 | 16 | private function getLocale() { |
| 17 | 17 | if (is_array($this->locale)) return $this->locale; |
| 18 | - 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); |
|
| 19 | - else return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . 'enGB.json'), true); |
|
| 18 | + 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); |
|
| 19 | + else return json_decode(file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'../Formatter'.DIRECTORY_SEPARATOR.'Locale'.DIRECTORY_SEPARATOR.'enGB.json'), true); |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | public function load(\Transphporm\Config $config) { |
@@ -14,9 +14,13 @@ |
||
| 14 | 14 | } |
| 15 | 15 | |
| 16 | 16 | private function getLocale() { |
| 17 | - if (is_array($this->locale)) return $this->locale; |
|
| 18 | - 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); |
|
| 19 | - else return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . 'enGB.json'), true); |
|
| 17 | + if (is_array($this->locale)) { |
|
| 18 | + return $this->locale; |
|
| 19 | + } else if (strlen($this->locale) > 0) { |
|
| 20 | + return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . $this->locale . '.json'), true); |
|
| 21 | + } else { |
|
| 22 | + return json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '../Formatter' . DIRECTORY_SEPARATOR . 'Locale' . DIRECTORY_SEPARATOR . 'enGB.json'), true); |
|
| 23 | + } |
|
| 20 | 24 | } |
| 21 | 25 | |
| 22 | 26 | public function load(\Transphporm\Config $config) { |
@@ -7,7 +7,9 @@ |
||
| 7 | 7 | namespace Transphporm\Pseudo; |
| 8 | 8 | class Attribute implements \Transphporm\Pseudo { |
| 9 | 9 | public function match($name, $args, \DomElement $element) { |
| 10 | - if (!($name === null || in_array($name, ['data', 'iteration', 'root']))) return true; |
|
| 10 | + if (!($name === null || in_array($name, ['data', 'iteration', 'root']))) { |
|
| 11 | + return true; |
|
| 12 | + } |
|
| 11 | 13 | return $args[0]; |
| 12 | 14 | } |
| 13 | 15 | } |
@@ -21,7 +21,8 @@ |
||
| 21 | 21 | $key = md5($key); |
| 22 | 22 | if (isset($this->cache[$key]) && $this->cache[$key]['timestamp'] >= $modified) { |
| 23 | 23 | return $this->cache[$key]['content']; |
| 24 | + } else { |
|
| 25 | + return false; |
|
| 24 | 26 | } |
| 25 | - else return false; |
|
| 26 | 27 | } |
| 27 | 28 | } |
| 28 | 29 | \ No newline at end of file |