Merge pull request #431 from doctrine/3.5.x

Merge 3.5.x up into 3.6.x

Author: greg0ire

.github/workflows/coding-standards.yml

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

.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@3.1.0"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@4.0.0"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/static-analysis.yml

@@ -11,4 +11,4 @@ on:
 
 jobs:
   static-analysis:
-    uses: "doctrine/.github/.github/workflows/static-analysis.yml@3.1.0"
+    uses: "doctrine/.github/.github/workflows/static-analysis.yml@4.0.0"

.symfony.bundle.yaml

@@ -1,4 +1,4 @@
 branches: ["3.3.x", "3.4.x", "3.5.x", "3.6.x"]
 maintained_branches: ["3.5.x", "3.6.x"]
-doc_dir: "Resources/doc/"
+doc_dir: {"3.5.x": "Resources/doc/", "3.6.x": "docs/"}
 dev_branch: "3.6.x"