summaryrefslogtreecommitdiff
path: root/vendor/fisharebest
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@gmail.com>2016-11-07 22:54:11 +0000
committerGreg Roach <fisharebest@gmail.com>2016-11-07 22:59:06 +0000
commit8036587fabd36749d63282da1bc57f23cb9cc9c9 (patch)
tree5c5c3b104ae7a5dc9b88c04ae282b41a7fc61cd4 /vendor/fisharebest
parent48b99df060913d4e6802dc4e7542ec21ade0b1f2 (diff)
downloadwebtrees-8036587fabd36749d63282da1bc57f23cb9cc9c9.tar.gz
webtrees-8036587fabd36749d63282da1bc57f23cb9cc9c9.tar.bz2
webtrees-8036587fabd36749d63282da1bc57f23cb9cc9c9.zip
Update vendor code
Diffstat (limited to 'vendor/fisharebest')
-rw-r--r--vendor/fisharebest/algorithm/CHANGELOG.md4
-rw-r--r--vendor/fisharebest/algorithm/src/MyersDiff.php2
2 files changed, 5 insertions, 1 deletions
diff --git a/vendor/fisharebest/algorithm/CHANGELOG.md b/vendor/fisharebest/algorithm/CHANGELOG.md
index b8489bf5f8..4a050a3377 100644
--- a/vendor/fisharebest/algorithm/CHANGELOG.md
+++ b/vendor/fisharebest/algorithm/CHANGELOG.md
@@ -1,6 +1,10 @@
CHANGE LOG
==========
+## 1.2.0 (2016-11-07)
+ - Fix bug in Myers’ diff. Thanks to Andreas Brunnschweiler for finding the bug and the fix.
+ - Add PHP7.0 to unit tests.
+
## 1.1.0 (2015-10-20)
- Myers’ diff
diff --git a/vendor/fisharebest/algorithm/src/MyersDiff.php b/vendor/fisharebest/algorithm/src/MyersDiff.php
index ff0304be98..2588c1e0cf 100644
--- a/vendor/fisharebest/algorithm/src/MyersDiff.php
+++ b/vendor/fisharebest/algorithm/src/MyersDiff.php
@@ -64,7 +64,7 @@ class MyersDiff {
*/
private function extractSnakes(array $v_save, $x, $y) {
$snakes = array();
- for ($d = count($v_save) - 1; $x > 0 && $y > 0; --$d) {
+ for ($d = count($v_save) - 1; $x >= 0 && $y >= 0; --$d) {
array_unshift($snakes, array($x, $y));
$v = $v_save[$d];