caxy / php-htmldiff

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 +63 added lines, -63 removed lines

@@ -103,7 +103,7 @@ 
 
         $operations = $this->operations();
         foreach ($operations as $item) {
-            $this->performOperation( $item );
+            $this->performOperation($item);
         }
 
         if ($this->hasDiffCache()) {
@@ -117,13 +117,13 @@ 
     {
         $this->wordIndices = array();
         foreach ($this->newWords as $i => $word) {
-            if ( $this->isTag( $word ) ) {
-                $word = $this->stripTagAttributes( $word );
+            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);
             }
         }
     }
@@ -167,7 +167,7 @@ 
             } elseif ($openIsolatedDiffTags > 0 && $this->isClosingIsolatedDiffTag($word, $currentIsolatedDiffTag)) {
                 $openIsolatedDiffTags--;
                 if ($openIsolatedDiffTags == 0) {
-                    $isolatedDiffTagIndices[] = array ('start' => $isolatedDiffTagStart, 'length' => $index - $isolatedDiffTagStart + 1, 'tagType' => $currentIsolatedDiffTag);
+                    $isolatedDiffTagIndices[] = array('start' => $isolatedDiffTagStart, 'length' => $index - $isolatedDiffTagStart + 1, 'tagType' => $currentIsolatedDiffTag);
                     $currentIsolatedDiffTag = null;
                 }
             }
