From e6b45e853aad1036118273c69c69e88138480f42 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Mon, 7 Sep 2020 13:54:14 +0200 Subject: [PATCH 1/3] Fix status command handling of symlinks, and especially broken ones, fixes #9169 --- src/Composer/Package/Comparer/Comparer.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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); } } } From e11d19c25589febd110c715829852e3f61e990e7 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 8 Sep 2020 16:45:52 +0200 Subject: [PATCH 2/3] Update deps --- composer.lock | 54 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 10 deletions(-) diff --git a/composer.lock b/composer.lock index 2ec2cc059..152718738 100644 --- a/composer.lock +++ b/composer.lock @@ -60,6 +60,11 @@ "ssl", "tls" ], + "support": { + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/ca-bundle/issues", + "source": "https://github.com/composer/ca-bundle/tree/1.2.8" + }, "funding": [ { "url": "https://packagist.com", @@ -78,16 +83,16 @@ }, { "name": "composer/semver", - "version": "1.5.1", + "version": "1.5.2", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "c6bea70230ef4dd483e6bbcab6005f682ed3a8de" + "reference": "610045d2a33b8e368abebc789f6f4180b4f88ab6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/c6bea70230ef4dd483e6bbcab6005f682ed3a8de", - "reference": "c6bea70230ef4dd483e6bbcab6005f682ed3a8de", + "url": "https://api.github.com/repos/composer/semver/zipball/610045d2a33b8e368abebc789f6f4180b4f88ab6", + "reference": "610045d2a33b8e368abebc789f6f4180b4f88ab6", "shasum": "" }, "require": { @@ -135,7 +140,21 @@ "validation", "versioning" ], - "time": "2020-01-13T12:06:48+00:00" + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2020-09-08T14:18:25+00:00" }, { "name": "composer/spdx-licenses", @@ -253,6 +272,11 @@ "Xdebug", "performance" ], + "support": { + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/xdebug-handler/issues", + "source": "https://github.com/composer/xdebug-handler/tree/1.4.3" + }, "funding": [ { "url": "https://packagist.com", @@ -387,16 +411,16 @@ }, { "name": "seld/jsonlint", - "version": "1.8.1", + "version": "1.8.2", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "3d5eb71705adfa34bd34b993400622932b2f62fd" + "reference": "590cfec960b77fd55e39b7d9246659e95dd6d337" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/3d5eb71705adfa34bd34b993400622932b2f62fd", - "reference": "3d5eb71705adfa34bd34b993400622932b2f62fd", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/590cfec960b77fd55e39b7d9246659e95dd6d337", + "reference": "590cfec960b77fd55e39b7d9246659e95dd6d337", "shasum": "" }, "require": { @@ -432,6 +456,10 @@ "parser", "validator" ], + "support": { + "issues": "https://github.com/Seldaek/jsonlint/issues", + "source": "https://github.com/Seldaek/jsonlint/tree/master" + }, "funding": [ { "url": "https://github.com/Seldaek", @@ -442,7 +470,7 @@ "type": "tidelift" } ], - "time": "2020-08-13T09:07:59+00:00" + "time": "2020-08-25T06:56:57+00:00" }, { "name": "seld/phar-utils", @@ -777,6 +805,9 @@ "polyfill", "portable" ], + "support": { + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.18.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -854,6 +885,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.18.1" + }, "funding": [ { "url": "https://symfony.com/sponsor", From f4f952f1cefb601a7f9ff8250a836ab6cb18946d Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 8 Sep 2020 16:53:29 +0200 Subject: [PATCH 3/3] Update changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e67556cf..994c7f367 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +### [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 @@ -879,6 +885,7 @@ * Initial release +[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