Skip to content

Commit f8dcad3

Browse files
authored
Merge pull request #915 from ergebnis/fix/composer
Fix: Update `composer/composer`
2 parents 089bd72 + ac90c18 commit f8dcad3

File tree

6 files changed

+25
-14
lines changed

6 files changed

+25
-14
lines changed

.github/workflows/integrate.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ jobs:
147147

148148
env:
149149
COMPOSER_NORMALIZE_PHAR: ".build/phar/composer-normalize.phar"
150-
COMPOSER_VERSION: "2.3.0"
150+
COMPOSER_VERSION: "2.3.1"
151151

152152
steps:
153153
- name: "Checkout"

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
env:
2525
COMPOSER_NORMALIZE_PHAR: ".build/phar/composer-normalize.phar"
2626
COMPOSER_NORMALIZE_PHAR_SIGNATURE: ".build/phar/composer-normalize.phar.asc"
27-
COMPOSER_VERSION: "2.3.0"
27+
COMPOSER_VERSION: "2.3.1"
2828
GPG_KEYS: ".build/phar/keys.asc"
2929
GPG_KEYS_ENCRYPTED: "phar/keys.asc.gpg"
3030

CHANGELOG.md

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66

77
## Unreleased
88

9-
For a full diff see [`2.25.0...main`][2.25.0...main].
9+
For a full diff see [`2.25.1...main`][2.25.1...main].
10+
11+
## [`2.25.1`][2.25.1]
12+
13+
For a full diff see [`2.25.0...2.25.1`][2.25.0....2.25.1].
14+
15+
### Changed
16+
17+
- Required `composer/composer:2.3.1` for compiling `composer-normalize.phar` ([#915]), by [@localheinz]
1018

1119
## [`2.25.0`][2.25.0]
1220

@@ -713,6 +721,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
713721
[2.24.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.24.0
714722
[2.24.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.24.1
715723
[2.25.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.25.0
724+
[2.25.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.25.1
716725

717726
[81bc3a8...0.1.0]: https://github.com/ergebnis/composer-normalize/compare/81bc3a8...0.1.0
718727
[0.1.0...0.2.0]: https://github.com/ergebnis/composer-normalize/compare/0.1.0...0.2.0
@@ -781,7 +790,8 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
781790
[2.23.0...2.23.1]: https://github.com/ergebnis/composer-normalize/compare/2.23.0...2.23.1
782791
[2.23.1...2.24.0]: https://github.com/ergebnis/composer-normalize/compare/2.23.1...2.24.0
783792
[2.24.0...2.24.1]: https://github.com/ergebnis/composer-normalize/compare/2.24.0...2.24.1
784-
[2.24.1...2.25.0]: https://github.com/ergebnis/composer-normalize/compare/2.24.1...2.25.10
793+
[2.24.1...2.25.0]: https://github.com/ergebnis/composer-normalize/compare/2.24.1...2.25.0
794+
[2.25.0...2.25.1]: https://github.com/ergebnis/composer-normalize/compare/2.25.0...2.25.1
785795
[2.25.0...main]: https://github.com/ergebnis/composer-normalize/compare/2.25.0...main
786796

787797
[#1]: https://github.com/ergebnis/composer-normalize/pull/1
@@ -882,6 +892,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
882892
[#905]: https://github.com/ergebnis/composer-normalize/pull/905
883893
[#912]: https://github.com/ergebnis/composer-normalize/pull/912
884894
[#913]: https://github.com/ergebnis/composer-normalize/pull/913
895+
[#915]: https://github.com/ergebnis/composer-normalize/pull/915
885896

886897
[@core23]: https://github.com/core23
887898
[@dependabot]: https://github.com/dependabot

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
COMPOSER_VERSION:=2.3.0
1+
COMPOSER_VERSION:=2.3.1
22

33
.PHONY: it
44
it: coding-standards static-code-analysis tests ## Runs the coding-standards, static-code-analysis, and tests targets

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"localheinz/diff": "^1.1.1"
3030
},
3131
"require-dev": {
32-
"composer/composer": "^2.3.0",
32+
"composer/composer": "^2.3.1",
3333
"ergebnis/license": "^1.2.0",
3434
"ergebnis/php-cs-fixer-config": "^4.4.0",
3535
"fakerphp/faker": "^1.19.0",

composer.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)