Skip to content

Commit c2d3fcd

Browse files
committed
Merge remote-tracking branch 'origin/2.17.x' into 3.0.x
2 parents 6a441fa + bb618a1 commit c2d3fcd

13 files changed

Lines changed: 408 additions & 25 deletions

.github/workflows/coding-standards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ on:
2626
jobs:
2727
coding-standards:
2828
name: "Coding Standards"
29-
uses: "doctrine/.github/.github/workflows/coding-standards.yml@7.3.0"
29+
uses: "doctrine/.github/.github/workflows/coding-standards.yml@8.0.0"
3030
with:
3131
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
@@ -17,4 +17,4 @@ on:
1717
jobs:
1818
composer-lint:
1919
name: "Composer Lint"
20-
uses: "doctrine/.github/.github/workflows/composer-lint.yml@7.3.0"
20+
uses: "doctrine/.github/.github/workflows/composer-lint.yml@8.0.0"

.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@7.3.0"
20+
uses: "doctrine/.github/.github/workflows/documentation.yml@8.0.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@7.3.0"
11+
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@8.0.0"
1212
secrets:
1313
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
1414
GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/static-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ on:
2626
jobs:
2727
static-analysis:
2828
name: "Static Analysis"
29-
uses: "doctrine/.github/.github/workflows/phpstan.yml@7.3.0"
29+
uses: "doctrine/.github/.github/workflows/phpstan.yml@8.0.0"

.github/workflows/website-schema.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ on:
1818
jobs:
1919
json-validate:
2020
name: "Validate JSON schema"
21-
uses: "doctrine/.github/.github/workflows/website-schema.yml@7.3.0"
21+
uses: "doctrine/.github/.github/workflows/website-schema.yml@8.0.0"

UPGRADE-2.17.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
UPGRADE FROM 2.16 to 2.17
22
=========================
33

4+
DoctrineExtension
5+
=================
6+
7+
Minor breaking change:
8+
`Doctrine\Bundle\DoctrineBundle\DependencyInjection\DoctrineExtension` no
9+
longer extends
10+
`Symfony\Bridge\Doctrine\DependencyInjection\AbstractDoctrineExtension`.
11+
412
Configuration
513
-------------
614

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"symfony/service-contracts": "^3"
4444
},
4545
"require-dev": {
46-
"doctrine/coding-standard": "^13",
46+
"doctrine/coding-standard": "^14",
4747
"doctrine/orm": "^3.4.4",
4848
"phpstan/phpstan": "2.1.1",
4949
"phpstan/phpstan-phpunit": "2.0.3",

phpunit.xml.dist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
colors="true"
44
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
55
displayDetailsOnTestsThatTriggerDeprecations="true"
6+
displayDetailsOnPhpunitDeprecations="true"
67
failOnDeprecation="true"
8+
failOnPhpunitDeprecation="true"
79
>
810
<testsuites>
911
<testsuite name="DoctrineBundle for the Symfony Framework">

0 commit comments

Comments
 (0)