Skip to content

Commit 280eb83

Browse files
committed
Merge branch 'master' into php-diff-82
2 parents 8954ed5 + 012effa commit 280eb83

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
### Composer ###
66
composer.phar
77
/vendor/
8+
/composer.lock
9+
/.phpunit.result.cache
10+
811

912
# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
1013
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
@@ -72,4 +75,3 @@ local.properties
7275

7376

7477
# End of https://www.gitignore.io/api/windows,eclipse,composer
75-
/composer.lock

lib/jblond/Diff/Similarity.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ private function getRatioFast(): float
159159
$aLength = count($this->old);
160160
for ($iterator = 0; $iterator < $aLength; ++$iterator) {
161161
$char = $this->old[$iterator];
162-
$numb = isset($avail[$char]) ? $avail[$char] : $this->uniqueCount2[$char] ?? 0;
162+
$numb = $avail[$char] ?? ($this->uniqueCount2[$char] ?? 0);
163163
$avail[$char] = $numb - 1;
164164
if ($numb > 0) {
165165
++$matches;

0 commit comments

Comments
 (0)