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

Merge branch '1.10'

pull/9555/head
Jordi Boggiano 2020-12-03 17:17:25 +01:00
parent 7f3a56f39b 3287379483
commit 29f4c0b92a
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -140,6 +140,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.18] 2020-12-03
* Allow installation on PHP 8.0
### [1.10.17] 2020-10-30 ### [1.10.17] 2020-10-30
* Fixed Bitbucket API authentication issue * Fixed Bitbucket API authentication issue
@ -1071,6 +1075,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.18]: https://github.com/composer/composer/compare/1.10.17...1.10.18
[1.10.17]: https://github.com/composer/composer/compare/1.10.16...1.10.17 [1.10.17]: https://github.com/composer/composer/compare/1.10.16...1.10.17
[1.10.16]: https://github.com/composer/composer/compare/1.10.15...1.10.16 [1.10.16]: https://github.com/composer/composer/compare/1.10.15...1.10.16
[1.10.15]: https://github.com/composer/composer/compare/1.10.14...1.10.15 [1.10.15]: https://github.com/composer/composer/compare/1.10.14...1.10.15

14
composer.lock generated
View File

@ -164,16 +164,16 @@
}, },
{ {
"name": "composer/spdx-licenses", "name": "composer/spdx-licenses",
"version": "1.5.4", "version": "1.5.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/composer/spdx-licenses.git", "url": "https://github.com/composer/spdx-licenses.git",
"reference": "6946f785871e2314c60b4524851f3702ea4f2223" "reference": "de30328a7af8680efdc03e396aad24befd513200"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/composer/spdx-licenses/zipball/6946f785871e2314c60b4524851f3702ea4f2223", "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/de30328a7af8680efdc03e396aad24befd513200",
"reference": "6946f785871e2314c60b4524851f3702ea4f2223", "reference": "de30328a7af8680efdc03e396aad24befd513200",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -185,7 +185,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.x-dev" "dev-main": "1.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -223,7 +223,7 @@
"support": { "support": {
"irc": "irc://irc.freenode.org/composer", "irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/spdx-licenses/issues", "issues": "https://github.com/composer/spdx-licenses/issues",
"source": "https://github.com/composer/spdx-licenses/tree/1.5.4" "source": "https://github.com/composer/spdx-licenses/tree/1.5.5"
}, },
"funding": [ "funding": [
{ {
@ -239,7 +239,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2020-07-15T15:35:07+00:00" "time": "2020-12-03T16:04:16+00:00"
}, },
{ {
"name": "composer/xdebug-handler", "name": "composer/xdebug-handler",

7
src/Composer/Package/Loader/ArrayLoader.php
View File

@ -114,10 +114,13 @@ class ArrayLoader implements LoaderInterface
} }
if (isset($config['bin'])) { if (isset($config['bin'])) {
foreach ((array) $config['bin'] as $key => $bin) { if (!\is_array($config['bin'])) {
$config['bin'] = array($config['bin']);
}
foreach ($config['bin'] as $key => $bin) {
$config['bin'][$key] = ltrim($bin, '/'); $config['bin'][$key] = ltrim($bin, '/');
} }
$package->setBinaries((array) $config['bin']); $package->setBinaries($config['bin']);
} }
if (isset($config['installation-source'])) { if (isset($config['installation-source'])) {