Skip to content

Commit 6108999

Browse files
committed
Merge remote-tracking branch 'origin/2.13.x' into 2.14.x
2 parents f604e32 + 75026f2 commit 6108999

File tree

7 files changed

+6
-14
lines changed

7 files changed

+6
-14
lines changed

.github/workflows/coding-standards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ on:
1212
jobs:
1313
coding-standards:
1414
name: "Coding Standards"
15-
uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.2.0"
15+
uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.3.0"
1616
with:
1717
composer-options: "--prefer-dist --prefer-stable"

.github/workflows/composer-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ on:
1515
jobs:
1616
composer-lint:
1717
name: "Composer Lint"
18-
uses: "doctrine/.github/.github/workflows/composer-lint.yml@5.2.0"
18+
uses: "doctrine/.github/.github/workflows/composer-lint.yml@5.3.0"

.github/workflows/continuous-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ jobs:
126126
path: "reports"
127127

128128
- name: "Upload to Codecov"
129-
uses: "codecov/codecov-action@v4"
129+
uses: "codecov/codecov-action@v5"
130130
with:
131131
directory: reports
132132
env:

.github/workflows/documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ on:
1717
jobs:
1818
documentation:
1919
name: "Documentation"
20-
uses: "doctrine/.github/.github/workflows/documentation.yml@5.2.0"
20+
uses: "doctrine/.github/.github/workflows/documentation.yml@5.3.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
release:
1010
name: "Git tag, release & create merge-up PR"
11-
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@5.2.0"
11+
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@5.3.0"
1212
secrets:
1313
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
1414
GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"symfony/console": "^5.4 || ^6.0 || ^7.0",
4040
"symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
4141
"symfony/deprecation-contracts": "^2.1 || ^3",
42-
"symfony/doctrine-bridge": "^5.4.46 || ^6.4.3 || ^7.0.3",
42+
"symfony/doctrine-bridge": "^5.4.46 || ~6.3.12 || ^6.4.3 || ^7.0.3",
4343
"symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0",
4444
"symfony/polyfill-php80": "^1.15",
4545
"symfony/service-contracts": "^1.1.1 || ^2.0 || ^3"

docs/en/configuration.rst

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
.. index::
2-
single: Doctrine; ORM Configuration Reference
3-
single: Configuration Reference; Doctrine ORM
4-
51
Configuration Reference
62
=======================
73

@@ -771,10 +767,6 @@ can control. The following configuration options exist for a mapping:
771767
was specified and the metadata files are most likely in a directory outside
772768
of a bundle.
773769

774-
.. index::
775-
single: Configuration; Doctrine DBAL
776-
single: Doctrine; DBAL configuration
777-
778770
Filters Configuration
779771
~~~~~~~~~~~~~~~~~~~~~
780772

0 commit comments

Comments
 (0)