public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge branch '1.10'

pull/9197/head
Jordi Boggiano 2020-09-08 17:04:03 +02:00
parent bce1e77c45 f4f952f1ce
commit 6f91e038ea
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -57,6 +57,12 @@
* Fixed suggest output being very spammy, it now is only one line long and shows more rarely
* Fixed conflict rules like e.g. >=5 from matching dev-master, as it is not normalized to 9999999-dev internally anymore
### [1.10.11] 2020-09-08
* Fixed more PHP 8 compatibility issues
* Fixed regression in handling of CTRL-C when xdebug is loaded
* Fixed `status` handling of broken symlinks
### [1.10.10] 2020-08-03
* Fixed `create-project` not triggering events while installing the root package
@ -941,6 +947,7 @@
[2.0.0-alpha3]: https://github.com/composer/composer/compare/2.0.0-alpha2...2.0.0-alpha3
[2.0.0-alpha2]: https://github.com/composer/composer/compare/2.0.0-alpha1...2.0.0-alpha2
[2.0.0-alpha1]: https://github.com/composer/composer/compare/1.10.7...2.0.0-alpha1
[1.10.11]: https://github.com/composer/composer/compare/1.10.10...1.10.11
[1.10.10]: https://github.com/composer/composer/compare/1.10.9...1.10.10
[1.10.9]: https://github.com/composer/composer/compare/1.10.8...1.10.9
[1.10.8]: https://github.com/composer/composer/compare/1.10.7...1.10.8

12
src/Composer/Package/Comparer/Comparer.php
View File

@ -102,18 +102,18 @@ class Comparer
if ($dh = opendir($dir)) {
while ($file = readdir($dh)) {
if ($file !== '.' && $file !== '..') {
if (is_dir($dir.'/'.$file)) {
if (is_link($dir.'/'.$file)) {
$array[$dir][$file] = readlink($dir.'/'.$file);
} elseif (is_dir($dir.'/'.$file)) {
if (!count($array)) {
$array[0] = 'Temp';
}
if (!$this->doTree($dir.'/'.$file, $array)) {
return false;
}
} else {
if (filesize($dir.'/'.$file)) {
set_time_limit(30);
$array[$dir][$file] = md5_file($dir.'/'.$file);
}
} elseif (is_file($dir.'/'.$file) && filesize($dir.'/'.$file)) {
set_time_limit(30);
$array[$dir][$file] = md5_file($dir.'/'.$file);
}
}
}