Merge 96df1df into ba0debc

ergebnis · Mar 30, 2022 · b9ccdaa · b9ccdaa
2 parents ba0debc + 96df1df
commit b9ccdaa
Show file tree

Hide file tree

Showing 8 changed files with 102 additions and 66 deletions.
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -147,7 +147,7 @@ jobs:
 
     env:
       COMPOSER_NORMALIZE_PHAR: ".build/phar/composer-normalize.phar"
-      COMPOSER_VERSION: "2.2.9"
+      COMPOSER_VERSION: "2.3.0"
 
     steps:
       - name: "Checkout"

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -24,7 +24,7 @@ jobs:
     env:
       COMPOSER_NORMALIZE_PHAR: ".build/phar/composer-normalize.phar"
       COMPOSER_NORMALIZE_PHAR_SIGNATURE: ".build/phar/composer-normalize.phar.asc"
-      COMPOSER_VERSION: "2.2.9"
+      COMPOSER_VERSION: "2.3.0"
       GPG_KEYS: ".build/phar/keys.asc"
       GPG_KEYS_ENCRYPTED: "phar/keys.asc.gpg"
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,11 +6,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## Unreleased
 
-For a full diff see [`2.24.1...main`][2.24.1...main].
+For a full diff see [`2.25.0...main`][2.25.0...main].
+
+## [`2.25.0`][2.25.0]
+
+For a full diff see [`2.24.1...2.25.0`][2.24.1...2.25.0].
 
 ### Changed
 
 - Updated `schema.json` ([#912]), by [@ergebnis-bot]
+- Required `composer/composer:2.3.0` for compiling `composer-normalize.phar` ([#913]), by [@localheinz]
 
 ## [`2.24.1`][2.24.1]
 
@@ -707,6 +712,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
 [2.23.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.23.1
 [2.24.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.24.0
 [2.24.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.24.1
+[2.25.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.25.0
 
 [81bc3a8...0.1.0]: https://github.com/ergebnis/composer-normalize/compare/81bc3a8...0.1.0
 [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].
 [2.23.0...2.23.1]: https://github.com/ergebnis/composer-normalize/compare/2.23.0...2.23.1
 [2.23.1...2.24.0]: https://github.com/ergebnis/composer-normalize/compare/2.23.1...2.24.0
 [2.24.0...2.24.1]: https://github.com/ergebnis/composer-normalize/compare/2.24.0...2.24.1
-[2.24.1...main]: https://github.com/ergebnis/composer-normalize/compare/2.24.1...main
+[2.24.1...2.25.0]: https://github.com/ergebnis/composer-normalize/compare/2.24.1...2.25.10
+[2.25.0...main]: https://github.com/ergebnis/composer-normalize/compare/2.25.0...main
 
 [#1]: https://github.com/ergebnis/composer-normalize/pull/1
 [#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].
 [#904]: https://github.com/ergebnis/composer-normalize/pull/904
 [#905]: https://github.com/ergebnis/composer-normalize/pull/905
 [#912]: https://github.com/ergebnis/composer-normalize/pull/912
+[#913]: https://github.com/ergebnis/composer-normalize/pull/913
 
 [@core23]: https://github.com/core23
 [@dependabot]: https://github.com/dependabot

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-COMPOSER_VERSION:=2.2.9
+COMPOSER_VERSION:=2.3.0
 
 .PHONY: it
 it: coding-standards static-code-analysis tests ## Runs the coding-standards, static-code-analysis, and tests targets

diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
     "localheinz/diff": "^1.1.1"
   },
   "require-dev": {
-    "composer/composer": "^2.2.9",
+    "composer/composer": "^2.3.0",
     "ergebnis/license": "^1.2.0",
     "ergebnis/php-cs-fixer-config": "^4.4.0",
     "fakerphp/faker": "^1.19.0",

diff --git a/composer.lock b/composer.lock
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,20 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.16.1@aa7e400908833b10c0333861f86cd48c510b60eb">
+<files psalm-version="4.22.0@fc2c6ab4d5fa5d644d8617089f012f3bb84b8703">
   <file src="src/Command/NormalizeCommand.php">
-    <MixedArgument occurrences="9">
-      <code>$composerFile</code>
-      <code>$composerFile</code>
-      <code>$composerFile</code>
-      <code>$composerFile</code>
-      <code>$composerFile</code>
-      <code>$composerFile</code>
-      <code>$composerFile</code>
-      <code>$composerFile</code>
-      <code>$composerFile</code>
-    </MixedArgument>
     <MixedAssignment occurrences="1">
       <code>$composerFile</code>
     </MixedAssignment>
+    <RedundantCondition occurrences="1"/>
+    <TypeDoesNotContainType occurrences="1"/>
   </file>
   <file src="test/Integration/Command/NormalizeCommand/AbstractTestCase.php">
     <MixedArrayAccess occurrences="1">