@@ -229,8 +229,8 @@ discard block |
||
| 229 | 229 | |
| 230 | 230 | /** |
| 231 | 231 | * @param Operation $operation |
| 232 | - * @param array $oldRows |
|
| 233 | - * @param array $newRows |
|
| 232 | + * @param TableRow[] $oldRows |
|
| 233 | + * @param TableRow[] $newRows |
|
| 234 | 234 | * @param array $appliedRowSpans |
| 235 | 235 | */ |
| 236 | 236 | protected function processEqualOperation(Operation $operation, $oldRows, $newRows, &$appliedRowSpans) |
@@ -249,8 +249,8 @@ discard block |
||
| 249 | 249 | |
| 250 | 250 | /** |
| 251 | 251 | * @param Operation $operation |
| 252 | - * @param array $oldRows |
|
| 253 | - * @param array $newRows |
|
| 252 | + * @param TableRow[] $oldRows |
|
| 253 | + * @param TableRow[] $newRows |
|
| 254 | 254 | * @param array $appliedRowSpans |
| 255 | 255 | */ |
| 256 | 256 | protected function processReplaceOperation(Operation $operation, $oldRows, $newRows, &$appliedRowSpans) |
@@ -95,7 +95,7 @@ |
||
| 95 | 95 | /** |
| 96 | 96 | * @param int $matchThreshold |
| 97 | 97 | * |
| 98 | - * @return AbstractDiff |
|
| 98 | + * @return HtmlDiffConfig |
|
| 99 | 99 | */ |
| 100 | 100 | public function setMatchThreshold($matchThreshold) |
| 101 | 101 | { |
@@ -4,6 +4,11 @@ discard block |
||
| 4 | 4 | |
| 5 | 5 | class Preprocessor |
| 6 | 6 | { |
| 7 | + /** |
|
| 8 | + * @param string $old |
|
| 9 | + * @param string $new |
|
| 10 | + * @param Util\MbStringUtil $stringUtil |
|
| 11 | + */ |
|
| 7 | 12 | public static function diffCommonPrefix($old, $new, $stringUtil) |
| 8 | 13 | { |
| 9 | 14 | // Quick check for common null cases. |
@@ -34,6 +39,11 @@ discard block |
||
| 34 | 39 | return $pointerMid; |
| 35 | 40 | } |
| 36 | 41 | |
| 42 | + /** |
|
| 43 | + * @param string $old |
|
| 44 | + * @param string $new |
|
| 45 | + * @param Util\MbStringUtil $stringUtil |
|
| 46 | + */ |
|
| 37 | 47 | public static function diffCommonSuffix($old, $new, $stringUtil) |
| 38 | 48 | { |
| 39 | 49 | // Quick check for common null cases. |
@@ -30,6 +30,6 @@ |
||
| 30 | 30 | |
| 31 | 31 | public function count() : int |
| 32 | 32 | { |
| 33 | - return (int)$this->size; |
|
| 33 | + return (int) $this->size; |
|
| 34 | 34 | } |
| 35 | 35 | } |
@@ -27,8 +27,8 @@ discard block |
||
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | /** |
| 30 | - * @param array $a |
|
| 31 | - * @param array $b |
|
| 30 | + * @param string[] $a |
|
| 31 | + * @param string[] $b |
|
| 32 | 32 | * |
| 33 | 33 | * @return array |
| 34 | 34 | */ |
@@ -70,8 +70,8 @@ discard block |
||
| 70 | 70 | * @param $c |
| 71 | 71 | * @param $a |
| 72 | 72 | * @param $b |
| 73 | - * @param $i |
|
| 74 | - * @param $j |
|
| 73 | + * @param integer $i |
|
| 74 | + * @param integer $j |
|
| 75 | 75 | * @param $matches |
| 76 | 76 | */ |
| 77 | 77 | protected function compileMatches($c, $a, $b, $i, $j, &$matches) |
@@ -396,6 +396,12 @@ |
||
| 396 | 396 | return $diff->build(); |
| 397 | 397 | } |
| 398 | 398 | |
| 399 | + /** |
|
| 400 | + * @param string $oldText |
|
| 401 | + * @param string $newText |
|
| 402 | + * @param string $attribute |
|
| 403 | + * @param string $element |
|
| 404 | + */ |
|
| 399 | 405 | protected function diffElementsByAttribute($oldText, $newText, $attribute, $element) |
| 400 | 406 | { |
| 401 | 407 | $oldAttribute = $this->getAttributeFromTag($oldText, $attribute); |
@@ -545,7 +545,7 @@ discard block |
||
| 545 | 545 | } else { |
| 546 | 546 | $firstOrDefault = false; |
| 547 | 547 | foreach ($this->config->getSpecialCaseOpeningTags() as $x) { |
| 548 | - if (preg_match($x, $words[ 0 ])) { |
|
| 548 | + if (preg_match($x, $words[0])) { |
|
| 549 | 549 | $firstOrDefault = $x; |
| 550 | 550 | break; |
| 551 | 551 | } |
@@ -553,13 +553,13 @@ discard block |
||
| 553 | 553 | if ($firstOrDefault) { |
| 554 | 554 | $specialCaseTagInjection = '<ins class="mod">'; |
| 555 | 555 | if ($tag === 'del') { |
| 556 | - unset($words[ 0 ]); |
|
| 556 | + unset($words[0]); |
|
| 557 | 557 | } |
| 558 | - } elseif (array_search($words[ 0 ], $this->config->getSpecialCaseClosingTags()) !== false) { |
|
| 558 | + } elseif (array_search($words[0], $this->config->getSpecialCaseClosingTags()) !== false) { |
|
| 559 | 559 | $specialCaseTagInjection = '</ins>'; |
| 560 | 560 | $specialCaseTagInjectionIsBefore = true; |
| 561 | 561 | if ($tag === 'del') { |
| 562 | - unset($words[ 0 ]); |
|
| 562 | + unset($words[0]); |
|
| 563 | 563 | } |
| 564 | 564 | } |
| 565 | 565 | } |
@@ -567,7 +567,7 @@ discard block |
||
| 567 | 567 | break; |
| 568 | 568 | } |
| 569 | 569 | if ($specialCaseTagInjectionIsBefore) { |
| 570 | - $this->content .= $specialCaseTagInjection . implode('', $this->extractConsecutiveWords($words, 'tag')); |
|
| 570 | + $this->content .= $specialCaseTagInjection.implode('', $this->extractConsecutiveWords($words, 'tag')); |
|
| 571 | 571 | } else { |
| 572 | 572 | $workTag = $this->extractConsecutiveWords($words, 'tag'); |
| 573 | 573 | |
@@ -589,7 +589,7 @@ discard block |
||
| 589 | 589 | } |
| 590 | 590 | } |
| 591 | 591 | |
| 592 | - $appendContent = implode('', $workTag) . $specialCaseTagInjection; |
|
| 592 | + $appendContent = implode('', $workTag).$specialCaseTagInjection; |
|
| 593 | 593 | |
| 594 | 594 | if (isset($workTag[0]) === true && $this->stringUtil->stripos($workTag[0], '<img') !== false) { |
| 595 | 595 | $appendContent = $this->wrapText($appendContent, $tag, $cssClass); |
@@ -765,7 +765,7 @@ discard block |
||
| 765 | 765 | $space = $this->stringUtil->strpos($word, ' ', 1); |
| 766 | 766 | |
| 767 | 767 | if ($space > 0) { |
| 768 | - return '<' . $this->stringUtil->substr($word, 1, $space) . '>'; |
|
| 768 | + return '<'.$this->stringUtil->substr($word, 1, $space).'>'; |
|
| 769 | 769 | } |
| 770 | 770 | |
| 771 | 771 | return trim($word, '<>'); |
@@ -782,7 +782,7 @@ discard block |
||
| 782 | 782 | for ($indexInOld = $startInOld; $indexInOld < $endInOld; ++$indexInOld) { |
| 783 | 783 | $newMatchLengthAt = []; |
| 784 | 784 | |
| 785 | - $index = $this->oldWords[ $indexInOld ]; |
|
| 785 | + $index = $this->oldWords[$indexInOld]; |
|
| 786 | 786 | |
| 787 | 787 | if ($this->isTag($index) === true) { |
| 788 | 788 | $index = $this->stripTagAttributes($index); |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | |
| 99 | 99 | protected function findListNode(DOMDocument $dom) : DOMNode |
| 100 | 100 | { |
| 101 | - $xPathQuery = '//' . implode('|//', self::LIST_TAG_NAMES); |
|
| 101 | + $xPathQuery = '//'.implode('|//', self::LIST_TAG_NAMES); |
|
| 102 | 102 | $xPath = new DOMXPath($dom); |
| 103 | 103 | $listNodes = $xPath->query($xPathQuery); |
| 104 | 104 | |
@@ -385,7 +385,7 @@ discard block |
||
| 385 | 385 | { |
| 386 | 386 | $bufferDom = new DOMDocument('1.0', 'UTF-8'); |
| 387 | 387 | |
| 388 | - foreach($node->childNodes as $childNode) |
|
| 388 | + foreach ($node->childNodes as $childNode) |
|
| 389 | 389 | { |
| 390 | 390 | $bufferDom->appendChild($bufferDom->importNode($childNode, true)); |
| 391 | 391 | } |
@@ -403,7 +403,7 @@ discard block |
||
| 403 | 403 | } |
| 404 | 404 | |
| 405 | 405 | /** |
| 406 | - * @param array $oldWords |
|
| 406 | + * @param string[] $oldWords |
|
| 407 | 407 | */ |
| 408 | 408 | protected function setOldWords(array $oldWords) |
| 409 | 409 | { |
@@ -412,7 +412,7 @@ discard block |
||
| 412 | 412 | } |
| 413 | 413 | |
| 414 | 414 | /** |
| 415 | - * @param array $newWords |
|
| 415 | + * @param string[] $newWords |
|
| 416 | 416 | */ |
| 417 | 417 | protected function setNewWords(array $newWords) |
| 418 | 418 | { |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | public function initPurifier($defaultPurifierSerializerCache = null) |
| 130 | 130 | { |
| 131 | 131 | if (null !== $this->purifierConfig) { |
| 132 | - $HTMLPurifierConfig = $this->purifierConfig; |
|
| 132 | + $HTMLPurifierConfig = $this->purifierConfig; |
|
| 133 | 133 | } else { |
| 134 | 134 | $HTMLPurifierConfig = HTMLPurifier_Config::createDefault(); |
| 135 | 135 | } |
@@ -431,7 +431,7 @@ discard block |
||
| 431 | 431 | $specialCharacters = ''; |
| 432 | 432 | |
| 433 | 433 | foreach ($this->config->getSpecialCaseChars() as $char) { |
| 434 | - $specialCharacters .= '\\' . $char; |
|
| 434 | + $specialCharacters .= '\\'.$char; |
|
| 435 | 435 | } |
| 436 | 436 | |
| 437 | 437 | // Normalize no-break-spaces to regular spaces |
@@ -462,7 +462,7 @@ discard block |
||
| 462 | 462 | |
| 463 | 463 | preg_match_all( |
| 464 | 464 | $regex, |
| 465 | - $sentenceOrHtmlTag . ' ', // Inject a space at the end to make sure the last word is found by having a space behind it. |
|
| 465 | + $sentenceOrHtmlTag.' ', // Inject a space at the end to make sure the last word is found by having a space behind it. |
|
| 466 | 466 | $sentenceSplitIntoWords, |
| 467 | 467 | PREG_SPLIT_NO_EMPTY |
| 468 | 468 | ); |
@@ -489,14 +489,14 @@ discard block |
||
| 489 | 489 | |
| 490 | 490 | $sentenceLength = $this->stringUtil->strlen($sentence); |
| 491 | 491 | $firstCharacter = $this->stringUtil->substr($sentence, 0, 1); |
| 492 | - $lastCharacter = $this->stringUtil->substr($sentence, $sentenceLength -1, 1); |
|
| 492 | + $lastCharacter = $this->stringUtil->substr($sentence, $sentenceLength - 1, 1); |
|
| 493 | 493 | |
| 494 | 494 | if ($firstCharacter === ' ' || $firstCharacter === "\r" || $firstCharacter === "\n") { |
| 495 | - $sentence = ' ' . ltrim($sentence); |
|
| 495 | + $sentence = ' '.ltrim($sentence); |
|
| 496 | 496 | } |
| 497 | 497 | |
| 498 | 498 | if ($sentenceLength > 1 && ($lastCharacter === ' ' || $lastCharacter === "\r" || $lastCharacter === "\n")) { |
| 499 | - $sentence = rtrim($sentence) . ' '; |
|
| 499 | + $sentence = rtrim($sentence).' '; |
|
| 500 | 500 | } |
| 501 | 501 | |
| 502 | 502 | return $sentence; |