diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fbbba7f2..41ce16875 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -140,6 +140,10 @@ * 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 +### [1.10.18] 2020-12-03 + + * Allow installation on PHP 8.0 + ### [1.10.17] 2020-10-30 * 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-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 +[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.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 diff --git a/composer.lock b/composer.lock index 9c18e277e..a5e510d4d 100644 --- a/composer.lock +++ b/composer.lock @@ -164,16 +164,16 @@ }, { "name": "composer/spdx-licenses", - "version": "1.5.4", + "version": "1.5.5", "source": { "type": "git", "url": "https://github.com/composer/spdx-licenses.git", - "reference": "6946f785871e2314c60b4524851f3702ea4f2223" + "reference": "de30328a7af8680efdc03e396aad24befd513200" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/6946f785871e2314c60b4524851f3702ea4f2223", - "reference": "6946f785871e2314c60b4524851f3702ea4f2223", + "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/de30328a7af8680efdc03e396aad24befd513200", + "reference": "de30328a7af8680efdc03e396aad24befd513200", "shasum": "" }, "require": { @@ -185,7 +185,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.x-dev" + "dev-main": "1.x-dev" } }, "autoload": { @@ -223,7 +223,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "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": [ { @@ -239,7 +239,7 @@ "type": "tidelift" } ], - "time": "2020-07-15T15:35:07+00:00" + "time": "2020-12-03T16:04:16+00:00" }, { "name": "composer/xdebug-handler", diff --git a/src/Composer/Package/Loader/ArrayLoader.php b/src/Composer/Package/Loader/ArrayLoader.php index 9e136eef0..f529eb625 100644 --- a/src/Composer/Package/Loader/ArrayLoader.php +++ b/src/Composer/Package/Loader/ArrayLoader.php @@ -114,10 +114,13 @@ class ArrayLoader implements LoaderInterface } 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, '/'); } - $package->setBinaries((array) $config['bin']); + $package->setBinaries($config['bin']); } if (isset($config['installation-source'])) {