Merge pull request #431 from doctrine/3.5.x

Merge 3.5.x up into 3.6.x
doctrine · May 2, 2024 · 87f5d53 · 87f5d53
2 parents b7f5ed4 + 0e15b20
commit 87f5d53
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 18 deletions.
diff --git a/.github/workflows/coding-standards.yml b/.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"
diff --git a/.github/workflows/release-on-milestone-closed.yml b/.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 }}

diff --git a/.github/workflows/static-analysis.yml b/.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"
diff --git a/.symfony.bundle.yaml b/.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"
diff --git a/CHANGELOG-3.1.md b/CHANGELOG-3.1.md