caxy / php-htmldiff

lib/Caxy/HtmlDiff/ListDiff/DiffList.php

Doc Comments +3 added lines

@@ -14,6 +14,9 @@
 
     protected $endTag;
 
+    /**
+     * @param null|string $listType
+     */
     public function __construct($listType, $startTag, $endTag, $listItems = array(), $attributes = array())
     {
         $this->listType = $listType;

lib/Caxy/HtmlDiff/Table/TableDiff.php

Doc Comments +4 added lines, -4 removed lines

@@ -229,8 +229,8 @@ 
 
     /**
      * @param Operation $operation
-     * @param array     $oldRows
-     * @param array     $newRows
+     * @param TableRow[]     $oldRows
+     * @param TableRow[]     $newRows
      * @param array     $appliedRowSpans
      */
     protected function processEqualOperation(Operation $operation, $oldRows, $newRows, &$appliedRowSpans)
@@ -249,8 +249,8 @@ 
 
     /**
      * @param Operation $operation
-     * @param array     $oldRows
-     * @param array     $newRows
+     * @param TableRow[]     $oldRows
+     * @param TableRow[]     $newRows
      * @param array     $appliedRowSpans
      */
     protected function processReplaceOperation(Operation $operation, $oldRows, $newRows, &$appliedRowSpans)

lib/Caxy/HtmlDiff/HtmlDiffConfig.php

Doc Comments +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
     /**
      * @param int $matchThreshold
      *
-     * @return AbstractDiff
+     * @return HtmlDiffConfig
      */
     public function setMatchThreshold($matchThreshold)
     {

lib/Caxy/HtmlDiff/HtmlDiff.php

Doc Comments +8 added lines, -2 removed lines

@@ -387,6 +387,12 @@ 
         return $diff->build();
     }
 
+    /**
+     * @param string $oldText
+     * @param string $newText
+     * @param string $attribute
+     * @param string $element
+     */
     protected function diffElementsByAttribute($oldText, $newText, $attribute, $element)
     {
         $oldAttribute = $this->getAttributeFromTag($oldText, $attribute);
@@ -662,7 +668,7 @@ 
     /**
      * @param string $item
      *
-     * @return bool
+     * @return integer
      */
     protected function isOpeningTag($item)
     {
@@ -672,7 +678,7 @@ 
     /**
      * @param string $item
      *
-     * @return bool
+     * @return integer
      */
     protected function isClosingTag($item)
     {

Spacing +18 added lines, -18 removed lines

@@ -130,10 +130,10 @@ 
             if ($this->isTag($word)) {
                 $word = $this->stripTagAttributes($word);
             }
-            if (isset($this->wordIndices[ $word ])) {
-                $this->wordIndices[ $word ][] = $i;
+            if (isset($this->wordIndices[$word])) {
+                $this->wordIndices[$word][] = $i;
             } else {
-                $this->wordIndices[ $word ] = array($i);
+                $this->wordIndices[$word] = array($i);
             }
         }
     }
@@ -549,7 +549,7 @@ 
             } else {
                 $firstOrDefault = false;
                 foreach ($this->config->getSpecialCaseOpeningTags() as $x) {
-                    if (preg_match($x, $words[ 0 ])) {
+                    if (preg_match($x, $words[0])) {
                         $firstOrDefault = $x;
                         break;
                     }
@@ -557,13 +557,13 @@ 
                 if ($firstOrDefault) {
                     $specialCaseTagInjection = '<ins class="mod">';
                     if ($tag == 'del') {
-                        unset($words[ 0 ]);
+                        unset($words[0]);
                     }
-                } elseif (array_search($words[ 0 ], $this->config->getSpecialCaseClosingTags()) !== false) {
+                } elseif (array_search($words[0], $this->config->getSpecialCaseClosingTags()) !== false) {
                     $specialCaseTagInjection = '</ins>';
                     $specialCaseTagInjectionIsBefore = true;
                     if ($tag == 'del') {
-                        unset($words[ 0 ]);
+                        unset($words[0]);
                     }
                 }
             }
@@ -574,12 +574,12 @@ 
                 $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]) && !$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]);
                     } else {
-                        $workTag[ 0 ] = str_replace('>', ' class="diffmod">', $workTag[ 0 ]);
+                        $workTag[0] = str_replace('>', ' class="diffmod">', $workTag[0]);
                     }
                 }
 
@@ -772,7 +772,7 @@ 
         $space = $this->stringUtil->strpos($word, ' ', 1);
 
         if ($space) {
-            return '<' . $this->stringUtil->substr($word, 1, $space) . '>';
+            return '<'.$this->stringUtil->substr($word, 1, $space).'>';
         }
 
         return trim($word, '<>');
