Skip to content

Commit b6fa08d

Browse files
committed
Strip out SequenceMatcher as an external package
Signed-off-by: Jack Cherng <[email protected]>
1 parent 2349bb2 commit b6fa08d

13 files changed

+62
-675
lines changed

.phan/config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
// your application should be included in this list.
1717
'directory_list' => [
1818
'src',
19-
'vendor/jfcherng/php-levenshtein-distance/src',
2019
'vendor/jfcherng/php-mb-string/src',
20+
'vendor/jfcherng/php-sequence-matcher/src',
2121
],
2222

2323
// A directory list that defines files that will be excluded

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
},
2626
"require": {
2727
"php": "^7.1.3",
28-
"jfcherng/php-mb-string": "^1.3"
28+
"jfcherng/php-mb-string": "^1.3",
29+
"jfcherng/php-sequence-matcher": "^1.0"
2930
},
3031
"require-dev": {
3132
"friendsofphp/php-cs-fixer": "^2.14",

composer.lock

Lines changed: 51 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Diff.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
namespace Jfcherng\Diff;
66

77
use Jfcherng\Diff\Renderer\AbstractRenderer;
8-
use Jfcherng\Diff\Utility\SequenceMatcher;
98

109
/**
1110
* A comprehensive library for generating differences between two strings

src/Renderer/Html/AbstractHtml.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
use Jfcherng\Diff\Renderer\AbstractRenderer;
88
use Jfcherng\Diff\Renderer\Html\LineRenderer\AbstractLineRenderer;
9+
use Jfcherng\Diff\SequenceMatcher;
910
use Jfcherng\Diff\Utility\LineRendererFactory;
10-
use Jfcherng\Diff\Utility\SequenceMatcher;
1111
use Jfcherng\Utility\MbString;
1212

1313
/**

src/Renderer/Html/Inline.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Jfcherng\Diff\Renderer\Html;
66

7-
use Jfcherng\Diff\Utility\SequenceMatcher;
7+
use Jfcherng\Diff\SequenceMatcher;
88

99
/**
1010
* Inline HTML diff generator.

src/Renderer/Html/LineRenderer/AbstractLineRenderer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
namespace Jfcherng\Diff\Renderer\Html\LineRenderer;
66

77
use Jfcherng\Diff\Renderer\ReservedConstantInterface;
8-
use Jfcherng\Diff\Utility\SequenceMatcher;
8+
use Jfcherng\Diff\SequenceMatcher;
99

1010
abstract class AbstractLineRenderer implements LineRendererInterface, ReservedConstantInterface
1111
{

src/Renderer/Html/LineRenderer/Char.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
namespace Jfcherng\Diff\Renderer\Html\LineRenderer;
66

7+
use Jfcherng\Diff\SequenceMatcher;
78
use Jfcherng\Diff\Utility\ReverseIterator;
8-
use Jfcherng\Diff\Utility\SequenceMatcher;
99
use Jfcherng\Utility\MbString;
1010

1111
final class Char extends AbstractLineRenderer

src/Renderer/Html/LineRenderer/Word.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
namespace Jfcherng\Diff\Renderer\Html\LineRenderer;
66

7+
use Jfcherng\Diff\SequenceMatcher;
78
use Jfcherng\Diff\Utility\ReverseIterator;
8-
use Jfcherng\Diff\Utility\SequenceMatcher;
99
use Jfcherng\Utility\MbString;
1010

1111
final class Word extends AbstractLineRenderer

src/Renderer/Html/SideBySide.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Jfcherng\Diff\Renderer\Html;
66

7-
use Jfcherng\Diff\Utility\SequenceMatcher;
7+
use Jfcherng\Diff\SequenceMatcher;
88

99
/**
1010
* Side by Side HTML diff generator.

src/Renderer/Text/Context.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Jfcherng\Diff\Renderer\Text;
66

7-
use Jfcherng\Diff\Utility\SequenceMatcher;
7+
use Jfcherng\Diff\SequenceMatcher;
88

99
/**
1010
* Context diff generator.

src/Renderer/Text/Unified.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Jfcherng\Diff\Renderer\Text;
66

7-
use Jfcherng\Diff\Utility\SequenceMatcher;
7+
use Jfcherng\Diff\SequenceMatcher;
88

99
/**
1010
* Unified diff generator.

0 commit comments

Comments
 (0)