Skip to content

Commit 73ae542

Browse files
authored
Merge pull request #500 from doctrine/4.0.x
Merge 4.0.x up into 4.1.x
2 parents 556b4cf + c7e9e2b commit 73ae542

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

.github/workflows/coding-standards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ on:
1212
jobs:
1313
coding-standards:
1414
name: "Coding Standards"
15-
uses: "doctrine/.github/.github/workflows/coding-standards.yml@6.0.0"
15+
uses: "doctrine/.github/.github/workflows/coding-standards.yml@7.2.2"

.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@6.0.0"
20+
uses: "doctrine/.github/.github/workflows/composer-lint.yml@7.2.2"

.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@6.0.0"
11+
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@7.2.2"
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
@@ -11,4 +11,4 @@ on:
1111

1212
jobs:
1313
static-analysis:
14-
uses: "doctrine/.github/.github/workflows/phpstan.yml@6.0.0"
14+
uses: "doctrine/.github/.github/workflows/phpstan.yml@7.2.2"

UPGRADE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ types from this bundle need to be updated to match the new signatures.
1111
Some classes have been marked as `final` because they are not supposed to be
1212
extended. Consider using composition instead of inheritance.
1313

14-
## Mandatory ManagerRegistry argument
14+
## Mandatory `ManagerRegistry` argument
1515

1616
It is now mandatory to pass a `ManagerRegistry` instance to the constructor of
1717
`Doctrine\Bundle\FixturesBundle\Command\LoadDataFixturesDoctrineCommand`.

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
"symfony/http-kernel": "^6.4 || ^7.0"
3838
},
3939
"require-dev": {
40-
"doctrine/coding-standard": "^12",
41-
"phpstan/phpstan": "^2",
42-
"phpunit/phpunit": "^10.5.38 || ^11"
40+
"doctrine/coding-standard": "12.0.0",
41+
"phpstan/phpstan": "2.1.8",
42+
"phpunit/phpunit": "^10.5.38 || 11.4.14"
4343
},
4444
"conflict": {
4545
"doctrine/dbal": "< 3"

0 commit comments

Comments
 (0)