caxy / php-htmldiff

lib/Caxy/HtmlDiff/ListDiff.php

Doc Comments +2 added lines, -1 removed lines

@@ -505,6 +505,7 @@ 
      * @param string $oldList
      * @param array $match
      * @param array $index
+     * @param string $type
      * @return string
      */
     protected function addListElementToContent($newList, $oldList, array $match, array $index, $type)
@@ -588,7 +589,7 @@ 
     /**
      * Converts the list (li) content arrays to string.
      *
-     * @param array $listContentArray
+     * @param string $listContentArray
      * @return string
      */
     protected function convertListContentArrayToString($listContentArray)

Spacing +1 added lines, -1 removed lines

@@ -371,7 +371,7 @@
                         $columns = $this->getArrayColumn($bestMatchPercentages, $key);
                         $thisBestMatches = array_filter(
                             $columns,
-                            function ($v) use ($percent) {
+                            function($v) use ($percent) {
                                 return $v > $percent;
                             }
                         );

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/ListDiffNew.php

Doc Comments +12 added lines

@@ -217,12 +217,18 @@ 
         return $diffList;
     }
 
+    /**
+     * @param string $type
+     */
     protected function isOpeningListTag($word, $type = null)
     {
         $filter = $type !== null ? array('<' . $type) : array('<ul', '<ol', '<dl');
         return in_array(substr($word, 0, 3), $filter);
     }
 
+    /**
+     * @param string $type
+     */
     protected function isClosingListTag($word, $type = null)
     {
         $filter = $type !== null ? array('</' . $type) : array('</ul', '</ol', '</dl');
@@ -230,6 +236,9 @@ 
         return in_array(substr($word, 0, 4), $filter);
     }
 
+    /**
+     * @param string $type
+     */
     protected function isOpeningListItemTag($word, $type = null)
     {
         $filter = $type !== null ? array('<' . $type) : array('<li', '<dd', '<dt');
@@ -237,6 +246,9 @@ 
         return in_array(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/Match.php

Doc Comments +4 added lines

@@ -8,6 +8,10 @@
     public $startInNew;
     public $size;
 
+    /**
+     * @param integer $startInOld
+     * @param integer $size
+     */
     public function __construct($startInOld, $startInNew, $size)
     {
         $this->startInOld = $startInOld;

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

@@ -120,10 +120,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);
             }
         }
     }
@@ -539,7 +539,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;
                     }
@@ -547,13 +547,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]);
                     }
                 }
             }
@@ -564,12 +564,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 (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 (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]);
                     }
                 }
 
@@ -754,7 +754,7 @@ 
     {
         $word = explode(' ', trim($word, '<>'));
 
-        return '<'.$word[ 0 ].'>';
+        return '<'.$word[0].'>';
     }
 
     /**
@@ -773,23 +773,23 @@ 
         $matchLengthAt = array();
         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;
                 }
                 if ($indexInNew >= $endInNew) {
                     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 ||
                     (
                         $this->isGroupDiffs() &&

lib/Caxy/HtmlDiff/AbstractDiff.php

Spacing +1 added lines, -1 removed lines

@@ -319,7 +319,7 @@
     {
         $expStr = explode($start, $str, 2);
         if (count($expStr) > 1) {
-            $expStr = explode($end, $expStr[ 1 ]);
+            $expStr = explode($end, $expStr[1]);
             if (count($expStr) > 1) {
                 array_pop($expStr);