Merge 3.7.x up into 4.0.x

.github/workflows/composer-lint.yml

@@ -0,0 +1,20 @@
+name: "Composer Lint"
+
+on:
+  pull_request:
+    branches:
+      - "*.x"
+    paths:
+      - ".github/workflows/composer-lint.yml"
+      - "composer.json"
+  push:
+    branches:
+      - "*.x"
+    paths:
+      - ".github/workflows/composer-lint.yml"
+      - "composer.json"
+
+jobs:
+  composer-lint:
+    name: "Composer Lint"
+    uses: "doctrine/.github/.github/workflows/composer-lint.yml@6.0.0"

composer.json

@@ -1,10 +1,12 @@
 {
     "name": "doctrine/doctrine-fixtures-bundle",
-    "type": "symfony-bundle",
     "description": "Symfony DoctrineFixturesBundle",
-    "keywords": ["Persistence", "Fixture"],
-    "homepage": "https://www.doctrine-project.org",
     "license": "MIT",
+    "type": "symfony-bundle",
+    "keywords": [
+        "Persistence",
+        "Fixture"
+    ],
     "authors": [
         {
             "name": "Fabien Potencier",
@@ -19,38 +21,44 @@
             "homepage": "https://symfony.com/contributors"
         }
     ],
+    "homepage": "https://www.doctrine-project.org",
     "require": {
         "php": "^8.1",
         "doctrine/data-fixtures": "^2.0",
         "doctrine/doctrine-bundle": "^2.2",
         "doctrine/orm": "^2.14.0 || ^3.0",
-        "doctrine/persistence": "^2.4|^3.0",
-        "symfony/config": "^5.4|^6.0|^7.0",
-        "symfony/console": "^5.4|^6.0|^7.0",
-        "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-        "symfony/deprecation-contracts": "^2.1|^3",
-        "symfony/doctrine-bridge": "^5.4.48|^6.4.16|^7.1.9",
-        "symfony/http-kernel": "^5.4|^6.0|^7.0"
+        "doctrine/persistence": "^2.4 || ^3.0",
+        "psr/log": "^1 || ^2 || ^3",
+        "symfony/config": "^5.4 || ^6.0 || ^7.0",
+        "symfony/console": "^5.4 || ^6.0 || ^7.0",
+        "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
+        "symfony/deprecation-contracts": "^2.1 || ^3",
+        "symfony/doctrine-bridge": "^5.4.48 || ^6.4.16 || ^7.1.9",
+        "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0"
     },
     "require-dev": {
         "doctrine/coding-standard": "^12",
-        "phpstan/phpstan": "^1.10.39",
+        "phpstan/phpstan": "^2",
         "phpunit/phpunit": "^9.6.13",
         "symfony/phpunit-bridge": "^6.3.6"
     },
     "conflict": {
         "doctrine/dbal": "< 3"
     },
     "autoload": {
-        "psr-4": { "Doctrine\\Bundle\\FixturesBundle\\": "src" }
+        "psr-4": {
+            "Doctrine\\Bundle\\FixturesBundle\\": "src"
+        }
     },
     "autoload-dev": {
-        "psr-4": { "Doctrine\\Bundle\\FixturesBundle\\Tests\\": "tests" }
+        "psr-4": {
+            "Doctrine\\Bundle\\FixturesBundle\\Tests\\": "tests"
+        }
     },
     "config": {
-        "sort-packages": true,
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true
-        }
+        },
+        "sort-packages": true
     }
 }

phpstan-baseline.neon

@@ -1,21 +1,25 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Method class@anonymous/src/Command/LoadDataFixturesDoctrineCommand\\.php\\:120\\:\\:log\\(\\) has parameter \\$message with no type specified\\.$#"
+			message: '#^Method Psr\\Log\\AbstractLogger@anonymous/src/Command/LoadDataFixturesDoctrineCommand\.php\:120\:\:log\(\) has parameter \$message with no type specified\.$#'
+			identifier: missingType.parameter
 			count: 1
 			path: src/Command/LoadDataFixturesDoctrineCommand.php
 
 		-
-			message: "#^Method Doctrine\\\\Bundle\\\\FixturesBundle\\\\Loader\\\\SymfonyFixturesLoader\\:\\:createFixture\\(\\) has parameter \\$class with no type specified\\.$#"
+			message: '#^Method Doctrine\\Bundle\\FixturesBundle\\Loader\\SymfonyFixturesLoader\:\:createFixture\(\) has parameter \$class with no type specified\.$#'
+			identifier: missingType.parameter
 			count: 1
 			path: src/Loader/SymfonyFixturesLoader.php
 
 		-
-			message: "#^Constructor of class Doctrine\\\\Bundle\\\\FixturesBundle\\\\Tests\\\\Fixtures\\\\FooBundle\\\\DataFixtures\\\\RequiredConstructorArgsFixtures has an unused parameter \\$fooRequiredArg\\.$#"
+			message: '#^Constructor of class Doctrine\\Bundle\\FixturesBundle\\Tests\\Fixtures\\FooBundle\\DataFixtures\\RequiredConstructorArgsFixtures has an unused parameter \$fooRequiredArg\.$#'
+			identifier: constructor.unusedParameter
 			count: 1
 			path: tests/Fixtures/FooBundle/DataFixtures/RequiredConstructorArgsFixtures.php
 
 		-
-			message: "#^Method Doctrine\\\\Bundle\\\\FixturesBundle\\\\Tests\\\\IntegrationTestKernel\\:\\:registerBundles\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: '#^Method Doctrine\\Bundle\\FixturesBundle\\Tests\\IntegrationTestKernel\:\:registerBundles\(\) return type has no value type specified in iterable type array\.$#'
+			identifier: missingType.iterableValue
 			count: 1
 			path: tests/IntegrationTestKernel.php