Skip to content

Commit d193707

Browse files
IonBazanIonBazan
committed
Merge branch '3.0.x' of github.com:doctrine/mongodb-odm into types-stage-2
2 parents 260a585 + 46d4505 commit d193707

31 files changed

+254
-107
lines changed

‎.doctrine-project.json‎

Lines changed: 15 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,27 @@
66
"docsSlug": "doctrine-mongodb-odm",
77
"versions": [
88
{
9-
"name": "2.15",
10-
"branchName": "2.15.x",
9+
"name": "3.0",
10+
"branchName": "3.0.x",
11+
"slug": "3.0",
12+
"upcoming": true
13+
},
14+
{
15+
"name": "2.16",
16+
"branchName": "2.16.x",
1117
"slug": "latest",
1218
"upcoming": true
1319
},
20+
{
21+
"name": "2.15",
22+
"branchName": "2.15.x",
23+
"slug": "2.15",
24+
"current": true
25+
},
1426
{
1527
"name": "2.14",
16-
"branchName": "2.14.x",
1728
"slug": "2.14",
18-
"current": true
29+
"maintained": false
1930
},
2031
{
2132
"name": "2.13",
@@ -56,57 +67,6 @@
5667
"name": "2.6",
5768
"slug": "2.6",
5869
"maintained": false
59-
},
60-
{
61-
"name": "2.5",
62-
"slug": "2.5",
63-
"maintained": false
64-
},
65-
{
66-
"name": "2.4",
67-
"slug": "2.4",
68-
"maintained": false
69-
},
70-
{
71-
"name": "2.3",
72-
"slug": "2.3",
73-
"maintained": false
74-
},
75-
{
76-
"name": "2.2",
77-
"slug": "2.2",
78-
"maintained": false
79-
},
80-
{
81-
"name": "2.1",
82-
"slug": "2.1",
83-
"maintained": false
84-
},
85-
{
86-
"name": "2.0",
87-
"slug": "2.0",
88-
"maintained": false
89-
},
90-
{
91-
"name": "1.3",
92-
"branchName": "1.3.x",
93-
"slug": "1.3",
94-
"maintained": false
95-
},
96-
{
97-
"name": "1.2",
98-
"slug": "1.2",
99-
"maintained": false
100-
},
101-
{
102-
"name": "1.1",
103-
"slug": "1.1",
104-
"maintained": false
105-
},
106-
{
107-
"name": "1.0",
108-
"slug": "1.0",
109-
"maintained": false
11070
}
11171
]
11272
}

‎.github/workflows/atlas-ci.yml‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ jobs:
1515
matrix:
1616
php-version:
1717
- "8.4"
18-
symfony:
19-
- "stable"
18+
symfony-version:
19+
- ""
2020
proxy:
2121
- "native"
2222
steps:
2323
- name: "Checkout"
24-
uses: "actions/checkout@v5"
24+
uses: "actions/checkout@v6"
2525
with:
2626
fetch-depth: 2
2727

@@ -58,7 +58,7 @@ jobs:
5858
uses: "shivammathur/setup-php@v2"
5959
with:
6060
php-version: "${{ matrix.php-version }}"
61-
tools: "pecl"
61+
tools: "flex"
6262
extensions: "mongodb, bcmath"
6363
coverage: "none"
6464
ini-values: "zend.assertions=1"
@@ -70,20 +70,13 @@ jobs:
7070
- name: "Remove phpbench/phpbench"
7171
run: composer remove --no-update --dev phpbench/phpbench
7272

73-
- name: "Configure Symfony ${{ matrix.symfony }}"
74-
if: "${{ matrix.symfony != 'stable' }}"
75-
run: |
76-
composer config minimum-stability dev
77-
# update symfony deps
78-
composer require --no-update symfony/console:^${{ matrix.symfony }}
79-
composer require --no-update symfony/var-dumper:^${{ matrix.symfony }}
80-
composer require --no-update --dev symfony/cache:^${{ matrix.symfony }}
81-
8273
- name: "Install dependencies with Composer"
8374
uses: "ramsey/composer-install@v3"
8475
with:
8576
dependency-versions: "highest"
8677
composer-options: "--prefer-dist"
78+
env:
79+
SYMFONY_REQUIRE: ${{ matrix.symfony-version }}
8780

8881
- name: "Run PHPUnit with Atlas Local"
8982
run: "vendor/bin/phpunit --group atlas"

