Merge pull request #652 from doctrine/3.7.x

Merge 3.7.x up into 3.8.x

Author: greg0ire

.doctrine-project.json

@@ -6,20 +6,30 @@
     {
       "name": "4.0",
       "branchName": "4.0.x",
+      "slug": "4.0",
+      "upcoming": true
+    },
+    {
+      "name": "3.8",
+      "branchName": "3.8.x",
       "slug": "latest",
       "upcoming": true
     },
+    {
+      "name": "3.7",
+      "branchName": "3.7.x",
+      "slug": "3.7",
+      "current": true
+    },
     {
       "name": "3.6",
-      "branchName": "3.6.x",
       "slug": "3.6",
-      "upcoming": true
+      "maintained": false
     },
     {
       "name": "3.5",
-      "branchName": "3.5.x",
       "slug": "3.5",
-      "current": true
+      "maintained": false
     },
     {
       "name": "3.4",
@@ -35,51 +45,6 @@
       "name": "3.2",
       "slug": "3.2",
       "maintained": false
-    },
-    {
-      "name": "3.1",
-      "slug": "3.1",
-      "maintained": false
-    },
-    {
-      "name": "3.0",
-      "slug": "3.0",
-      "maintained": false
-    },
-    {
-      "name": "2.2",
-      "slug": "2.2",
-      "maintained": true
-    },
-    {
-      "name": "2.1",
-      "slug": "2.1",
-      "maintained": false
-    },
-    {
-      "name": "2.0",
-      "slug": "2.0",
-      "maintained": false
-    },
-    {
-      "name": "1.3",
-      "slug": "1.3",
-      "maintained": false
-    },
-    {
-      "name": "1.2",
-      "slug": "1.2",
-      "maintained": false
-    },
-    {
-      "name": "1.1",
-      "slug": "1.1",
-      "maintained": false
-    },
-    {
-      "name": "1.0",
-      "slug": "1.0",
-      "maintained": false
     }
   ]
 }

.github/workflows/coding-standards.yml

@@ -12,4 +12,4 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@v12.2.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@13.0.0"

.github/workflows/composer-lint.yml

@@ -17,4 +17,4 @@ on:
 jobs:
   composer-lint:
     name: "Composer Lint"
-    uses: "doctrine/.github/.github/workflows/composer-lint.yml@v12.2.0"
+    uses: "doctrine/.github/.github/workflows/composer-lint.yml@13.0.0"

.github/workflows/continuous-integration.yml

@@ -20,7 +20,7 @@ jobs:
 
   phpunit-with-dev-deps:
     name: "PHPUnit with dev dependencies"
-    uses: "doctrine/.github/.github/workflows/continuous-integration-symfony-unstable.yml@v12.2.0"
+    uses: "doctrine/.github/.github/workflows/continuous-integration-symfony-unstable.yml@13.0.0"
     with:
       symfony-version-constraint: "^7"
     secrets:

.github/workflows/release-on-milestone-closed.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   release:
     name: "Git tag, release & create merge-up PR"
-    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@v12.2.0"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@13.0.0"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/static-analysis.yml

@@ -12,4 +12,4 @@ on:
 jobs:
   static-analysis:
     name: "Static Analysis"
-    uses: "doctrine/.github/.github/workflows/phpstan.yml@v12.2.0"
+    uses: "doctrine/.github/.github/workflows/phpstan.yml@13.0.0"

.symfony.bundle.yaml

@@ -1,12 +1,12 @@
 branches:
-  - "3.0.x"
-  - "3.1.x"
   - "3.2.x"
   - "3.3.x"
   - "3.4.x"
   - "3.5.x"
   - "3.6.x"
+  - "3.7.x"
+  - "3.8.x"
   - "4.0.x"
-maintained_branches: ["3.5.x", "3.6.x", "4.0.x"]
+maintained_branches: ["3.7.x", "3.8.x", "4.0.x"]
 doc_dir: "docs/"
 dev_branch: "4.0.x"

composer.json

@@ -28,7 +28,8 @@
         "doctrine/doctrine-bundle": "^2.4 || ^3.0",
         "doctrine/migrations": "^3.2",
         "symfony/deprecation-contracts": "^2.1 || ^3",
-        "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0 || ^8.0"
+        "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0 || ^8.0",
+        "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0"
     },
     "require-dev": {
         "composer/semver": "^3.0",

phpstan-baseline.neon

@@ -11,9 +11,3 @@ parameters:
 			identifier: class.notFound
 			count: 2
 			path: src/MigrationsFactory/ContainerAwareMigrationFactory.php
-
-		-
-			message: '#^Comparison operation "\<" between int\<50207, 80399\> and 80400 is always true\.$#'
-			identifier: smaller.alwaysTrue
-			count: 1
-			path: tests/DependencyInjection/DoctrineMigrationsExtensionTest.php

src/DependencyInjection/Configuration.php

@@ -22,6 +22,7 @@
 /** @final */
 class Configuration implements ConfigurationInterface
 {
+    /** @return TreeBuilder<'array'> */
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('doctrine_migrations');