Skip to content

Commit f3a749c

Browse files
xercxerc
authored
Merge branch 'composer:main' into main
2 parents dd4b4be + 71e8395 commit f3a749c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+955
-335
lines changed

‎.github/ISSUE_TEMPLATE.md

-33
This file was deleted.

‎.github/ISSUE_TEMPLATE/bug_report.md

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
type: Bug
6+
assignees: ''
7+
8+
---
9+
10+
My `composer.json`:
11+
12+
```json
13+
...replace me...
14+
```
15+
16+
Output of `composer diagnose`:
17+
18+
```
19+
...replace me...
20+
```
21+
22+
When I run this command: <!-- run it with `-vvv` added to it ideally to get full debug output -->
23+
24+
```
25+
...replace me...
26+
```
27+
28+
I get the following output: <!-- FULL OUTPUT please, not just what you think is relevant -->
29+
30+
```
31+
...replace me...
32+
```
33+
34+
And I expected this to happen:

‎.github/ISSUE_TEMPLATE/feature_request.md

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
type: Feature
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

‎.github/ISSUE_TEMPLATE/support-request---question.md

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
name: Support request / question
3+
about: Confused, looking for assistance, and you don't like GitHub Discussions?
4+
title: ''
5+
type: Support
6+
assignees: ''
7+
8+
---
9+
10+
My `composer.json`:
11+
12+
```json
13+
...replace me...
14+
```
15+
16+
Output of `composer diagnose`:
17+
18+
```
19+
...replace me...
20+
```
21+
22+
When I run this command: <!-- run it with `-vvv` added to it ideally to get full debug output -->
23+
24+
```
25+
...replace me...
26+
```
27+
28+
I get the following output: <!-- FULL OUTPUT please, not just what you think is relevant -->
29+
30+
```
31+
...replace me...
32+
```
33+
34+
And I expected this to happen:

‎.github/dependabot.yml

+1
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ updates:
44
directory: "/"
55
schedule:
66
interval: "weekly"
7+
labels: []

‎.github/workflows/release.yml

+7
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ jobs:
1515
build:
1616
permissions:
1717
contents: write # for actions/create-release to create a release
18+
id-token: write # for actions/attest-build-provenance to create a attestation certificate
19+
attestations: write # for actions/attest-build-provenance to upload the attestation
1820
name: Upload Release Asset
1921
runs-on: ubuntu-latest
2022
steps:
@@ -41,6 +43,11 @@ jobs:
4143
- name: Build phar file
4244
run: "php -d phar.readonly=0 bin/compile"
4345

46+
- name: Generate build provenance attestation
47+
uses: actions/attest-build-provenance@v2
48+
with:
49+
subject-path: '${{ github.workspace }}/composer.phar'
50+
4451
- name: Create release
4552
id: create_release
4653
uses: actions/create-release@v1

‎CHANGELOG.md

+37
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,37 @@
1+
### [2.8.6] 2025-02-25
2+
3+
* Added `COMPOSER_WITH_DEPENDENCIES` and `COMPOSER_WITH_ALL_DEPENDENCIES` env vars to enable the `--with[-all]-dependencies` flags (#12289)
4+
* Added `COMPOSER_SKIP_SCRIPTS` env var to tell Composer to skip certain script handlers by script names (comma separated) (#12290)
5+
* Added error hint when Avast is detected together with curl certificate errors (#9894)
6+
* Fixed handling of backslash in folder names when creating archives (#12327)
7+
* Fixed detection of containerd for containers to avoid warning about root usage (#12299)
8+
9+
### [2.8.5] 2025-01-21
10+
11+
* Added build provenance attestation so you can also now download and verify phar files from GitHub releases:
12+
13+
gh release --repo composer/composer download --pattern composer.phar
14+
gh attestation verify --repo composer/composer composer.phar
15+
16+
* Fixed unsupported `funding` values causing parse errors in packages (#12247)
17+
* Fixed support for a few newer funding formats (#12257)
18+
* Fixed InstalledVersions regression from 2.8.4 when `reload()` is used (#12269)
19+
* Fixed psr-0/psr-4 rules having unstable order in `vendor/composer/autoload*.php` (#12263)
20+
* Fixed a few warnings happening incorrectly in edge cases (#12284, #12268, #12283)
21+
22+
### [2.8.4] 2024-12-11
23+
24+
* Fixed exit code of the `audit` command not being meaningful (now 1 for vulnerabilities and 2 for abandoned, 3 for both) (#12203)
25+
* Fixed issue on plugin upgrade when it defines multiple classes (#12226)
26+
* Fixed duplicate errors appearing in the output depending on php settings (#12214)
27+
* Fixed InstalledVersions returning duplicate data in some instances (#12225)
28+
* Fixed installed.php sorting to be deterministic (#12197)
29+
* Fixed `bump-after-update` failing when using inline constraints (#12223)
30+
* Fixed `create-project` command to now disable symlinking when used with a path repo as argument (#12222)
31+
* Fixed `validate --no-check-publish` to hide publish errors entirely as they are irrelevant (#12196)
32+
* Fixed `audit` command returning a failing code when composer audit fails as this should not trigger build failures, but running audit as standard part of your build is probably a terrible idea anyway (#12196)
33+
* Fixed curl usage to disable multiplexing on broken versions when proxies are in use (#12207)
34+
135
### [2.8.3] 2024-11-17
236

337
* Fixed windows handling of process discovery (#12180)
@@ -1960,6 +1994,9 @@
19601994

19611995
* Initial release
19621996

1997+
[2.8.6]: https://github.com/composer/composer/compare/2.8.5...2.8.6
1998+
[2.8.5]: https://github.com/composer/composer/compare/2.8.4...2.8.5
1999+
[2.8.4]: https://github.com/composer/composer/compare/2.8.3...2.8.4
19632000
[2.8.3]: https://github.com/composer/composer/compare/2.8.2...2.8.3
19642001
[2.8.2]: https://github.com/composer/composer/compare/2.8.1...2.8.2
19652002
[2.8.1]: https://github.com/composer/composer/compare/2.8.0...2.8.1

‎bin/composer

+6-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,12 @@ if (!extension_loaded('iconv') && !extension_loaded('mbstring')) {
4242
}
4343

4444
if (function_exists('ini_set')) {
45-
@ini_set('display_errors', '1');
45+
// check if error logging is on, but to an empty destination - for the CLI SAPI, that means stderr
46+
$logsToSapiDefault = ('' === ini_get('error_log') && (bool) ini_get('log_errors'));
47+
// on the CLI SAPI, ensure errors are displayed on stderr, either via display_errors or via error_log
48+
if (PHP_SAPI === 'cli') {
49+
@ini_set('display_errors', $logsToSapiDefault ? '0' : 'stderr');
50+
}
4651

4752
// Set user defined memory limit
4853
if ($memoryLimit = getenv('COMPOSER_MEMORY_LIMIT')) {

0 commit comments

Comments
 (0)