Skip to content

Commit 9d41868

Browse files
authored
Merge pull request #913 from ergebnis/feature/composer
Enhancement: Update `composer/composer`
2 parents ba0debc + 96df1df commit 9d41868

File tree

8 files changed

+102
-66
lines changed

8 files changed

+102
-66
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.2.9"
150+
COMPOSER_VERSION: "2.3.0"
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.2.9"
27+
COMPOSER_VERSION: "2.3.0"
2828
GPG_KEYS: ".build/phar/keys.asc"
2929
GPG_KEYS_ENCRYPTED: "phar/keys.asc.gpg"
3030

CHANGELOG.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,16 @@ 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.24.1...main`][2.24.1...main].
9+
For a full diff see [`2.25.0...main`][2.25.0...main].
10+
11+
## [`2.25.0`][2.25.0]
12+
13+
For a full diff see [`2.24.1...2.25.0`][2.24.1...2.25.0].
1014

1115
### Changed
1216

1317
- Updated `schema.json` ([#912]), by [@ergebnis-bot]
18+
- Required `composer/composer:2.3.0` for compiling `composer-normalize.phar` ([#913]), by [@localheinz]
1419

1520
## [`2.24.1`][2.24.1]
1621

@@ -707,6 +712,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
707712
[2.23.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.23.1
708713
[2.24.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.24.0
709714
[2.24.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.24.1
715+
[2.25.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.25.0
710716

711717
[81bc3a8...0.1.0]: https://github.com/ergebnis/composer-normalize/compare/81bc3a8...0.1.0
712718
[0.1.0...0.2.0]: https://github.com/ergebnis/composer-normalize/compare/0.1.0...0.2.0
@@ -775,7 +781,8 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
775781
[2.23.0...2.23.1]: https://github.com/ergebnis/composer-normalize/compare/2.23.0...2.23.1
776782
[2.23.1...2.24.0]: https://github.com/ergebnis/composer-normalize/compare/2.23.1...2.24.0
777783
[2.24.0...2.24.1]: https://github.com/ergebnis/composer-normalize/compare/2.24.0...2.24.1
778-
[2.24.1...main]: https://github.com/ergebnis/composer-normalize/compare/2.24.1...main
784+
[2.24.1...2.25.0]: https://github.com/ergebnis/composer-normalize/compare/2.24.1...2.25.10
785+
[2.25.0...main]: https://github.com/ergebnis/composer-normalize/compare/2.25.0...main
779786

780787
[#1]: https://github.com/ergebnis/composer-normalize/pull/1
781788
[#2]: https://github.com/ergebnis/composer-normalize/pull/2
@@ -874,6 +881,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
874881
[#904]: https://github.com/ergebnis/composer-normalize/pull/904
875882
[#905]: https://github.com/ergebnis/composer-normalize/pull/905
876883
[#912]: https://github.com/ergebnis/composer-normalize/pull/912
884+
[#913]: https://github.com/ergebnis/composer-normalize/pull/913
877885

878886
[@core23]: https://github.com/core23
879887
[@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.2.9
1+
COMPOSER_VERSION:=2.3.0
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.2.9",
32+
"composer/composer": "^2.3.0",
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: 79 additions & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

psalm-baseline.xml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="4.16.1@aa7e400908833b10c0333861f86cd48c510b60eb">
2+
<files psalm-version="4.22.0@fc2c6ab4d5fa5d644d8617089f012f3bb84b8703">
33
<file src="src/Command/NormalizeCommand.php">
4-
<MixedArgument occurrences="9">
5-
<code>$composerFile</code>
6-
<code>$composerFile</code>
7-
<code>$composerFile</code>
8-
<code>$composerFile</code>
9-
<code>$composerFile</code>
10-
<code>$composerFile</code>
11-
<code>$composerFile</code>
12-
<code>$composerFile</code>
13-
<code>$composerFile</code>
14-
</MixedArgument>
154
<MixedAssignment occurrences="1">
165
<code>$composerFile</code>
176
</MixedAssignment>
7+
<RedundantCondition occurrences="1"/>
8+
<TypeDoesNotContainType occurrences="1"/>
189
</file>
1910
<file src="test/Integration/Command/NormalizeCommand/AbstractTestCase.php">
2011
<MixedArrayAccess occurrences="1">

0 commit comments

Comments
 (0)