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

Merge branch '1.10'

pull/9197/head
Jordi Boggiano 2020-09-08 23:03:29 +02:00
parent 6f91e038ea d61c1ccb7c
commit 348964f2ed
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -57,6 +57,10 @@
* 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.12] 2020-09-08
* Fixed regressions with old version validation
### [1.10.11] 2020-09-08 ### [1.10.11] 2020-09-08
* Fixed more PHP 8 compatibility issues * Fixed more PHP 8 compatibility issues
@ -947,6 +951,7 @@
[2.0.0-alpha3]: https://github.com/composer/composer/compare/2.0.0-alpha2...2.0.0-alpha3 [2.0.0-alpha3]: https://github.com/composer/composer/compare/2.0.0-alpha2...2.0.0-alpha3
[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.12]: https://github.com/composer/composer/compare/1.10.11...1.10.12
[1.10.11]: https://github.com/composer/composer/compare/1.10.10...1.10.11 [1.10.11]: https://github.com/composer/composer/compare/1.10.10...1.10.11
[1.10.10]: https://github.com/composer/composer/compare/1.10.9...1.10.10 [1.10.10]: https://github.com/composer/composer/compare/1.10.9...1.10.10
[1.10.9]: https://github.com/composer/composer/compare/1.10.8...1.10.9 [1.10.9]: https://github.com/composer/composer/compare/1.10.8...1.10.9

12
composer.lock generated
View File

@ -83,16 +83,16 @@
}, },
{ {
"name": "composer/semver", "name": "composer/semver",
"version": "3.0.1", "version": "3.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/composer/semver.git", "url": "https://github.com/composer/semver.git",
"reference": "c6e35eb8251125bfdd1c812f379da0dc89814df1" "reference": "c64053b1543d7bc054883f0a78a86c4242ae315d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/composer/semver/zipball/c6e35eb8251125bfdd1c812f379da0dc89814df1", "url": "https://api.github.com/repos/composer/semver/zipball/c64053b1543d7bc054883f0a78a86c4242ae315d",
"reference": "c6e35eb8251125bfdd1c812f379da0dc89814df1", "reference": "c64053b1543d7bc054883f0a78a86c4242ae315d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -144,7 +144,7 @@
"support": { "support": {
"irc": "irc://irc.freenode.org/composer", "irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/semver/issues", "issues": "https://github.com/composer/semver/issues",
"source": "https://github.com/composer/semver/tree/3.0.1" "source": "https://github.com/composer/semver/tree/main"
}, },
"funding": [ "funding": [
{ {
@ -160,7 +160,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2020-09-08T14:25:42+00:00" "time": "2020-09-08T20:59:47+00:00"
}, },
{ {
"name": "composer/spdx-licenses", "name": "composer/spdx-licenses",