Merge pull request #624 from doctrine/3.5.x

Merge 3.5.x up into 3.6.x

Author: greg0ire

.doctrine-project.json

@@ -9,75 +9,75 @@
       "slug": "latest",
       "upcoming": true
     },
+    {
+      "name": "3.6",
+      "branchName": "3.6.x",
+      "slug": "3.6",
+      "upcoming": true
+    },
+    {
+      "name": "3.5",
+      "branchName": "3.5.x",
+      "slug": "3.5",
+      "current": true
+    },
     {
       "name": "3.4",
-      "branchName": "3.4.x",
       "slug": "3.4",
-      "current": true
+      "maintained": false
     },
     {
       "name": "3.3",
-      "branchName": "3.3.x",
       "slug": "3.3",
       "maintained": false
     },
     {
       "name": "3.2",
-      "branchName": "3.2.x",
       "slug": "3.2",
       "maintained": false
     },
     {
       "name": "3.1",
-      "branchName": "3.1.x",
       "slug": "3.1",
       "maintained": false
     },
     {
       "name": "3.0",
-      "branchName": "3.0.x",
       "slug": "3.0",
       "maintained": false
     },
     {
       "name": "2.2",
-      "branchName": "2.2.x",
       "slug": "2.2",
       "maintained": true
     },
     {
       "name": "2.1",
-      "branchName": "2.1.x",
       "slug": "2.1",
       "maintained": false
     },
     {
       "name": "2.0",
-      "branchName": "2.0.x",
       "slug": "2.0",
       "maintained": false
     },
     {
       "name": "1.3",
-      "branchName": "1.3",
       "slug": "1.3",
       "maintained": false
     },
     {
       "name": "1.2",
-      "branchName": "1.2",
       "slug": "1.2",
       "maintained": false
     },
     {
       "name": "1.1",
-      "branchName": "1.1",
       "slug": "1.1",
       "maintained": false
     },
     {
       "name": "1.0",
-      "branchName": "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@8.0.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@v12.2.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@8.0.0"
+    uses: "doctrine/.github/.github/workflows/composer-lint.yml@v12.2.0"

.github/workflows/continuous-integration.yml

@@ -12,15 +12,15 @@ on:
 jobs:
   phpunit:
     name: "PHPUnit"
-    uses: "doctrine/.github/.github/workflows/continuous-integration.yml@8.0.0"
+    uses: "doctrine/.github/.github/workflows/continuous-integration.yml@v12.2.0"
     with:
       php-versions: '["7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4"]'
     secrets:
       CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"
 
   phpunit-with-dev-deps:
     name: "PHPUnit with dev dependencies"
-    uses: "doctrine/.github/.github/workflows/continuous-integration-symfony-unstable.yml@8.0.0"
+    uses: "doctrine/.github/.github/workflows/continuous-integration-symfony-unstable.yml@v12.2.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@8.0.0"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@v12.2.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@8.0.0"
+    uses: "doctrine/.github/.github/workflows/phpstan.yml@v12.2.0"

.symfony.bundle.yaml

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