Merge remote-tracking branch 'upstream/main' into remove-extra-slashes

.github/settings.yml

@@ -25,6 +25,9 @@ branches:
           - "Tests (8.1, highest)"
           - "Tests (8.1, locked)"
           - "Tests (8.1, lowest)"
+          - "Tests (8.2, highest)"
+          - "Tests (8.2, locked)"
+          - "Tests (8.2, lowest)"
         strict: false
       restrictions:
 

.github/workflows/integrate.yaml

@@ -303,6 +303,7 @@ jobs:
         php-version:
           - "8.0"
           - "8.1"
+          - "8.2"
 
         dependencies:
           - "lowest"

CHANGELOG.md

@@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 For a full diff see [`2.28.3...main`][2.29.0...main].
 
+### Changed
+
+- Started injecting `Printer\Printer` instead of `Formatter\Formatter` into `NormalizeCommand` ([#1008]), by [@ergebnis-bot]
+
 ## [`2.29.0`][2.29.0]
 
 For a full diff see [`2.28.3...2.29.0`][2.28.3...2.29.0].
@@ -993,6 +997,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
 [#959]: https://github.com/ergebnis/composer-normalize/pull/959
 [#998]: https://github.com/ergebnis/composer-normalize/pull/998
 [#1004]: https://github.com/ergebnis/composer-normalize/pull/1004
+[#1008]: https://github.com/ergebnis/composer-normalize/pull/1008
 
 [@core23]: https://github.com/core23
 [@dependabot]: https://github.com/dependabot

composer.json

@@ -21,7 +21,7 @@
     "source": "https://github.com/ergebnis/composer-normalize"
   },
   "require": {
-    "php": "^8.0",
+    "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
     "ext-json": "*",
     "composer-plugin-api": "^2.0.0",
     "ergebnis/json-normalizer": "~2.1.0",
@@ -34,10 +34,10 @@
     "ergebnis/license": "^2.1.0",
     "ergebnis/php-cs-fixer-config": "^5.0.0",
     "fakerphp/faker": "^1.20.0",
-    "phpunit/phpunit": "^9.5.26",
+    "phpunit/phpunit": "^9.5.27",
     "psalm/plugin-phpunit": "~0.18.4",
     "symfony/filesystem": "^6.0.13",
-    "vimeo/psalm": "^5.1.0"
+    "vimeo/psalm": "^5.2.0"
   },
   "minimum-stability": "dev",
   "prefer-stable": true,

phar/composer-normalize.php

@@ -24,7 +24,7 @@
 $command = new Normalize\Command\NormalizeCommand(
     new Factory(),
     new Normalizer\Vendor\Composer\ComposerJsonNormalizer(__DIR__ . '/../resource/schema.json'),
-    new Normalizer\Format\Formatter(new Printer\Printer()),
+    new Printer\Printer(),
     new Diff\Differ(new Diff\Output\StrictUnifiedDiffOutputBuilder([
         'fromFile' => 'original',
         'toFile' => 'normalized',

psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.0.0@4e177bf0c9f03c17d2fbfd83b7cc9c47605274d8">
+<files psalm-version="5.1.0@4defa177c89397c5e14737a80fe4896584130674">
   <file src="src/Command/NormalizeCommand.php">
     <MixedAssignment occurrences="1">
       <code>$composerFile</code>