WIP

Author: Sven Hagemann

lib/Caxy/HtmlDiff/AbstractDiff.php

@@ -3,6 +3,8 @@
 namespace Caxy\HtmlDiff;
 
 use Caxy\HtmlDiff\Util\MbStringUtil;
+use HTMLPurifier;
+use HTMLPurifier_Config;
 
 /**
  * Class AbstractDiff.
@@ -66,12 +68,12 @@ abstract class AbstractDiff
  protected $diffCaches = array();
 
  /**
- * @var \HTMLPurifier
+ * @var HTMLPurifier
  */
  protected $purifier;
 
  /**
- * @var \HTMLPurifier_Config|null
+ * @var HTMLPurifier_Config|null
  */
  protected $purifierConfig = null;
 
@@ -129,7 +131,7 @@ public function initPurifier($defaultPurifierSerializerCache = null)
  if (null !== $this->purifierConfig) {
  $HTMLPurifierConfig = $this->purifierConfig;
  } else {
- $HTMLPurifierConfig = \HTMLPurifier_Config::createDefault();
+ $HTMLPurifierConfig = HTMLPurifier_Config::createDefault();
  }
 
  // Cache.SerializerPath defaults to Null and sets
@@ -144,7 +146,7 @@ public function initPurifier($defaultPurifierSerializerCache = null)
  // created by the web/php user (www-user, php-fpm, etc.)
  $HTMLPurifierConfig->set('Cache.SerializerPermissions', 0777);
 
- $this->purifier = new \HTMLPurifier($HTMLPurifierConfig);
+ $this->purifier = new HTMLPurifier($HTMLPurifierConfig);
  }
 
  /**
@@ -369,33 +371,13 @@ public function isGroupDiffs()
  }
 
  /**
- * @param \HTMLPurifier_Config $config
+ * @param HTMLPurifier_Config $config
  */
- public function setHTMLPurifierConfig(\HTMLPurifier_Config $config)
+ public function setHTMLPurifierConfig(HTMLPurifier_Config $config)
  {
  $this->purifierConfig = $config;
  }
 
- /**
- * @param string $tag
- *
- * @return string
- */
- protected function getOpeningTag($tag)
- {
- return '/<'.$tag.'[^>]*/i';
- }
-
- /**
- * @param string $tag
- *
- * @return string
- */
- protected function getClosingTag($tag)
- {
- return '</'.$tag.'>';
- }
-
  /**
  * @param string $html
  *

lib/Caxy/HtmlDiff/HtmlDiff.php

@@ -574,13 +574,22 @@ protected function insertTag($tag, $cssClass, &$words)
  $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]) &&
+ $this->isOpeningTag($workTag[0]) === true &&
+ $this->isClosingTag($workTag[0]) === false
+ ) {
+ if ($this->stringUtil->strpos($workTag[0], 'class=') !== false) {
+ $workTag[0] = str_replace('class="', 'class="diffmod ', $workTag[0]);
+ $workTag[0] = str_replace("class='", 'class="diffmod ', $workTag[0]);
+ } elseif ($this->stringUtil->strpos($workTag[0], '/>') !== false) {
+ $workTag[0] = str_replace('/>', ' class="diffmod" />', $workTag[0]);
  } else {
- $workTag[ 0 ] = str_replace('>', ' class="diffmod">', $workTag[ 0 ]);
+ $workTag[0] = str_replace('>', ' class="diffmod">', $workTag[0]);
  }
+
+ var_dump($workTag[ 0 ]);
  }
 
  $appendContent = implode('', $workTag).$specialCaseTagInjection;

lib/Caxy/HtmlDiff/ListDiffLines.php

@@ -389,35 +389,31 @@ private function getInnerText(DOMNode $node) : string
  $bufferDom->appendChild($bufferDom->importNode($child, true));
  }
 
- return $bufferDom->saveHTML();
+ return trim($bufferDom->saveHTML());
  }
 
  private function setInnerText(DOMNode $node, string $html) : void
  {
- $html = trim($html);/*
- echo "\r\n" . '------------------------' . "\r\n";
- echo $html . "\r\n";
- echo '------------------------' . "\r\n";
-*/
+ $html = sprintf('<%s>%s</%s>', 'body', $html, 'body');
 
+ $bufferDom = new DOMDocument();
 
- $htmlFragment = $node->ownerDocument->createDocumentFragment();
- $htmlFragment->ownerDocument->preserveWhiteSpace = false;
- $htmlFragment->appendXML($html);
+ try {
+ $bufferDom->loadHTML($html);
+ } catch (\Exception $exception) {
+ var_dump($html);
+ exit;
+ }
 
