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

Merge branch '2.2' into main

pull/10488/head
Jordi Boggiano 2022-02-04 17:01:51 +01:00
parent 4b67a97a25 2c318ff09b
commit ac8fb8cc57
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CHANGELOG.md
View File

@ -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

8
doc/articles/vendor-binaries.md
View File

@ -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
```