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

Merge branch '1.10'

pull/9056/head
Jordi Boggiano 2020-07-16 13:05:17 +02:00
parent 8b934a415f bf59f536d6
commit 8dae1dd45a
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,6 +81,8 @@ jobs:
echo "::set-env name=SYMFONY_PHPUNIT_VERSION::6.5"; echo "::set-env name=SYMFONY_PHPUNIT_VERSION::6.5";
elif [ "${{ matrix.php-version }}" = "7.1" ]; then elif [ "${{ matrix.php-version }}" = "7.1" ]; then
echo "::set-env name=SYMFONY_PHPUNIT_VERSION::7.5"; echo "::set-env name=SYMFONY_PHPUNIT_VERSION::7.5";
elif [ "${{ matrix.php-version }}" = "8.0" ]; then
echo "::set-env name=SYMFONY_PHPUNIT_VERSION::9.2";
else else
echo "::set-env name=SYMFONY_PHPUNIT_VERSION::8.3"; echo "::set-env name=SYMFONY_PHPUNIT_VERSION::8.3";
fi fi

8
CHANGELOG.md
View File

@ -46,6 +46,13 @@
* Fixed suggest output being very spammy, it now is only one line long and shows more rarely * Fixed suggest output being very spammy, it now is only one line long and shows more rarely
* Fixed conflict rules like e.g. >=5 from matching dev-master, as it is not normalized to 9999999-dev internally anymore * Fixed conflict rules like e.g. >=5 from matching dev-master, as it is not normalized to 9999999-dev internally anymore
### [1.10.9] 2020-07-16
* Fixed Bitbucket redirect loop when credentials are outdated
* Fixed GitLab auth prompt wording
* Fixed `self-update` handling of files requiring admin permissions to write to on Windows (it now does a UAC prompt)
* Fixed parsing issues in funding.yml files
### [1.10.8] 2020-06-24 ### [1.10.8] 2020-06-24
* Fixed compatibility issue with git being configured to show signatures by default * Fixed compatibility issue with git being configured to show signatures by default
@ -916,6 +923,7 @@
[2.0.0-alpha2]: https://github.com/composer/composer/compare/2.0.0-alpha1...2.0.0-alpha2 [2.0.0-alpha2]: https://github.com/composer/composer/compare/2.0.0-alpha1...2.0.0-alpha2
[2.0.0-alpha1]: https://github.com/composer/composer/compare/1.10.7...2.0.0-alpha1 [2.0.0-alpha1]: https://github.com/composer/composer/compare/1.10.7...2.0.0-alpha1
[1.10.9]: https://github.com/composer/composer/compare/1.10.8...1.10.9
[1.10.8]: https://github.com/composer/composer/compare/1.10.7...1.10.8 [1.10.8]: https://github.com/composer/composer/compare/1.10.7...1.10.8
[1.10.7]: https://github.com/composer/composer/compare/1.10.6...1.10.7 [1.10.7]: https://github.com/composer/composer/compare/1.10.6...1.10.7
[1.10.6]: https://github.com/composer/composer/compare/1.10.5...1.10.6 [1.10.6]: https://github.com/composer/composer/compare/1.10.5...1.10.6