From 4f2e2ec4fc9e703278a5355226ee1c7c67972c49 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 4 Feb 2022 16:59:57 +0100 Subject: [PATCH 1/4] Update docs for renamed COMPOSER_RUNTIME_BIN_DIR --- doc/articles/vendor-binaries.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/articles/vendor-binaries.md b/doc/articles/vendor-binaries.md index f55c92692..6ce952a4e 100644 --- a/doc/articles/vendor-binaries.md +++ b/doc/articles/vendor-binaries.md @@ -99,8 +99,8 @@ As of Composer 2.2.2, a new `$_composer_bin_dir` global variable is defined by the bin proxy file, so that when your binary gets executed it can use it to easily locate the project's autoloader. -For non-PHP binaries, the bin proxy sets a `COMPOSER_BIN_DIR` environment -variable. +For non-PHP binaries, as of Composer 2.2.6, the bin proxy sets a +`COMPOSER_RUNTIME_BIN_DIR` environment variable. This global variable will not be available however when running binaries defined by the root package itself, so you need to have a fallback in place. @@ -116,10 +116,10 @@ $binDir = $_composer_bin_dir ?? __DIR__ . '/../vendor/bin'; ```php #!/bin/bash -if [[ -z "$COMPOSER_BIN_DIR" ]]; then +if [[ -z "$COMPOSER_RUNTIME_BIN_DIR" ]]; then BIN_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" else - BIN_DIR="$COMPOSER_BIN_DIR" + BIN_DIR="$COMPOSER_RUNTIME_BIN_DIR" fi ``` From 809b372997fb4b1f6673fd1d15a1e39fdb0e8cb2 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 4 Feb 2022 17:00:30 +0100 Subject: [PATCH 2/4] Update changelog for 2.2.6 --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94efa9e93..ff1ac0e34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +### [2.2.6] 2022-02-04 + + * BC Break: due to an oversight, the `COMPOSER_BIN_DIR` env var for binaries added in Composer 2.2.2 had to be renamed to `COMPOSER_RUNTIME_BIN_DIR` (#10512) + * Fixed enum parsing in classmap generation with syntax like `enum foo:string` without space after `:` (#10498) + * Fixed package search not urlencoding the input (#10500) + * Fixed `reinstall` command not firing `pre-install-cmd`/`post-install-cmd` events (#10514) + * Fixed edge case in path repositories where a symlink: true option would be ignored on old Windows and old PHP combos (#10482) + * Fixed test suite compatibility with latest symfony/console releases (#10499) + * Fixed some error reporting edge cases (#10484, #10451, #10493) + ### [2.2.5] 2022-01-21 * Disabled `composer/package-versions-deprecated` by default as it can function using `Composer\InstalledVersions` at runtime (#10458) @@ -1374,6 +1384,7 @@ * Initial release +[2.2.6]: https://github.com/composer/composer/compare/2.2.5...2.2.6 [2.2.5]: https://github.com/composer/composer/compare/2.2.4...2.2.5 [2.2.4]: https://github.com/composer/composer/compare/2.2.3...2.2.4 [2.2.3]: https://github.com/composer/composer/compare/2.2.2...2.2.3 From ce785a18c0fb472421e52d958bab339247cb0e82 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 4 Feb 2022 17:00:38 +0100 Subject: [PATCH 3/4] Release 2.2.6 --- 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 624e02507..8c74a689a 100644 --- a/src/Composer/Composer.php +++ b/src/Composer/Composer.php @@ -52,10 +52,10 @@ class Composer * const RELEASE_DATE = '@release_date@'; * const SOURCE_VERSION = '1.8-dev+source'; */ - const VERSION = '@package_version@'; - const BRANCH_ALIAS_VERSION = '@package_branch_alias_version@'; - const RELEASE_DATE = '@release_date@'; - const SOURCE_VERSION = '2.2.999-dev+source'; + const VERSION = '2.2.6'; + const BRANCH_ALIAS_VERSION = ''; + const RELEASE_DATE = '2022-02-04 17:00:38'; + const SOURCE_VERSION = ''; /** * Version number of the internal composer-runtime-api package From 2c318ff09b40658267bc22034c7ad5de4fa856db Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 4 Feb 2022 17:00:39 +0100 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 8c74a689a..624e02507 100644 --- a/src/Composer/Composer.php +++ b/src/Composer/Composer.php @@ -52,10 +52,10 @@ class Composer * const RELEASE_DATE = '@release_date@'; * const SOURCE_VERSION = '1.8-dev+source'; */ - const VERSION = '2.2.6'; - const BRANCH_ALIAS_VERSION = ''; - const RELEASE_DATE = '2022-02-04 17:00:38'; - const SOURCE_VERSION = ''; + const VERSION = '@package_version@'; + const BRANCH_ALIAS_VERSION = '@package_branch_alias_version@'; + const RELEASE_DATE = '@release_date@'; + const SOURCE_VERSION = '2.2.999-dev+source'; /** * Version number of the internal composer-runtime-api package