Skip to content

Commit 38ce14c

Browse files
authored
Merge pull request #523 from greg0ire/2.0.x
Merge 1.8.x up into 2.0.x
2 parents f7f1e12 + bea0303 commit 38ce14c

File tree

7 files changed

+16
-9
lines changed

7 files changed

+16
-9
lines changed

.github/dependabot.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
version: 2
22
updates:
3+
- package-ecosystem: "composer"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"
7+
time: "11:00"
8+
open-pull-requests-limit: 10
9+
labels:
10+
- "Dependencies"
11+
versioning-strategy: "increase-if-necessary"
312
- package-ecosystem: "github-actions"
413
directory: "/"
514
schedule:

.github/workflows/coding-standards.yml

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

.github/workflows/continuous-integration.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
- "8.1"
2929
- "8.2"
3030
- "8.3"
31+
- "8.4"
3132
dependencies:
3233
- "highest"
3334
stability:
@@ -36,9 +37,6 @@ jobs:
3637
- php-version: "8.1"
3738
dependencies: "lowest"
3839
stability: "stable"
39-
- php-version: "8.3"
40-
dependencies: "highest"
41-
stability: "dev"
4240

4341
steps:
4442
- name: "Checkout"

.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@6.0.0"
20+
uses: "doctrine/.github/.github/workflows/documentation.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
jobs:
1212
static-analysis:
1313
name: "Static Analysis"
14-
uses: "doctrine/.github/.github/workflows/phpstan.yml@6.0.0"
14+
uses: "doctrine/.github/.github/workflows/phpstan.yml@7.2.2"

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
"doctrine/mongodb-odm": "^1.3.0 || ^2.0.0",
3131
"doctrine/orm": "^2.14 || ^3",
3232
"fig/log-test": "^1",
33-
"phpstan/phpstan": "^1.10",
34-
"phpunit/phpunit": "^10.5.3",
33+
"phpstan/phpstan": "1.12.21",
34+
"phpunit/phpunit": "10.5.45",
3535
"symfony/cache": "^6.4 || ^7",
3636
"symfony/var-exporter": "^6.4 || ^7"
3737
},

0 commit comments

Comments
 (0)