Skip to content

Commit 29033e2

Browse files
committed
Require PHP 8.4 and ext-mongodb 2
1 parent 3552b4e commit 29033e2

File tree

3 files changed

+10
-50
lines changed

3 files changed

+10
-50
lines changed

.github/workflows/atlas-ci.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,7 @@ jobs:
1818
symfony:
1919
- "stable"
2020
proxy:
21-
- "lazy-ghost"
22-
include:
23-
# Test with ProxyManager
24-
- php-version: "8.1"
25-
symfony: "6.4"
26-
proxy: "proxy-manager"
27-
os: "ubuntu-latest"
28-
21+
- "native"
2922
steps:
3023
- name: "Checkout"
3124
uses: "actions/checkout@v5"

.github/workflows/continuous-integration.yml

Lines changed: 6 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
php-version:
22-
- "8.1"
23-
- "8.2"
24-
- "8.3"
2522
- "8.4"
2623
mongodb-version:
2724
- "8.0"
@@ -35,63 +32,35 @@ jobs:
3532
- "highest"
3633
symfony-version:
3734
- "stable"
38-
proxy:
39-
- "lazy-ghost"
4035
include:
4136
# Test against lowest dependencies
4237
- dependencies: "lowest"
43-
php-version: "8.1"
38+
php-version: "8.4"
4439
mongodb-version: "6.0"
45-
driver-version: "1.21.0"
40+
driver-version: "2.0.0"
4641
topology: "server"
4742
symfony-version: "stable"
48-
proxy: "lazy-ghost"
4943
# Test with Symfony 6.4
5044
- topology: "server"
51-
php-version: "8.1"
45+
php-version: "8.4"
5246
mongodb-version: "6.0"
5347
driver-version: "stable"
5448
dependencies: "highest"
5549
symfony-version: "6.4"
56-
proxy: "lazy-ghost"
5750
# Test with a 6.0 replica set
5851
- topology: "replica_set"
59-
php-version: "8.2"
52+
php-version: "8.4"
6053
mongodb-version: "6.0"
6154
driver-version: "stable"
6255
dependencies: "highest"
6356
symfony-version: "stable"
64-
proxy: "lazy-ghost"
6557
# Test with a 8.0 replica set
6658
- topology: "replica_set"
67-
php-version: "8.2"
59+
php-version: "8.4"
6860
mongodb-version: "8.0"
6961
driver-version: "stable"
7062
dependencies: "highest"
7163
symfony-version: "stable"
72-
proxy: "lazy-ghost"
73-
# Test with ProxyManager
74-
- php-version: "8.2"
75-
mongodb-version: "6.0"
76-
driver-version: "stable"
77-
dependencies: "highest"
78-
symfony-version: "stable"
79-
proxy: "proxy-manager"
80-
# Test with Native Lazy Objects
81-
- php-version: "8.4"
82-
mongodb-version: "8.0"
83-
driver-version: "stable"
84-
dependencies: "highest"
85-
symfony-version: "stable"
86-
proxy: "native"
87-
# Test with extension 1.21
88-
- topology: "server"
89-
php-version: "8.2"
90-
mongodb-version: "8.0"
91-
driver-version: "1.21.0"
92-
dependencies: "highest"
93-
symfony-version: "stable"
94-
proxy: "lazy-ghost"
9564
# Test with a sharded cluster
9665
# Currently disabled due to a bug where MongoDB reports "sharding status unknown"
9766
# - topology: "sharded_cluster"
@@ -100,7 +69,6 @@ jobs:
10069
# driver-version: "stable"
10170
# dependencies: "highest"
10271
# symfony-version: "stable"
103-
# proxy: "lazy-ghost"
10472

10573
steps:
10674
- name: "Checkout"
@@ -169,6 +137,5 @@ jobs:
169137
run: "vendor/bin/phpunit --exclude-group=atlas ${{ matrix.dependencies == 'lowest' && '--do-not-fail-on-deprecation --do-not-fail-on-warning --do-not-fail-on-notice' || '' }}"
170138
env:
171139
DOCTRINE_MONGODB_SERVER: ${{ steps.setup-mongodb.outputs.cluster-uri }}
172-
USE_LAZY_GHOST_OBJECT: ${{ matrix.proxy == 'lazy-ghost' && '1' || '0' }}
173-
USE_NATIVE_LAZY_OBJECT: ${{ matrix.proxy == 'native' && '1' || '0' }}
140+
USE_NATIVE_LAZY_OBJECT: 1
174141
CRYPT_SHARED_LIB_PATH: ${{ steps.setup-mongodb.outputs.crypt-shared-lib-path }}

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@
2424
"docs": "composer update -d docs && ./docs/vendor/bin/build-docs.sh @additional_args"
2525
},
2626
"require": {
27-
"php": "^8.1",
28-
"ext-mongodb": "^1.21 || ^2.0",
27+
"php": "^8.4",
28+
"ext-mongodb": "^2.0",
2929
"composer-runtime-api": "^2.0",
3030
"doctrine/cache": "^1.11 || ^2.0",
3131
"doctrine/collections": "^1.5 || ^2.0",
3232
"doctrine/event-manager": "^1.0 || ^2.0",
3333
"doctrine/instantiator": "^1.1 || ^2",
3434
"doctrine/persistence": "^3.2 || ^4",
3535
"friendsofphp/proxy-manager-lts": "^1.0",
36-
"mongodb/mongodb": "^1.21.2 || ^2.1.1",
36+
"mongodb/mongodb": "^2.1.1",
3737
"psr/cache": "^1.0 || ^2.0 || ^3.0",
3838
"symfony/console": "^5.4 || ^6.0 || ^7.0",
3939
"symfony/deprecation-contracts": "^2.2 || ^3.0",

0 commit comments

Comments
 (0)