Skip to content

Commit 2182b6d

Browse files
authored
Merge pull request #111 from mezzio/2.12.x-merge-up-into-3.0.x_MfuMAbPC
Merge release 2.12.0 into 3.0.x
2 parents 5ccfea7 + 8ba6f81 commit 2182b6d

8 files changed

Lines changed: 181 additions & 166 deletions

File tree

.github/workflows/continuous-integration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
tags:
88

99
env:
10-
default_php: 8.1
10+
default_php: 8.2
1111

1212
jobs:
1313
ci:
@@ -35,4 +35,4 @@ jobs:
3535
php-version: ${{ env.default_php }}
3636
tools: composer
3737
- uses: ramsey/composer-install@v3
38-
- run: composer dep-analysis
38+
- run: composer dep-analysis

.laminas-ci.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"ignore_php_platform_requirements": {
3-
"8.4": false
3+
"8.5": true
44
},
55
"backwardCompatibilityCheck": true
66
}

composer.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"config": {
2727
"sort-packages": true,
2828
"platform": {
29-
"php": "8.1.99"
29+
"php": "8.2.99"
3030
},
3131
"allow-plugins": {
3232
"dealerdirect/phpcodesniffer-composer-installer": true
@@ -38,11 +38,11 @@
3838
}
3939
},
4040
"require": {
41-
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
41+
"php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
4242
"ext-dom": "*",
4343
"ext-json": "*",
4444
"laminas/laminas-hydrator": "^4.16",
45-
"mezzio/mezzio-helpers": "^5.19",
45+
"mezzio/mezzio-helpers": "^5.20.0",
4646
"psr/container": "^1.1.2 || ^2.0.2",
4747
"psr/http-factory": "^1.0",
4848
"psr/http-message": "^1.0.1 || ^2.0.0",
@@ -51,15 +51,15 @@
5151
"willdurand/negotiation": "^3.0"
5252
},
5353
"require-dev": {
54-
"doctrine/orm": "^3.5",
54+
"doctrine/orm": "^3.5.2",
5555
"laminas/laminas-coding-standard": "^3.1.0",
56-
"laminas/laminas-paginator": "^2.19",
57-
"phpspec/prophecy": "^1.22",
58-
"phpspec/prophecy-phpunit": "^2.2.0",
59-
"phpunit/phpunit": "^9.6.21",
56+
"laminas/laminas-paginator": "^2.19.0",
57+
"phpspec/prophecy": "^1.23",
58+
"phpspec/prophecy-phpunit": "^2.4.0",
59+
"phpunit/phpunit": "^9.6.29",
6060
"psalm/plugin-phpunit": "^0.19.5",
61-
"rector/rector": "^2.1",
62-
"shipmonk/composer-dependency-analyser": "^1.8",
61+
"rector/rector": "^2.2.3",
62+
"shipmonk/composer-dependency-analyser": "^1.8.3",
6363
"vimeo/psalm": "^6.13.1"
6464
},
6565
"provide": {

0 commit comments

Comments
 (0)