caxy / php-htmldiff

lib/Caxy/HtmlDiff/HtmlDiff.php

Spacing +8 added lines, -8 removed lines

@@ -545,7 +545,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;
                     }
@@ -553,13 +553,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]);
                     }
                 }
             }
@@ -567,7 +567,7 @@ 
                 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');
 
@@ -589,7 +589,7 @@ 
                     }
                 }
 
-                $appendContent = implode('', $workTag) . $specialCaseTagInjection;
+                $appendContent = implode('', $workTag).$specialCaseTagInjection;
 
                 if (isset($workTag[0]) === true && $this->stringUtil->stripos($workTag[0], '<img') !== false) {
                     $appendContent = $this->wrapText($appendContent, $tag, $cssClass);
@@ -765,7 +765,7 @@ 
         $space = $this->stringUtil->strpos($word, ' ', 1);
 
         if ($space > 0) {
-            return '<' . $this->stringUtil->substr($word, 1, $space) . '>';
+            return '<'.$this->stringUtil->substr($word, 1, $space).'>';
         }
 
         return trim($word, '<>');
@@ -782,7 +782,7 @@ 
         for ($indexInOld = $startInOld; $indexInOld < $endInOld; ++$indexInOld) {
             $newMatchLengthAt = [];
 
-            $index = $this->oldWords[ $indexInOld ];
+            $index = $this->oldWords[$indexInOld];
 
             if ($this->isTag($index) === true) {
                 $index = $this->stripTagAttributes($index);

lib/Caxy/HtmlDiff/AbstractDiff.php

Doc Comments +2 added lines, -2 removed lines

@@ -403,7 +403,7 @@ 
     }
 
     /**
-     * @param array $oldWords
+     * @param string[] $oldWords
      */
     protected function setOldWords(array $oldWords)
     {
@@ -412,7 +412,7 @@ 
     }
 
     /**
-     * @param array $newWords
+     * @param string[] $newWords
      */
     protected function setNewWords(array $newWords)
     {

Spacing +10 added lines, -10 removed lines

@@ -129,7 +129,7 @@ 
     public function initPurifier($defaultPurifierSerializerCache = null)
     {
         if (null !== $this->purifierConfig) {
-            $HTMLPurifierConfig  = $this->purifierConfig;
+            $HTMLPurifierConfig = $this->purifierConfig;
         } else {
             $HTMLPurifierConfig = HTMLPurifier_Config::createDefault();
         }
@@ -431,7 +431,7 @@ 
         $specialCharacters = '';
 
         foreach ($this->config->getSpecialCaseChars() as $char) {
-            $specialCharacters .= '\\' . $char;
+            $specialCharacters .= '\\'.$char;
         }
 
         // Normalize no-break-spaces to regular spaces
@@ -457,12 +457,12 @@ 
             // Split regex compiles to this (in default config case);
             // /\s|[\.\,\(\)\']|[a-zA-Z0-9\.\,\(\)\'\pL]+(?=[\.\,\(\)\'][\s\r\n])|[a-zA-Z0-9\.\,\(\)\'\pL]+|[^\s]/mu
             preg_match_all(
-                '/\s|' .                                                                               // Every space is considered a word
-                '['. $specialCharacters . ']|' .                                                       // Special characters that are not part of a word
-                '[a-zA-Z0-9' . $specialCharacters . '\pL]+(?=[' . $specialCharacters . '][\s\r\n])|' . // Words with special characters, excluding the last special character
-                '[a-zA-Z0-9' . $specialCharacters . '\pL]+|' .                                         // All other regular words
-                '[^\s]/mu',                                                                            // Catch all for everything else
-                $sentenceOrHtmlTag . ' ', // Inject a space at the end to make sure the second regex always hits.
+                '/\s|'.// Every space is considered a word
+                '['.$specialCharacters.']|'.// Special characters that are not part of a word
+                '[a-zA-Z0-9'.$specialCharacters.'\pL]+(?=['.$specialCharacters.'][\s\r\n])|'.// Words with special characters, excluding the last special character
+                '[a-zA-Z0-9'.$specialCharacters.'\pL]+|'.// All other regular words
+                '[^\s]/mu', // Catch all for everything else
+                $sentenceOrHtmlTag.' ', // Inject a space at the end to make sure the second regex always hits.
                 $sentenceSplitIntoWords,
                 PREG_SPLIT_NO_EMPTY
             );
@@ -490,11 +490,11 @@ 
         $lastCharacter  = $sentence[$this->stringUtil->strlen($sentence) - 1];
 
         if ($firstCharacter === ' ' || $firstCharacter === "\r" || $firstCharacter === "\n") {
-            $sentence = ' ' . ltrim($sentence);
+            $sentence = ' '.ltrim($sentence);
         }
 
         if ($lastCharacter === ' ' || $lastCharacter === "\r" || $lastCharacter === "\n") {
-            $sentence = rtrim($sentence) . ' ';
+            $sentence = rtrim($sentence).' ';
         }
 
         return $sentence;