@@ -239,16 +239,16 @@ 
     {
         switch ($operation->action) {
             case 'equal' :
-            $this->processEqualOperation( $operation );
+            $this->processEqualOperation($operation);
             break;
             case 'delete' :
-            $this->processDeleteOperation( $operation, "diffdel" );
+            $this->processDeleteOperation($operation, "diffdel");
             break;
             case 'insert' :
-            $this->processInsertOperation( $operation, "diffins");
+            $this->processInsertOperation($operation, "diffins");
             break;
             case 'replace':
-            $this->processReplaceOperation( $operation );
+            $this->processReplaceOperation($operation);
             break;
             default:
             break;
@@ -260,8 +260,8 @@ 
      */
     protected function processReplaceOperation($operation)
     {
-        $this->processDeleteOperation( $operation, "diffmod" );
-        $this->processInsertOperation( $operation, "diffmod" );
+        $this->processDeleteOperation($operation, "diffmod");
+        $this->processInsertOperation($operation, "diffmod");
     }
 
     /**
@@ -282,7 +282,7 @@ 
                 }
             }
         }
-        $this->insertTag( "ins", $cssClass, $text );
+        $this->insertTag("ins", $cssClass, $text);
     }
 
     /**
@@ -303,7 +303,7 @@ 
                 }
             }
         }
-        $this->insertTag( "del", $cssClass, $text );
+        $this->insertTag("del", $cssClass, $text);
     }
 
     /**
@@ -358,7 +358,7 @@ 
 
         $diff = HtmlDiff::create($oldText, $newText, $this->config);
 
-        return $wrapStart . $diff->build() . $wrapEnd;
+        return $wrapStart.$diff->build().$wrapEnd;
     }
 
     /**
@@ -422,7 +422,7 @@ 
                 }
             }
         }
-        $this->content .= implode( "", $result );
+        $this->content .= implode("", $result);
     }
 
     /**
@@ -527,22 +527,22 @@ 
     protected function insertTag($tag, $cssClass, &$words)
     {
         while (true) {
-            if ( count( $words ) == 0 ) {
+            if (count($words) == 0) {
                 break;
             }
 
-            $nonTags = $this->extractConsecutiveWords( $words, 'noTag' );
+            $nonTags = $this->extractConsecutiveWords($words, 'noTag');
 
             $specialCaseTagInjection = '';
             $specialCaseTagInjectionIsBefore = false;
 
-            if ( count( $nonTags ) != 0 ) {
-                $text = $this->wrapText( implode( "", $nonTags ), $tag, $cssClass );
+            if (count($nonTags) != 0) {
+                $text = $this->wrapText(implode("", $nonTags), $tag, $cssClass);
                 $this->content .= $text;
             } else {
                 $firstOrDefault = false;
                 foreach ($this->config->getSpecialCaseOpeningTags() as $x) {
-                    if ( preg_match( $x, $words[ 0 ] ) ) {
+                    if (preg_match($x, $words[0])) {
                         $firstOrDefault = $x;
                         break;
                     }
@@ -550,33 +550,33 @@ 
                 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]);
                     }
                 }
             }
-            if ( count( $words ) == 0 && count( $specialCaseTagInjection ) == 0 ) {
+            if (count($words) == 0 && count($specialCaseTagInjection) == 0) {
                 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 ( strpos( $workTag[ 0 ], 'class=' ) ) {
-                        $workTag[ 0 ] = str_replace( 'class="', 'class="diffmod ', $workTag[ 0 ] );
-                        $workTag[ 0 ] = str_replace( "class='", 'class="diffmod ', $workTag[ 0 ] );
+                $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]);
                     } else {
-                        $workTag[ 0 ] = str_replace( ">", ' class="diffmod">', $workTag[ 0 ] );
+                        $workTag[0] = str_replace(">", ' class="diffmod">', $workTag[0]);
                     }
                 }
 
-                $appendContent = implode( "", $workTag ) . $specialCaseTagInjection;
+                $appendContent = implode("", $workTag).$specialCaseTagInjection;
                 if (isset($workTag[0]) && false !== stripos($workTag[0], '<img')) {
                     $appendContent = $this->wrapText($appendContent, $tag, $cssClass);
                 }
@@ -593,7 +593,7 @@ 
      */
     protected function checkCondition($word, $condition)
     {
-        return $condition == 'tag' ? $this->isTag( $word ) : !$this->isTag( $word );
+        return $condition == 'tag' ? $this->isTag($word) : !$this->isTag($word);
     }
 
     /**
@@ -605,7 +605,7 @@ 
      */
     protected function wrapText($text, $tagName, $cssClass)
     {
-        return sprintf( '<%1$s class="%2$s">%3$s</%1$s>', $tagName, $cssClass, $text );
+        return sprintf('<%1$s class="%2$s">%3$s</%1$s>', $tagName, $cssClass, $text);
     }
 
     /**
@@ -619,7 +619,7 @@ 
         $indexOfFirstTag = null;
         $words = array_values($words);
         foreach ($words as $i => $word) {
-            if ( !$this->checkCondition( $word, $condition ) ) {
+            if (!$this->checkCondition($word, $condition)) {
                 $indexOfFirstTag = $i;
                 break;
             }
@@ -632,18 +632,18 @@ 
                 }
             }
             if ($indexOfFirstTag > 0) {
-                array_splice( $words, 0, $indexOfFirstTag );
+                array_splice($words, 0, $indexOfFirstTag);
             }
 
             return $items;
         } else {
             $items = array();
             foreach ($words as $pos => $s) {
-                if ( $pos >= 0 && $pos <= count( $words ) ) {
+                if ($pos >= 0 && $pos <= count($words)) {
                     $items[] = $s;
                 }
             }
-            array_splice( $words, 0, count( $words ) );
+            array_splice($words, 0, count($words));
 
             return $items;
         }
@@ -656,7 +656,7 @@ 
      */
     protected function isTag($item)
     {
-        return $this->isOpeningTag( $item ) || $this->isClosingTag( $item );
+        return $this->isOpeningTag($item) || $this->isClosingTag($item);
     }
 
     /**
@@ -666,7 +666,7 @@ 
      */
     protected function isOpeningTag($item)
     {
-        return preg_match( "#<[^>]+>\\s*#iU", $item );
+        return preg_match("#<[^>]+>\\s*#iU", $item);
     }
 
     /**
@@ -676,7 +676,7 @@ 
      */
     protected function isClosingTag($item)
     {
-        return preg_match( "#</[^>]+>\\s*#iU", $item );
+        return preg_match("#</[^>]+>\\s*#iU", $item);
     }
 
     /**
@@ -688,10 +688,10 @@ 
         $positionInNew = 0;
         $operations = array();
         $matches = $this->matchingBlocks();
-        $matches[] = new Match( count( $this->oldWords ), count( $this->newWords ), 0 );
+        $matches[] = new Match(count($this->oldWords), count($this->newWords), 0);
         foreach ($matches as $i => $match) {
-            $matchStartsAtCurrentPositionInOld = ( $positionInOld == $match->startInOld );
-            $matchStartsAtCurrentPositionInNew = ( $positionInNew == $match->startInNew );
+            $matchStartsAtCurrentPositionInOld = ($positionInOld == $match->startInOld);
+            $matchStartsAtCurrentPositionInNew = ($positionInNew == $match->startInNew);
             $action = 'none';
 
             if ($matchStartsAtCurrentPositionInOld == false && $matchStartsAtCurrentPositionInNew == false) {
@@ -704,10 +704,10 @@ 
                 $action = 'none';
             }
             if ($action != 'none') {
-                $operations[] = new Operation( $action, $positionInOld, $match->startInOld, $positionInNew, $match->startInNew );
+                $operations[] = new Operation($action, $positionInOld, $match->startInOld, $positionInNew, $match->startInNew);
             }
-            if ( count( $match ) != 0 ) {
-                $operations[] = new Operation( 'equal', $match->startInOld, $match->endInOld(), $match->startInNew, $match->endInNew() );
+            if (count($match) != 0) {
+                $operations[] = new Operation('equal', $match->startInOld, $match->endInOld(), $match->startInNew, $match->endInNew());
             }
             $positionInOld = $match->endInOld();
             $positionInNew = $match->endInNew();
@@ -722,7 +722,7 @@ 
     protected function matchingBlocks()
     {
         $matchingBlocks = array();
-        $this->findMatchingBlocks( 0, count( $this->oldWords ), 0, count( $this->newWords ), $matchingBlocks );
+        $this->findMatchingBlocks(0, count($this->oldWords), 0, count($this->newWords), $matchingBlocks);
 
         return $matchingBlocks;
     }
@@ -736,14 +736,14 @@ 
      */
     protected function findMatchingBlocks($startInOld, $endInOld, $startInNew, $endInNew, &$matchingBlocks)
     {
-        $match = $this->findMatch( $startInOld, $endInOld, $startInNew, $endInNew );
+        $match = $this->findMatch($startInOld, $endInOld, $startInNew, $endInNew);
         if ($match !== null) {
             if ($startInOld < $match->startInOld && $startInNew < $match->startInNew) {
-                $this->findMatchingBlocks( $startInOld, $match->startInOld, $startInNew, $match->startInNew, $matchingBlocks );
+                $this->findMatchingBlocks($startInOld, $match->startInOld, $startInNew, $match->startInNew, $matchingBlocks);
             }
             $matchingBlocks[] = $match;
-            if ( $match->endInOld() < $endInOld && $match->endInNew() < $endInNew ) {
-                $this->findMatchingBlocks( $match->endInOld(), $endInOld, $match->endInNew(), $endInNew, $matchingBlocks );
+            if ($match->endInOld() < $endInOld && $match->endInNew() < $endInNew) {
+                $this->findMatchingBlocks($match->endInOld(), $endInOld, $match->endInNew(), $endInNew, $matchingBlocks);
             }
         }
     }
@@ -755,9 +755,9 @@ 
      */
     protected function stripTagAttributes($word)
     {
-        $word = explode( ' ', trim( $word, '<>' ) );
+        $word = explode(' ', trim($word, '<>'));
 
-        return '<' . $word[ 0 ] . '>';
+        return '<'.$word[0].'>';
     }
 
     /**
@@ -776,23 +776,23 @@ 
         $matchLengthAt = array();
         for ($indexInOld = $startInOld; $indexInOld < $endInOld; $indexInOld++) {
             $newMatchLengthAt = array();
-            $index = $this->oldWords[ $indexInOld ];
-            if ( $this->isTag( $index ) ) {
-                $index = $this->stripTagAttributes( $index );
+            $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() &&