Bugfix Adding class crippled HTML in selfclosing tags

Bugfix Adding class crippled HTML in self-closing tags

Author: SavageTiger

lib/Caxy/HtmlDiff/HtmlDiff.php

@@ -534,7 +534,7 @@ protected function findIsolatedDiffTagsInOld($operation, $posInNew)
     protected function insertTag($tag, $cssClass, &$words)
     {
         while (true) {
-            if (count($words) == 0) {
+            if (count($words) === 0) {
                 break;
             }
 
@@ -556,13 +556,13 @@ protected function insertTag($tag, $cssClass, &$words)
                 }
                 if ($firstOrDefault) {
                     $specialCaseTagInjection = '<ins class="mod">';
-                    if ($tag == 'del') {
+                    if ($tag === 'del') {
                         unset($words[ 0 ]);
                     }
                 } elseif (array_search($words[ 0 ], $this->config->getSpecialCaseClosingTags()) !== false) {
                     $specialCaseTagInjection = '</ins>';
                     $specialCaseTagInjectionIsBefore = true;
-                    if ($tag == 'del') {
+                    if ($tag === 'del') {
                         unset($words[ 0 ]);
                     }
                 }
@@ -571,22 +571,34 @@ protected function insertTag($tag, $cssClass, &$words)
                 break;
             }
             if ($specialCaseTagInjectionIsBefore) {
-                $this->content .= $specialCaseTagInjection.implode('', $this->extractConsecutiveWords($words, 'tag'));
+                $this->content .= $specialCaseTagInjection . implode('', $this->extractConsecutiveWords($words, 'tag'));
             } else {
                 $workTag = $this->extractConsecutiveWords($words, 'tag');
-                if (isset($workTag[ 0 ]) && $this->isOpeningTag($workTag[ 0 ]) && !$this->isClosingTag($workTag[ 0 ])) {
-                    if ($this->stringUtil->strpos($workTag[ 0 ], 'class=')) {
-                        $workTag[ 0 ] = str_replace('class="', 'class="diffmod ', $workTag[ 0 ]);
-                        $workTag[ 0 ] = str_replace("class='", 'class="diffmod ', $workTag[ 0 ]);
+
+                if (
+                    isset($workTag[0]) === true &&
+                    $this->isOpeningTag($workTag[0]) === true &&
+                    $this->isClosingTag($workTag[0]) === false
+                ) {
+                    if ($this->stringUtil->strpos($workTag[0], 'class=')) {
+                        $workTag[0] = str_replace('class="', 'class="diffmod ', $workTag[0]);
                     } else {
-                        $workTag[ 0 ] = str_replace('>', ' class="diffmod">', $workTag[ 0 ]);
+                        $isSelfClosing = $this->stringUtil->strpos($workTag[0], '/>') !== false;
+
+                        if ($isSelfClosing === true) {
+                            $workTag[0] = str_replace('/>', ' class="diffmod" />', $workTag[0]);
+                        } else {
+                            $workTag[0] = str_replace('>', ' class="diffmod">', $workTag[0]);
+                        }
                     }
                 }
 
-                $appendContent = implode('', $workTag).$specialCaseTagInjection;
-                if (isset($workTag[0]) && false !== $this->stringUtil->stripos($workTag[0], '<img')) {
+                $appendContent = implode('', $workTag) . $specialCaseTagInjection;
+
+                if (isset($workTag[0]) === true && $this->stringUtil->stripos($workTag[0], '<img') !== false) {
                     $appendContent = $this->wrapText($appendContent, $tag, $cssClass);
                 }
+
                 $this->content .= $appendContent;
             }
         }
@@ -666,24 +678,14 @@ protected function isTag($item)
         return $this->isOpeningTag($item) || $this->isClosingTag($item);
     }
 
-    /**
-     * @param string $item
-     *
-     * @return bool
-     */
-    protected function isOpeningTag($item)
+    protected function isOpeningTag($item) : bool
     {
-        return preg_match('#<[^>]+>\\s*#iUu', $item);
+        return preg_match('#<[^>]+>\\s*#iUu', $item) === 1;
     }
 
-    /**
-     * @param string $item
-     *
-     * @return bool
-     */
-    protected function isClosingTag($item)
+    protected function isClosingTag($item) : bool
     {
-        return preg_match('#</[^>]+>\\s*#iUu', $item);
+        return preg_match('#</[^>]+>\\s*#iUu', $item) === 1;
     }
 
     /**

tests/fixtures/HtmlDiff/new-paragraph-and-list.html

@@ -16,5 +16,5 @@
 </newText>
 
 <expected>
-<em>Corridors</em> shall be fire-resistance rated in accordance with Table 1020.1. The <em>corridor</em> walls required to be fire-resistance rated shall comply with Section 708 for <em>fire partitions</em>.<br / class="diffmod"><br /><ins class="diffins">In addition, corridors in buildings of Types IIB, IIIB, and VB construction and assigned Risk Categories III and IV in Table 1604.5, other than Group I, shall have a fire resistance rating of not less than 1 hour where such buildings are any of the following:</ins><br / class="diffmod"><br /><ol><li><ins class="diffins">Assigned a Seismic Design Category C or D in Table 1613.3.5(1).</ins></li><ins class="diffins"> </ins><li class="diffmod"><ins class="diffins">Located in a flood hazard area established in accordance with Section 1612.3.</ins></li><ins class="diffins"> </ins><li class="diffmod"><ins class="diffins">Located in a </ins><em class="diffmod"><ins class="diffins">hurricane-prone regions</ins></em><ins class="diffins">.</ins></li><ins class="diffins"> </ins></ol><ul class="exception diff-list"><li class="normal"><strong>Exceptions:</strong><ol class="diff-list"><li class="normal">A <em>fire-resistance rating</em> is not required for <em>corridors</em> in an occupancy in Group E where each room that is used for instruction has not less than one door opening directly to the exterior and rooms for assembly purposes have not less than one-half of the required <em>means of egress</em> doors opening directly to the exterior. Exterior doors specified in this exception are required to be at ground level.</li><li class="normal">A <em>fire-resistance rating</em> is not required for <em>corridors</em> contained within a <em>dwelling unit</em> or <em>sleeping unit</em> in an occupancy in Groups I-1 and R.</li><li class="normal">A <em>fire-resistance rating</em> is not required for <em>corridors</em> in <em>open parking garages</em>.</li><li class="normal">A <em>fire-resistance rating</em> is not required for <em>corridors</em> in an occupancy in Group B that is a space requiring only a single <em>means of egress</em> complying with Section 1006.2.</li><li class="normal"><em>Corridors</em> adjacent to the <em>exterior walls</em> of buildings shall be permitted to have unprotected openings on unrated <em>exterior walls</em> where unrated walls are permitted by Table 602 and unprotected openings are permitted by Table 705.8.</li></ol></li></ul>
+<em>Corridors</em> shall be fire-resistance rated in accordance with Table 1020.1. The <em>corridor</em> walls required to be fire-resistance rated shall comply with Section 708 for <em>fire partitions</em>.<br class="diffmod" /><br /><ins class="diffins">In addition, corridors in buildings of Types IIB, IIIB, and VB construction and assigned Risk Categories III and IV in Table 1604.5, other than Group I, shall have a fire resistance rating of not less than 1 hour where such buildings are any of the following:</ins><br class="diffmod" /><br /><ol><li><ins class="diffins">Assigned a Seismic Design Category C or D in Table 1613.3.5(1).</ins></li><ins class="diffins"> </ins><li class="diffmod"><ins class="diffins">Located in a flood hazard area established in accordance with Section 1612.3.</ins></li><ins class="diffins"> </ins><li class="diffmod"><ins class="diffins">Located in a </ins><em class="diffmod"><ins class="diffins">hurricane-prone regions</ins></em><ins class="diffins">.</ins></li><ins class="diffins"> </ins></ol><ul class="exception diff-list"><li class="normal"><strong>Exceptions:</strong><ol class="diff-list"><li class="normal">A <em>fire-resistance rating</em> is not required for <em>corridors</em> in an occupancy in Group E where each room that is used for instruction has not less than one door opening directly to the exterior and rooms for assembly purposes have not less than one-half of the required <em>means of egress</em> doors opening directly to the exterior. Exterior doors specified in this exception are required to be at ground level.</li><li class="normal">A <em>fire-resistance rating</em> is not required for <em>corridors</em> contained within a <em>dwelling unit</em> or <em>sleeping unit</em> in an occupancy in Groups I-1 and R.</li><li class="normal">A <em>fire-resistance rating</em> is not required for <em>corridors</em> in <em>open parking garages</em>.</li><li class="normal">A <em>fire-resistance rating</em> is not required for <em>corridors</em> in an occupancy in Group B that is a space requiring only a single <em>means of egress</em> complying with Section 1006.2.</li><li class="normal"><em>Corridors</em> adjacent to the <em>exterior walls</em> of buildings shall be permitted to have unprotected openings on unrated <em>exterior walls</em> where unrated walls are permitted by Table 602 and unprotected openings are permitted by Table 705.8.</li></ol></li></ul>
 </expected>

tests/fixtures/HtmlDiff/override-4.html

@@ -24,5 +24,5 @@
 </newText>
 
 <expected>
-<em>Corridors</em> shall be fire-resistance rated in accordance with Table 1020.1<ins class="diffins"> and where applicable in Section 1020.1.1</ins>. The <em>corridor</em> walls required to be fire-resistance rated shall comply with Section 708 for <em>fire partitions</em>.<br /><br / class="diffmod"><del class="diffdel">In addition, corridors in buildings of Types IIB, IIIB, and VB construction and assigned Risk Categories III and IV in Table 1604.5, other than Group I, shall have a fire resistance rating of not less than 1 hour where such buildings are any of the following:</del><br / class="diffmod"><br /><ol><li><del class="diffdel">Assigned a Seismic Design Category C or D in Table 1613.3.5(1).</del></li><del class="diffdel"> </del><li class="diffmod"><del class="diffdel">Located in a flood hazard area established in accordance with Section 1612.3.</del></li><del class="diffdel"> </del><li class="diffmod"><del class="diffdel">Located in a </del><em class="diffmod"><del class="diffdel">hurricane-prone regions</del></em><del class="diffdel">.</del></li><del class="diffdel"> </del></ol><ul class="exception diff-list"><li class="normal"><strong>Exceptions:</strong><ol class="diffmod"><li><del class="diffdel">A </del><em class="diffmod"><del class="diffdel">fire-resistance rating</del></em><del class="diffdel"> is not required for </del><em class="diffmod"><del class="diffdel">corridors</del></em><del class="diffdel"> in an occupancy in Group E where each room that is used for instruction has not less than one door opening directly to the exterior and rooms for assembly purposes have not less than one-half of the required </del><em class="diffmod"><del class="diffdel">means of egress</del></em><del class="diffdel"> doors opening directly to the exterior. Exterior doors specified in this exception are required to be at ground level.</del></li><del class="diffdel"> </del><li class="diffmod"><del class="diffdel">A </del><em class="diffmod"><del class="diffdel">fire-resistance rating</del></em><del class="diffdel"> is not required for </del><em class="diffmod"><del class="diffdel">corridors</del></em><del class="diffdel"> contained within a </del><em class="diffmod"><del class="diffdel">dwelling unit</del></em><del class="diffdel"> or </del><em class="diffmod"><del class="diffdel">sleeping unit</del></em><del class="diffdel"> in an occupancy in Groups I-1 and R.</del></li><del class="diffdel"> </del><li class="diffmod"><del class="diffdel">A </del><em class="diffmod"><del class="diffdel">fire-resistance rating</del></em><del class="diffdel"> is not required for </del><em class="diffmod"><del class="diffdel">corridors</del></em><del class="diffdel"> in </del><em class="diffmod"><del class="diffdel">open parking garages</del></em><del class="diffdel">.</del></li><del class="diffdel"> </del><li class="diffmod"><del class="diffdel">A </del><em class="diffmod"><del class="diffdel">fire-resistance rating</del></em><del class="diffdel"> is not required for </del><em class="diffmod"><del class="diffdel">corridors</del></em><del class="diffdel"> in an occupancy in Group B that is a space requiring only a single </del><em class="diffmod"><del class="diffdel">means of egress</del></em><del class="diffdel"> complying with Section 1006.2.</del></li><del class="diffdel"> </del><li class="diffmod"><em><del class="diffdel">Corridors</del></em><del class="diffdel"> adjacent to the </del><em class="diffmod"><del class="diffdel">exterior walls</del></em><del class="diffdel"> of buildings shall be permitted to have unprotected openings on unrated </del><em class="diffmod"><del class="diffdel">exterior walls</del></em><del class="diffdel"> where unrated walls are permitted by Table 602 and unprotected openings are permitted by Table 705.8.</del></li><del class="diffdel"> </del></ol></li><li class="normal new"><ins> <ol><li>A <em>fire-resistance rating</em> is not required for <em>corridors</em> in an occupancy in Group E where each room that is used for instruction has not less than one door opening directly to the exterior and rooms for assembly purposes have not less than one-half of the required <em>means of egress</em> doors opening directly to the exterior. Exterior doors specified in this exception are required to be at ground level.</li> <li>A <em>fire-resistance rating</em> is not required for <em>corridors</em> contained within a <em>dwelling unit</em> or <em>sleeping unit</em> in an occupancy in Groups I-1 and R.</li> <li>A <em>fire-resistance rating</em> is not required for <em>corridors</em> in <em>open parking garages</em>.</li> <li>A <em>fire-resistance rating</em> is not required for <em>corridors</em> in an occupancy in Group B that is a space requiring only a single <em>means of egress</em> complying with Section 1006.2.</li> <li><em>Corridors</em> adjacent to the <em>exterior walls</em> of buildings shall be permitted to have unprotected openings on unrated <em>exterior walls</em> where unrated walls are permitted by Table 602 and unprotected openings are permitted by Table 705.8.</li> </ol></ins></li></ul>
+<em>Corridors</em> shall be fire-resistance rated in accordance with Table 1020.1<ins class="diffins"> and where applicable in Section 1020.1.1</ins>. The <em>corridor</em> walls required to be fire-resistance rated shall comply with Section 708 for <em>fire partitions</em>.<br /><br class="diffmod" /><del class="diffdel">In addition, corridors in buildings of Types IIB, IIIB, and VB construction and assigned Risk Categories III and IV in Table 1604.5, other than Group I, shall have a fire resistance rating of not less than 1 hour where such buildings are any of the following:</del><br class="diffmod" /><br /><ol><li><del class="diffdel">Assigned a Seismic Design Category C or D in Table 1613.3.5(1).</del></li><del class="diffdel"> </del><li class="diffmod"><del class="diffdel">Located in a flood hazard area established in accordance with Section 1612.3.</del></li><del class="diffdel"> </del><li class="diffmod"><del class="diffdel">Located in a </del><em class="diffmod"><del class="diffdel">hurricane-prone regions</del></em><del class="diffdel">.</del></li><del class="diffdel"> </del></ol><ul class="exception diff-list"><li class="normal"><strong>Exceptions:</strong><ol class="diffmod"><li><del class="diffdel">A </del><em class="diffmod"><del class="diffdel">fire-resistance rating</del></em><del class="diffdel"> is not required for </del><em class="diffmod"><del class="diffdel">corridors</del></em><del class="diffdel"> in an occupancy in Group E where each room that is used for instruction has not less than one door opening directly to the exterior and rooms for assembly purposes have not less than one-half of the required </del><em class="diffmod"><del class="diffdel">means of egress</del></em><del class="diffdel"> doors opening directly to the exterior. Exterior doors specified in this exception are required to be at ground level.</del></li><del class="diffdel"> </del><li class="diffmod"><del class="diffdel">A </del><em class="diffmod"><del class="diffdel">fire-resistance rating</del></em><del class="diffdel"> is not required for </del><em class="diffmod"><del class="diffdel">corridors</del></em><del class="diffdel"> contained within a </del><em class="diffmod"><del class="diffdel">dwelling unit</del></em><del class="diffdel"> or </del><em class="diffmod"><del class="diffdel">sleeping unit</del></em><del class="diffdel"> in an occupancy in Groups I-1 and R.</del></li><del class="diffdel"> </del><li class="diffmod"><del class="diffdel">A </del><em class="diffmod"><del class="diffdel">fire-resistance rating</del></em><del class="diffdel"> is not required for </del><em class="diffmod"><del class="diffdel">corridors</del></em><del class="diffdel"> in </del><em class="diffmod"><del class="diffdel">open parking garages</del></em><del class="diffdel">.</del></li><del class="diffdel"> </del><li class="diffmod"><del class="diffdel">A </del><em class="diffmod"><del class="diffdel">fire-resistance rating</del></em><del class="diffdel"> is not required for </del><em class="diffmod"><del class="diffdel">corridors</del></em><del class="diffdel"> in an occupancy in Group B that is a space requiring only a single </del><em class="diffmod"><del class="diffdel">means of egress</del></em><del class="diffdel"> complying with Section 1006.2.</del></li><del class="diffdel"> </del><li class="diffmod"><em><del class="diffdel">Corridors</del></em><del class="diffdel"> adjacent to the </del><em class="diffmod"><del class="diffdel">exterior walls</del></em><del class="diffdel"> of buildings shall be permitted to have unprotected openings on unrated </del><em class="diffmod"><del class="diffdel">exterior walls</del></em><del class="diffdel"> where unrated walls are permitted by Table 602 and unprotected openings are permitted by Table 705.8.</del></li><del class="diffdel"> </del></ol></li><li class="normal new"><ins> <ol><li>A <em>fire-resistance rating</em> is not required for <em>corridors</em> in an occupancy in Group E where each room that is used for instruction has not less than one door opening directly to the exterior and rooms for assembly purposes have not less than one-half of the required <em>means of egress</em> doors opening directly to the exterior. Exterior doors specified in this exception are required to be at ground level.</li> <li>A <em>fire-resistance rating</em> is not required for <em>corridors</em> contained within a <em>dwelling unit</em> or <em>sleeping unit</em> in an occupancy in Groups I-1 and R.</li> <li>A <em>fire-resistance rating</em> is not required for <em>corridors</em> in <em>open parking garages</em>.</li> <li>A <em>fire-resistance rating</em> is not required for <em>corridors</em> in an occupancy in Group B that is a space requiring only a single <em>means of egress</em> complying with Section 1006.2.</li> <li><em>Corridors</em> adjacent to the <em>exterior walls</em> of buildings shall be permitted to have unprotected openings on unrated <em>exterior walls</em> where unrated walls are permitted by Table 602 and unprotected openings are permitted by Table 705.8.</li> </ol></ins></li></ul>
 </expected>