Skip to content

Commit

Permalink
Merge pull request #750 from ergebnis/fix/composer
Browse files Browse the repository at this point in the history
Fix: Update composer/composer
  • Loading branch information
ergebnis-bot authored Jun 2, 2021
2 parents 445cbf1 + cafa661 commit 8dbe652
Show file tree
Hide file tree
Showing 4 changed files with 88 additions and 8 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ For a full diff see [`2.13.4...2.14.0`][2.13.4...2.14.0].

* Updated `schema.json` ([#744]), by [@ergebnis-bot]

### Fixed

* Updated `composer/composer` ([#750]), by [@localheinz]

## [`2.13.4`][2.13.4]

For a full diff see [`2.13.3...2.13.4`][2.13.3...2.13.4].
Expand Down Expand Up @@ -716,6 +720,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[#707]: https://github.com/ergebnis/composer-normalize/pull/707
[#743]: https://github.com/ergebnis/composer-normalize/pull/743
[#744]: https://github.com/ergebnis/composer-normalize/pull/744
[#750]: https://github.com/ergebnis/composer-normalize/pull/750

[@core23]: https://github.com/core23
[@dependabot]: https://github.com/dependabot
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
COMPOSER_VERSION:=2.0.8
COMPOSER_VERSION:=2.0.13

.PHONY: it
it: coding-standards static-code-analysis tests ## Runs the coding-standards, static-code-analysis, and tests targets
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"localheinz/diff": "^1.1.1"
},
"require-dev": {
"composer/composer": "^1.10.19 || ^2.0.8",
"composer/composer": "^1.10.22 || ^2.0.13",
"ergebnis/license": "^1.1.0",
"ergebnis/php-cs-fixer-config": "^2.14.0",
"ergebnis/phpstan-rules": "~0.15.3",
Expand Down
87 changes: 81 additions & 6 deletions composer.lock

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

0 comments on commit 8dbe652

Please sign in to comment.