@@ -27,6 +27,9 @@ discard block |
||
| 27 | 27 | } |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | + /** |
|
| 31 | + * @param \DOMElement $element |
|
| 32 | + */ |
|
| 30 | 33 | private function shouldRun($element) { |
| 31 | 34 | do { |
| 32 | 35 | if (in_array($element->getAttribute('transphporm'), ['includedtemplate', 'added'])) return false; |
@@ -43,6 +46,10 @@ discard block |
||
| 43 | 46 | $this->contentPseudo[$name] = $contentPseudo; |
| 44 | 47 | } |
| 45 | 48 | |
| 49 | + /** |
|
| 50 | + * @param \DOMElement $element |
|
| 51 | + * @param \Transphporm\Hook\PseudoMatcher $pseudoMatcher |
|
| 52 | + */ |
|
| 46 | 53 | private function processPseudo($value, $element, $pseudoMatcher) { |
| 47 | 54 | foreach ($this->contentPseudo as $pseudoName => $pseudoFunction) { |
| 48 | 55 | if ($pseudoMatcher->hasFunction($pseudoName)) { |
@@ -81,6 +88,9 @@ discard block |
||
| 81 | 88 | } |
| 82 | 89 | |
| 83 | 90 | |
| 91 | + /** |
|
| 92 | + * @param \DOMElement $element |
|
| 93 | + */ |
|
| 84 | 94 | private function replaceContent($element, $content) { |
| 85 | 95 | //If this rule was cached, the elements that were added last time need to be removed prior to running the rule again. |
| 86 | 96 | if ($transphpormMode = $element->getAttribute('transphporm')) { |
@@ -115,12 +125,18 @@ discard block |
||
| 115 | 125 | } |
| 116 | 126 | } |
| 117 | 127 | |
| 128 | + /** |
|
| 129 | + * @param \DOMElement $element |
|
| 130 | + */ |
|
| 118 | 131 | private function appendContent($element, $content) { |
| 119 | 132 | foreach ($this->getNode($content, $element->ownerDocument) as $node) { |
| 120 | 133 | $element->appendChild($node); |
| 121 | 134 | } |
| 122 | 135 | } |
| 123 | 136 | |
| 137 | + /** |
|
| 138 | + * @param \DOMElement $element |
|
| 139 | + */ |
|
| 124 | 140 | private function removeAllChildren($element) { |
| 125 | 141 | while ($element->hasChildNodes()) $element->removeChild($element->firstChild); |
| 126 | 142 | } |
@@ -14,7 +14,9 @@ discard block |
||
| 14 | 14 | } |
| 15 | 15 | |
| 16 | 16 | public function run(array $values, \DomElement $element, array $rules, \Transphporm\Hook\PseudoMatcher $pseudoMatcher, array $properties = []) { |
| 17 | - if (!$this->shouldRun($element)) return false; |
|
| 17 | + if (!$this->shouldRun($element)) { |
|
| 18 | + return false; |
|
| 19 | + } |
|
| 18 | 20 | |
| 19 | 21 | $values = $this->formatter->format($values, $rules); |
| 20 | 22 | |
@@ -22,14 +24,19 @@ discard block |
||
| 22 | 24 | //Remove the current contents |
| 23 | 25 | $this->removeAllChildren($element); |
| 24 | 26 | //Now make a text node |
| 25 | - if ($this->getContentMode($rules) === 'replace') $this->replaceContent($element, $values); |
|
| 26 | - else $this->appendContent($element, $values); |
|
| 27 | + if ($this->getContentMode($rules) === 'replace') { |
|
| 28 | + $this->replaceContent($element, $values); |
|
| 29 | + } else { |
|
| 30 | + $this->appendContent($element, $values); |
|
| 31 | + } |
|
| 27 | 32 | } |
| 28 | 33 | } |
| 29 | 34 | |
| 30 | 35 | private function shouldRun($element) { |
| 31 | 36 | do { |
| 32 | - if (in_array($element->getAttribute('transphporm'), ['includedtemplate', 'added'])) return false; |
|
| 37 | + if (in_array($element->getAttribute('transphporm'), ['includedtemplate', 'added'])) { |
|
| 38 | + return false; |
|
| 39 | + } |
|
| 33 | 40 | } |
| 34 | 41 | while (($element = $element->parentNode) instanceof \DomElement); |
| 35 | 42 | return true; |
@@ -56,9 +63,10 @@ discard block |
||
| 56 | 63 | public function getNode($node, $document) { |
| 57 | 64 | foreach ($node as $n) { |
| 58 | 65 | if (is_array($n)) { |
| 59 | - foreach ($this->getNode($n, $document) as $new) yield $new; |
|
| 60 | - } |
|
| 61 | - else { |
|
| 66 | + foreach ($this->getNode($n, $document) as $new) { |
|
| 67 | + yield $new; |
|
| 68 | + } |
|
| 69 | + } else { |
|
| 62 | 70 | yield $this->convertNode($n, $document); |
| 63 | 71 | } |
| 64 | 72 | } |
@@ -69,9 +77,10 @@ discard block |
||
| 69 | 77 | $new = $document->importNode($node, true); |
| 70 | 78 | //Removing this might cause problems with caching... |
| 71 | 79 | //$new->setAttribute('transphporm', 'added'); |
| 72 | - } |
|
| 73 | - else { |
|
| 74 | - if ($node instanceof \DomText) $node = $node->nodeValue; |
|
| 80 | + } else { |
|
| 81 | + if ($node instanceof \DomText) { |
|
| 82 | + $node = $node->nodeValue; |
|
| 83 | + } |
|
| 75 | 84 | $new = $document->createElement('text'); |
| 76 | 85 | |
| 77 | 86 | $new->appendChild($document->createTextNode($node)); |
@@ -122,6 +131,8 @@ discard block |
||
| 122 | 131 | } |
| 123 | 132 | |
| 124 | 133 | private function removeAllChildren($element) { |
| 125 | - while ($element->hasChildNodes()) $element->removeChild($element->firstChild); |
|
| 134 | + while ($element->hasChildNodes()) { |
|
| 135 | + $element->removeChild($element->firstChild); |
|
| 136 | + } |
|
| 126 | 137 | } |
| 127 | 138 | } |