@@ -13,14 +13,18 @@ |
||
13 | 13 | } |
14 | 14 | |
15 | 15 | public function replaceContent($element, $content) { |
16 | - if ($element->getAttribute('transphporm') == 'added') return; |
|
16 | + if ($element->getAttribute('transphporm') == 'added') { |
|
17 | + return; |
|
18 | + } |
|
17 | 19 | //If this rule was cached, the elements that were added last time need to be removed prior to running the rule again. |
18 | 20 | if ($element->getAttribute('transphporm')) { |
19 | 21 | $this->replaceCachedContent($element); |
20 | 22 | } |
21 | 23 | |
22 | 24 | foreach ($this->content->getNode($content, $element->ownerDocument) as $node) { |
23 | - if ($node instanceof \DomElement && !$node->getAttribute('transphporm')) $node->setAttribute('transphporm', 'added'); |
|
25 | + if ($node instanceof \DomElement && !$node->getAttribute('transphporm')) { |
|
26 | + $node->setAttribute('transphporm', 'added'); |
|
27 | + } |
|
24 | 28 | $element->parentNode->insertBefore($node, $element); |
25 | 29 | } |
26 | 30 |
@@ -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 | |
@@ -25,14 +27,17 @@ discard block |
||
25 | 27 | if ($this->getContentMode($rules) === 'replace') { |
26 | 28 | $contentReplace = new ContentReplace($this); |
27 | 29 | $contentReplace->replaceContent($element, $values); |
30 | + } else { |
|
31 | + $this->appendContent($element, $values); |
|
28 | 32 | } |
29 | - else $this->appendContent($element, $values); |
|
30 | 33 | } |
31 | 34 | } |
32 | 35 | |
33 | 36 | private function shouldRun($element) { |
34 | 37 | do { |
35 | - if ($element->getAttribute('transphporm') == 'includedtemplate') return false; |
|
38 | + if ($element->getAttribute('transphporm') == 'includedtemplate') { |
|
39 | + return false; |
|
40 | + } |
|
36 | 41 | } |
37 | 42 | while (($element = $element->parentNode) instanceof \DomElement); |
38 | 43 | return true; |
@@ -59,9 +64,10 @@ discard block |
||
59 | 64 | public function getNode($node, $document) { |
60 | 65 | foreach ($node as $n) { |
61 | 66 | if (is_array($n)) { |
62 | - foreach ($this->getNode($n, $document) as $new) yield $new; |
|
63 | - } |
|
64 | - else { |
|
67 | + foreach ($this->getNode($n, $document) as $new) { |
|
68 | + yield $new; |
|
69 | + } |
|
70 | + } else { |
|
65 | 71 | yield $this->convertNode($n, $document); |
66 | 72 | } |
67 | 73 | } |
@@ -70,9 +76,10 @@ discard block |
||
70 | 76 | private function convertNode($node, $document) { |
71 | 77 | if ($node instanceof \DomElement || $node instanceof \DOMComment) { |
72 | 78 | $new = $document->importNode($node, true); |
73 | - } |
|
74 | - else { |
|
75 | - if ($node instanceof \DomText) $node = $node->nodeValue; |
|
79 | + } else { |
|
80 | + if ($node instanceof \DomText) { |
|
81 | + $node = $node->nodeValue; |
|
82 | + } |
|
76 | 83 | $new = $document->createElement('text'); |
77 | 84 | |
78 | 85 | $new->appendChild($document->createTextNode($node)); |
@@ -89,6 +96,8 @@ discard block |
||
89 | 96 | } |
90 | 97 | |
91 | 98 | private function removeAllChildren($element) { |
92 | - while ($element->hasChildNodes()) $element->removeChild($element->firstChild); |
|
99 | + while ($element->hasChildNodes()) { |
|
100 | + $element->removeChild($element->firstChild); |
|
101 | + } |
|
93 | 102 | } |
94 | 103 | } |
95 | 104 | \ No newline at end of file |