From bb726b8a61027ff5f24e7529726645e5f650735d Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Thu, 27 Oct 2022 14:23:51 +0200 Subject: [PATCH 1/4] Fix status command reporting differences when source reference is a tag name, fixes #11155 --- src/Composer/Command/StatusCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Composer/Command/StatusCommand.php b/src/Composer/Command/StatusCommand.php index 417d166a4..42c20fcef 100644 --- a/src/Composer/Command/StatusCommand.php +++ b/src/Composer/Command/StatusCommand.php @@ -125,7 +125,7 @@ EOT $currentVersion = $guesser->guessVersion($dumper->dump($package), $targetDir); - if ($previousRef && $currentVersion && $currentVersion['commit'] !== $previousRef) { + if ($previousRef && $currentVersion && $currentVersion['commit'] !== $previousRef && $currentVersion['pretty_version'] !== $previousRef) { $vcsVersionChanges[$targetDir] = [ 'previous' => [ 'version' => $package->getPrettyVersion(), From 4900a14c3e47072384e7ab0fc745aa63258b435e Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Thu, 27 Oct 2022 14:38:51 +0200 Subject: [PATCH 2/4] Update changelog --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5bc09a840..a0ed40be4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +### [2.4.4] 2022-10-27 + + * Added extra debug output when a zip extraction fails while on GitHub Actions (#11148) + * Fixed cache write failures when the cache dir gets removed during a composer run (#11076) + * Fixed 2.4.3 regression in loading Composer on SMB/network shares (#11077) + * Fixed `--dry-run` flag missing from `bump` command (#11047) + * Fixed `status` command reporting differences when the source ref is a tag (#11155) + * Fixed outdated command outputting legend on stdout instead of stderr, and ensured it always outputs some status even when no dependencies are outdated (#11148) + * Fixed URL sanitizer to handle new GitHub personal access tokens format + ### [2.4.3] 2022-10-14 * BC Break: The json format of `audit` command now has `reportedAt` as an RFC3339 string instead of an object which was a mistake (#11120) @@ -1647,6 +1657,7 @@ * Initial release +[2.4.4]: https://github.com/composer/composer/compare/2.4.3...2.4.4 [2.4.3]: https://github.com/composer/composer/compare/2.4.2...2.4.3 [2.4.2]: https://github.com/composer/composer/compare/2.4.1...2.4.2 [2.4.1]: https://github.com/composer/composer/compare/2.4.0...2.4.1 From e8d9087229bcdbc5867594d3098091412f1130cf Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Thu, 27 Oct 2022 14:39:29 +0200 Subject: [PATCH 3/4] Release 2.4.4 --- src/Composer/Composer.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Composer/Composer.php b/src/Composer/Composer.php index c6f083dfd..0e33bed0f 100644 --- a/src/Composer/Composer.php +++ b/src/Composer/Composer.php @@ -51,10 +51,10 @@ class Composer extends PartialComposer * * @see getVersion() */ - public const VERSION = '@package_version@'; - public const BRANCH_ALIAS_VERSION = '@package_branch_alias_version@'; - public const RELEASE_DATE = '@release_date@'; - public const SOURCE_VERSION = '2.4.999-dev+source'; + public const VERSION = '2.4.4'; + public const BRANCH_ALIAS_VERSION = ''; + public const RELEASE_DATE = '2022-10-27 14:39:29'; + public const SOURCE_VERSION = ''; /** * Version number of the internal composer-runtime-api package From cc2e8b05e692ed2c6ed77aa01fe98755e6a33927 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Thu, 27 Oct 2022 14:39:29 +0200 Subject: [PATCH 4/4] Reverting release version changes --- src/Composer/Composer.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Composer/Composer.php b/src/Composer/Composer.php index 0e33bed0f..c6f083dfd 100644 --- a/src/Composer/Composer.php +++ b/src/Composer/Composer.php @@ -51,10 +51,10 @@ class Composer extends PartialComposer * * @see getVersion() */ - public const VERSION = '2.4.4'; - public const BRANCH_ALIAS_VERSION = ''; - public const RELEASE_DATE = '2022-10-27 14:39:29'; - public const SOURCE_VERSION = ''; + public const VERSION = '@package_version@'; + public const BRANCH_ALIAS_VERSION = '@package_branch_alias_version@'; + public const RELEASE_DATE = '@release_date@'; + public const SOURCE_VERSION = '2.4.999-dev+source'; /** * Version number of the internal composer-runtime-api package