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

Merge branch '2.1' into main

pull/10327/head
Jordi Boggiano 2021-11-30 10:39:44 +01:00
parent 5d218287d9 fdfad6ac66
commit f758da32c9
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/continuous-integration.yml vendored
View File

@ -89,6 +89,10 @@ jobs:
- name: "Remove platform config to get latest dependencies for current PHP version when build is not locked" - name: "Remove platform config to get latest dependencies for current PHP version when build is not locked"
run: "composer config platform --unset" run: "composer config platform --unset"
- name: "Allow alpha releases for latest-deps builds to catch problems earlier"
if: "contains(matrix.dependencies, 'highest')"
run: "composer config minimum-stability alpha"
- name: "Update dependencies from composer.json using composer binary provided by system" - name: "Update dependencies from composer.json using composer binary provided by system"
if: "contains(matrix.dependencies, 'highest') || contains(matrix.dependencies, 'lowest')" if: "contains(matrix.dependencies, 'highest') || contains(matrix.dependencies, 'lowest')"
run: "composer update ${{ env.COMPOSER_UPDATE_FLAGS }} ${{ env.COMPOSER_FLAGS }}" run: "composer update ${{ env.COMPOSER_UPDATE_FLAGS }} ${{ env.COMPOSER_FLAGS }}"

5
CHANGELOG.md
View File

@ -1,3 +1,7 @@
### [2.1.13] 2021-11-30
* Removed `symfony/console ^6` support as we cannot be compatible until Composer 2.3.0 is released. If you have issues with Composer required as a dependency + Symfony make sure you stay on Symfony 5.4 for now. (#10321)
### [2.1.12] 2021-11-09 ### [2.1.12] 2021-11-09
* Fixed issues in proxied binary files relying on __FILE__ / __DIR__ on php <8 (#10261) * Fixed issues in proxied binary files relying on __FILE__ / __DIR__ on php <8 (#10261)
@ -1297,6 +1301,7 @@
* Initial release * Initial release
[2.1.13]: https://github.com/composer/composer/compare/2.1.12...2.1.13
[2.1.12]: https://github.com/composer/composer/compare/2.1.11...2.1.12 [2.1.12]: https://github.com/composer/composer/compare/2.1.11...2.1.12
[2.1.11]: https://github.com/composer/composer/compare/2.1.10...2.1.11 [2.1.11]: https://github.com/composer/composer/compare/2.1.10...2.1.11
[2.1.10]: https://github.com/composer/composer/compare/2.1.9...2.1.10 [2.1.10]: https://github.com/composer/composer/compare/2.1.9...2.1.10

2
composer.json
View File

@ -32,7 +32,7 @@
"psr/log": "^1.0 || ^2.0", "psr/log": "^1.0 || ^2.0",
"seld/jsonlint": "^1.4", "seld/jsonlint": "^1.4",
"seld/phar-utils": "^1.0", "seld/phar-utils": "^1.0",
"symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0",
"symfony/filesystem": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", "symfony/filesystem": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
"symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
"symfony/process": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", "symfony/process": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",