diff --git a/CHANGELOG.md b/CHANGELOG.md index f52a54ea5..034337497 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/src/Composer/Package/Comparer/Comparer.php b/src/Composer/Package/Comparer/Comparer.php index c0ab98d9c..ed08cad42 100644 --- a/src/Composer/Package/Comparer/Comparer.php +++ b/src/Composer/Package/Comparer/Comparer.php @@ -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); } } }