Merge remote-tracking branch 'origin/2.13.x' into 2.14.x

doctrine · Nov 26, 2024 · 6108999 · 6108999
2 parents f604e32 + 75026f2
commit 6108999
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 14 deletions.
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -12,6 +12,6 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.2.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.3.0"
     with:
       composer-options: "--prefer-dist --prefer-stable"
diff --git a/.github/workflows/composer-lint.yml b/.github/workflows/composer-lint.yml
@@ -15,4 +15,4 @@ on:
 jobs:
   composer-lint:
     name: "Composer Lint"
-    uses: "doctrine/.github/.github/workflows/composer-lint.yml@5.2.0"
+    uses: "doctrine/.github/.github/workflows/composer-lint.yml@5.3.0"
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -126,7 +126,7 @@ jobs:
           path: "reports"
 
       - name: "Upload to Codecov"
-        uses: "codecov/codecov-action@v4"
+        uses: "codecov/codecov-action@v5"
         with:
           directory: reports
         env:

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -17,4 +17,4 @@ on:
 jobs:
   documentation:
     name: "Documentation"
-    uses: "doctrine/.github/.github/workflows/documentation.yml@5.2.0"
+    uses: "doctrine/.github/.github/workflows/documentation.yml@5.3.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@5.2.0"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@5.3.0"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

diff --git a/composer.json b/composer.json
@@ -39,7 +39,7 @@
         "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.46 || ^6.4.3 || ^7.0.3",
+        "symfony/doctrine-bridge": "^5.4.46 || ~6.3.12 || ^6.4.3 || ^7.0.3",
         "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0",
         "symfony/polyfill-php80": "^1.15",
         "symfony/service-contracts": "^1.1.1 || ^2.0 || ^3"

diff --git a/docs/en/configuration.rst b/docs/en/configuration.rst
@@ -1,7 +1,3 @@
-.. index::
-   single: Doctrine; ORM Configuration Reference
-   single: Configuration Reference; Doctrine ORM
-
 Configuration Reference
 =======================
 
@@ -771,10 +767,6 @@ can control. The following configuration options exist for a mapping:
     was specified and the metadata files are most likely in a directory outside
     of a bundle.
 
-.. index::
-    single: Configuration; Doctrine DBAL
-    single: Doctrine; DBAL configuration
-
 Filters Configuration
 ~~~~~~~~~~~~~~~~~~~~~