‎.github/workflows/continuous-integration.yml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
matrix:
2121
php-version:
2222
- "8.4"
23+
- "8.5"
2324
mongodb-version:
2425
- "8.0"
2526
- "7.0"
@@ -31,48 +32,48 @@ jobs:
3132
dependencies:
3233
- "highest"
3334
symfony-version:
34-
- "stable"
35+
- "7.4"
3536
include:
3637
# Test against lowest dependencies
3738
- dependencies: "lowest"
3839
php-version: "8.4"
3940
mongodb-version: "6.0"
4041
driver-version: "2.1.0"
4142
topology: "server"
42-
symfony-version: "stable"
43+
symfony-version: ""
4344
# Test with Symfony 6.4
4445
- topology: "server"
4546
php-version: "8.4"
4647
mongodb-version: "6.0"
4748
driver-version: "stable"
4849
dependencies: "highest"
49-
symfony-version: "6.4"
50+
symfony-version: "6.4.*"
5051
# Test with a 6.0 replica set
5152
- topology: "replica_set"
5253
php-version: "8.4"
5354
mongodb-version: "6.0"
5455
driver-version: "stable"
5556
dependencies: "highest"
56-
symfony-version: "stable"
57+
symfony-version: ""
5758
# Test with a 8.0 replica set
5859
- topology: "replica_set"
5960
php-version: "8.4"
6061
mongodb-version: "8.0"
6162
driver-version: "stable"
6263
dependencies: "highest"
63-
symfony-version: "stable"
64+
symfony-version: ""
6465
# Test with a sharded cluster
6566
# Currently disabled due to a bug where MongoDB reports "sharding status unknown"
6667
# - topology: "sharded_cluster"
6768
# php-version: "8.4"
6869
# mongodb-version: "6.0"
6970
# driver-version: "stable"
7071
# dependencies: "highest"
71-
# symfony-version: "stable"
72+
# symfony-version: ""
7273

7374
steps:
7475
- name: "Checkout"
75-
uses: "actions/checkout@v5"
76+
uses: "actions/checkout@v6"
7677
with:
7778
fetch-depth: 2
7879

@@ -98,6 +99,7 @@ jobs:
9899
extensions: "mongodb-${{ matrix.driver-version }}, bcmath"
99100
coverage: "none"
100101
ini-values: "zend.assertions=1"
102+
tools: "flex"
101103

102104
- name: "Show driver information"
103105
run: "php --ri mongodb"

‎.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: "Generate documentation"
20-
uses: "doctrine/.github/.github/workflows/documentation.yml@v12.2.0"
20+
uses: "doctrine/.github/.github/workflows/documentation.yml@13.1.0"

‎.github/workflows/performance.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
matrix:
1717
php-version:
1818
- "8.4"
19+
- "8.5"
1920

2021
services:
2122
mongodb:
@@ -25,7 +26,7 @@ jobs:
2526

2627
steps:
2728
- name: "Checkout"
28-
uses: "actions/checkout@v5"
29+
uses: "actions/checkout@v6"
2930

3031
- name: Setup cache environment
3132
id: extcache
@@ -58,7 +59,7 @@ jobs:
5859
- name: "Upload composer.lock as build artifact"
5960
uses: actions/upload-artifact@v5
6061
with:
61-
name: composer.lock
62+
name: composer.lock-${{ matrix.php-version }}
6263
path: composer.lock
6364

6465
- name: "Run PHPBench"

‎.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@v12.2.0"
11+
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@13.1.0"
1212
with:
1313
use-next-minor-as-default-branch: true
1414
secrets:

‎.github/workflows/static-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- name: "Checkout code"
23-
uses: "actions/checkout@v5"
23+
uses: "actions/checkout@v6"
2424

2525
- name: Setup cache environment
2626
id: extcache

‎.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@v12.2.0"
21+
uses: "doctrine/.github/.github/workflows/website-schema.yml@13.0.0"

‎UPGRADE-2.16.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# UPGRADE FROM 2.15 to 2.16
2+
3+
## Lazy Proxy Directory
4+
5+
Using proxy classes with PHP 8.4+ is deprecated, only native lazy objects will
6+
be supported in MongoDB ODM 3.0.
7+
8+
Calling `Doctrine\ODM\MongoDB\Configuration::setProxyDir()` or
9+
`Doctrine\ODM\MongoDB\Configuration::getProxyDir()` is deprecated and triggers
10+
a deprecation notice when using native lazy objects.

‎benchmark/BaseBench.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public function initDocumentManager(): void
4141
$config->setDefaultDB(self::DATABASE_NAME);
4242
$config->setMetadataDriverImpl(self::createMetadataDriverImpl());
4343
$config->setMetadataCache(new ArrayAdapter());
44+
$config->setUseNativeLazyObject(true);
4445

4546
$client = new Client(
4647
getenv('DOCTRINE_MONGODB_SERVER') ?: self::DEFAULT_MONGODB_SERVER,

0 commit comments

Comments
 (0)