- $node->nodeValue = '';
- $node->appendChild($htmlFragment);
+ $bufferDom->saveHTML($bufferDom->childNodes[0]);
  }
 
  private function wrapNode(DOMNode $node, string $tagName) : void
  {
- $htmlFragment = $node->ownerDocument->createDocumentFragment();
- $htmlFragment->appendXML(
+ $this->setInnerText(
+  $node,
  sprintf('<%s>%s</%s>', $tagName, $this->getInnerText($node), $tagName)
  );
-
- $node->nodeValue = '';
- $node->appendChild($htmlFragment);
  }
 
  private function childCountWithoutTextNode(DOMNode $node) : int

tests/fixtures/HtmlDiff/first-and-last.html

@@ -35,5 +35,5 @@
 </newText>
 
 <expected>
-<ol class="diff-list"><li class="removed"><del> Etiam feugiat lorem non metus. Nullam accumsan lorem in dui. </del></li><li class="removed"><del> Praesent ac sem eget est egestas volutpat. Nulla neque dolor, sagittis eget, iaculis quis, molestie non, velit. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Integer ante arcu, accumsan a, consectetuer eget, posuere ut, mauris. Aenean massa. </del></li><li class="removed"><del> Vestibulum suscipit nulla quis orci. Integer ante arcu, accumsan a, consectetuer eget, posuere ut, mauris. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. </del></li><li class="replacement">Suspendisse non nisl sit amet velit hendrerit rutrum. Aenean massa. Curabitur ullamcorper ultricies nisi. Praesent vestibulum dapibus nibh. In dui magna, posuere eget, vestibulum et, tempor auctor, justo.</li><li class="normal new"><ins> Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. </ins></li><li class="normal new"><ins> Duis lobortis massa imperdiet quam. Donec sodales sagittis magna. Nam ipsum risus, rutrum vitae, vestibulum eu, molestie vel, lacus. Suspendisse eu ligula. Morbi nec metus. </ins></li></ol>
+<ol class="diff-list"><li class="removed"><del>Etiam feugiat lorem non metus. Nullam accumsan lorem in dui.</del></li><li class="removed"><del>Praesent ac sem eget est egestas volutpat. Nulla neque dolor, sagittis eget, iaculis quis, molestie non, velit. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Integer ante arcu, accumsan a, consectetuer eget, posuere ut, mauris. Aenean massa.</del></li><li class="removed"><del>Vestibulum suscipit nulla quis orci. Integer ante arcu, accumsan a, consectetuer eget, posuere ut, mauris. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos.</del></li><li class="replacement">Suspendisse non nisl sit amet velit hendrerit rutrum. Aenean massa. Curabitur ullamcorper ultricies nisi. Praesent vestibulum dapibus nibh. In dui magna, posuere eget, vestibulum et, tempor auctor, justo.</li><li class="normal new"><ins>Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu.</ins></li><li class="normal new"><ins>Duis lobortis massa imperdiet quam. Donec sodales sagittis magna. Nam ipsum risus, rutrum vitae, vestibulum eu, molestie vel, lacus. Suspendisse eu ligula. Morbi nec metus.</ins></li></ol>
 </expected>

tests/fixtures/HtmlDiff/override-5.html

@@ -27,5 +27,5 @@
 </newText>
 
 <expected>
-<p>In addition to the <em>means of egress</em> required by this chapter, <del class="diffmod">provisions </del><em class="diffmod"><ins class="diffmod">emergency escape and rescue openings </ins></em>shall be <del class="diffmod">made for </del><em class="diffmod"><del class="diffmod">emergency escape and rescue openings</del></em><ins class="diffmod">provided</ins> in<ins class="diffins"> the following occupancies:</ins></p><ins class="diffins"> </ins><div style="padding-left:30px;" class="diffmod"><ins class="diffins">1.</ins> Group R<ins class="diffins">-1 and R-2</ins> occupancies.<del class="diffmod"> </del></div><ins class="diffmod"> </ins><div style="padding-left:30px;" class="diffmod"><ins class="diffmod">2. Group R-1 and R-2 occupancies located on stories with one exit or access to one exit where permitted by Tables 1006.3.2(1) and 1006.3.2(2). </ins></div><ins class="diffmod"> </ins><div style="padding-left:30px;" class="diffmod"><ins class="diffmod">3. Group R-3 occupancies.</ins></div><ins class="diffmod"> </ins><p class="diffmod"><br /><em>Basements</em> and sleeping rooms below the fourth story above <em>grade plane</em> shall have at least one exterior <em>emergency escape and rescue opening</em> in accordance with this section. Where <em>basements</em> contain one or more sleeping rooms, <em>emergency escape and rescue openings</em> shall be required in each sleeping room, but shall not be required in adjoining areas of the <em>basement</em>. Such openings shall open directly into a <em>public way</em> or to a <em>yard </em>or<em> court</em> that opens to a <em>public way</em>.</p> <ul class="exception diff-list"><li class="normal"><strong>Exceptions:</strong><br / class="diffmod"><ol class="diff-list"><li class="removed"><del><em>Groups R-1 and R-2 occupancies are not required to provide emergency and escape openings where they comply with all of the following:</em><ol><li><em>Each story has access to two or more means of egress.<br /></em></li> <li><em>The building is constructed of Type I, Type II, Type IIIA or Type IV construction.</em></li> <li><em>The building is equipped throughout with an approved automatic sprinkler system in accordance with Sections 903.3.1.1 or 903.3.3.2.</em></li> </ol></del></li><li class="removed"><del><em>The emergency escape and rescue opening is permitted to open onto a balcony within an atrium in accordance with the requirements of Section 404, provided the balcony provides access to an exit and the dwelling unit or sleeping unit has a means of egress that is not open to the atrium.</em></del></li><li class="replacement"><ins><em>Emergency escape and rescue opening</em> are not required from Group R-1 and R-2 occupancies where each story has access to at least two exits or access to exits and the building is equipped throughout with an automatic sprinkler system in accordance with Section 903.3.1.1.</ins></li><li class="normal"><em>Basements</em> with a ceiling height of less than 80 inches (2032 mm) shall not be required to have <em>emergency escape and rescue openings</em>.</li><li class="normal"><em>Emergency escape and rescue openings</em> are not required from <em>basements</em> or sleeping rooms that have an <em>exit</em> door or <em>exit access</em> door that opens directly into a <em>public way</em> or to a <em>yard</em>, <em>court</em> or exterior exit balcony that opens to a <em>public way</em>.</li><li class="normal"><em>Basements</em> without <em>habitable spaces</em> and having not more than 200 square feet (18.6 m<sup>2</sup>) in floor area shall not be required to have <em>emergency escape and rescue openings</em>.</li></ol></li></ul>
+<p>In addition to the <em>means of egress</em> required by this chapter, <del class="diffmod">provisions </del><em class="diffmod"><ins class="diffmod">emergency escape and rescue openings </ins></em>shall be <del class="diffmod">made for </del><em class="diffmod"><del class="diffmod">emergency escape and rescue openings</del></em><ins class="diffmod">provided</ins> in<ins class="diffins"> the following occupancies:</ins></p><ins class="diffins"> </ins><div style="padding-left:30px;" class="diffmod"><ins class="diffins">1.</ins> Group R<ins class="diffins">-1 and R-2</ins> occupancies.<del class="diffmod"> </del></div><ins class="diffmod"> </ins><div style="padding-left:30px;" class="diffmod"><ins class="diffmod">2. Group R-1 and R-2 occupancies located on stories with one exit or access to one exit where permitted by Tables 1006.3.2(1) and 1006.3.2(2). </ins></div><ins class="diffmod"> </ins><div style="padding-left:30px;" class="diffmod"><ins class="diffmod">3. Group R-3 occupancies.</ins></div><ins class="diffmod"> </ins><p class="diffmod"><br /><em>Basements</em> and sleeping rooms below the fourth story above <em>grade plane</em> shall have at least one exterior <em>emergency escape and rescue opening</em> in accordance with this section. Where <em>basements</em> contain one or more sleeping rooms, <em>emergency escape and rescue openings</em> shall be required in each sleeping room, but shall not be required in adjoining areas of the <em>basement</em>. Such openings shall open directly into a <em>public way</em> or to a <em>yard </em>or<em> court</em> that opens to a <em>public way</em>.</p> <ul class="exception diff-list"><li class="normal"><strong>Exceptions:</strong><br class="diffmod"><ol class="diff-list"><li class="removed"><del><em>Groups R-1 and R-2 occupancies are not required to provide emergency and escape openings where they comply with all of the following:</em><ol><li><em>Each story has access to two or more means of egress.<br /></em></li> <li><em>The building is constructed of Type I, Type II, Type IIIA or Type IV construction.</em></li> <li><em>The building is equipped throughout with an approved automatic sprinkler system in accordance with Sections 903.3.1.1 or 903.3.3.2.</em></li> </ol></del></li><li class="removed"><del><em>The emergency escape and rescue opening is permitted to open onto a balcony within an atrium in accordance with the requirements of Section 404, provided the balcony provides access to an exit and the dwelling unit or sleeping unit has a means of egress that is not open to the atrium.</em></del></li><li class="replacement"><ins><em>Emergency escape and rescue opening</em> are not required from Group R-1 and R-2 occupancies where each story has access to at least two exits or access to exits and the building is equipped throughout with an automatic sprinkler system in accordance with Section 903.3.1.1.</ins></li><li class="normal"><em>Basements</em> with a ceiling height of less than 80 inches (2032 mm) shall not be required to have <em>emergency escape and rescue openings</em>.</li><li class="normal"><em>Emergency escape and rescue openings</em> are not required from <em>basements</em> or sleeping rooms that have an <em>exit</em> door or <em>exit access</em> door that opens directly into a <em>public way</em> or to a <em>yard</em>, <em>court</em> or exterior exit balcony that opens to a <em>public way</em>.</li><li class="normal"><em>Basements</em> without <em>habitable spaces</em> and having not more than 200 square feet (18.6 m<sup>2</sup>) in floor area shall not be required to have <em>emergency escape and rescue openings</em>.</li></ol></li></ul>
 </expected>