Skip to content

Commit

Permalink
Merge branch '1.10'
Browse files Browse the repository at this point in the history
  • Loading branch information
Seldaek committed Dec 3, 2020
2 parents 7f3a56f + 3287379 commit 29f4c0b
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 9 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions src/Composer/Package/Loader/ArrayLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,13 @@ private function configureObject($package, array $config)
}

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'])) {
Expand Down

0 comments on commit 29f4c0b

Please sign in to comment.