@@ -796,15 +796,15 @@ 
 
         for ($indexInOld = $startInOld; $indexInOld < $endInOld; ++$indexInOld) {
             $newMatchLengthAt = array();
-            $index = $this->oldWords[ $indexInOld ];
+            $index = $this->oldWords[$indexInOld];
             if ($this->isTag($index)) {
                 $index = $this->stripTagAttributes($index);
             }
-            if (!isset($this->wordIndices[ $index ])) {
+            if (!isset($this->wordIndices[$index])) {
                 $matchLengthAt = $newMatchLengthAt;
                 continue;
             }
-            foreach ($this->wordIndices[ $index ] as $indexInNew) {
+            foreach ($this->wordIndices[$index] as $indexInNew) {
                 if ($indexInNew < $startInNew) {
                     continue;
                 }
@@ -812,8 +812,8 @@ 
                     break;
                 }
 
-                $newMatchLength = (isset($matchLengthAt[ $indexInNew - 1 ]) ? $matchLengthAt[ $indexInNew - 1 ] : 0) + 1;
-                $newMatchLengthAt[ $indexInNew ] = $newMatchLength;
+                $newMatchLength = (isset($matchLengthAt[$indexInNew - 1]) ? $matchLengthAt[$indexInNew - 1] : 0) + 1;
+                $newMatchLengthAt[$indexInNew] = $newMatchLength;
 
                 if ($newMatchLength > $bestMatchSize ||
                     (

lib/Caxy/HtmlDiff/LcsService.php

Doc Comments +2 added lines, -2 removed lines

@@ -70,8 +70,8 @@
      * @param $c
      * @param $a
      * @param $b
-     * @param $i
-     * @param $j
+     * @param integer $i
+     * @param integer $j
      * @param $matches
      */
     protected function compileMatches($c, $a, $b, $i, $j, &$matches)

lib/Caxy/HtmlDiff/ListDiffLines.php

Spacing +3 added lines, -3 removed lines

@@ -24,9 +24,9 @@
      * @var array
      */
     protected static $listContentTags = array(
-        'h1','h2','h3','h4','h5','pre','div','br','hr','code',
-        'input','form','img','span','a','i','b','strong','em',
-        'font','big','del','tt','sub','sup','strike',
+        'h1', 'h2', 'h3', 'h4', 'h5', 'pre', 'div', 'br', 'hr', 'code',
+        'input', 'form', 'img', 'span', 'a', 'i', 'b', 'strong', 'em',
+        'font', 'big', 'del', 'tt', 'sub', 'sup', 'strike',
     );
 
     /**

lib/Caxy/HtmlDiff/AbstractDiff.php

Braces +3 added lines, -1 removed lines

@@ -527,7 +527,9 @@
                     $mode = 'tag';
                 } elseif (preg_match("/\s/u", $character)) {
                     $current_word .= $character;
-                    if (!$keepNewLines) $current_word = preg_replace('/\s+/Su', ' ', $current_word);
+                    if (!$keepNewLines) {
+                        $current_word = preg_replace('/\s+/Su', ' ', $current_word);
+                    }
                 } else {
                     if ($current_word != '') {
                         $words[] = $current_word;

Spacing +1 added lines, -1 removed lines

@@ -127,7 +127,7 @@
     public function initPurifier($defaultPurifierSerializerCache = null)
     {
         if (null !== $this->purifierConfig) {
-            $HTMLPurifierConfig  = $this->purifierConfig;
+            $HTMLPurifierConfig = $this->purifierConfig;
         } else {
             $HTMLPurifierConfig = \HTMLPurifier_Config::createDefault();
         }

lib/Caxy/HtmlDiff/ListDiff.php

Doc Comments +12 added lines

@@ -286,6 +286,9 @@ 
         return $diffList;
     }
 
+    /**
+     * @param string $type
+     */
     protected function isOpeningListTag($word, $type = null)
     {
         $filter = $type !== null ? array('<'.$type) : array('<ul', '<ol', '<dl');
@@ -293,6 +296,9 @@ 
         return in_array($this->stringUtil->substr($word, 0, 3), $filter);
     }
 
+    /**
+     * @param string $type
+     */
     protected function isClosingListTag($word, $type = null)
     {
         $filter = $type !== null ? array('</'.$type) : array('</ul', '</ol', '</dl');
@@ -300,6 +306,9 @@ 
         return in_array($this->stringUtil->substr($word, 0, 4), $filter);
     }
 
+    /**
+     * @param string $type
+     */
     protected function isOpeningListItemTag($word, $type = null)
     {
         $filter = $type !== null ? array('<'.$type) : array('<li', '<dd', '<dt');
@@ -307,6 +316,9 @@ 
         return in_array($this->stringUtil->substr($word, 0, 3), $filter);
     }
 
+    /**
+     * @param string $type
+     */
     protected function isClosingListItemTag($word, $type = null)
     {
         $filter = $type !== null ? array('</'.$type) : array('</li', '</dd', '</dt');

lib/Caxy/HtmlDiff/Preprocessor.php

Doc Comments +10 added lines

@@ -4,6 +4,11 @@ 
 
 class Preprocessor
 {
+    /**
+     * @param string $old
+     * @param string $new
+     * @param Util\MbStringUtil $stringUtil
+     */
     public static function diffCommonPrefix($old, $new, $stringUtil)
     {
         // Quick check for common null cases.
@@ -34,6 +39,11 @@ 
         return $pointerMid;
     }
 
+    /**
+     * @param string $old
+     * @param string $new
+     * @param Util\MbStringUtil $stringUtil
+     */
     public static function diffCommonSuffix($old, $new, $stringUtil)
     {
         // Quick check for common null cases.