Skip to content

Commit 3552b4e

Browse files
authored
Merge release 2.14.0 into 3.0.x (#2880)
Merge release 2.14.0 into 3.0.x
2 parents 99dc686 + aa5df38 commit 3552b4e

File tree

703 files changed

+2321
-544
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

703 files changed

+2321
-544
lines changed

.doctrine-project.json

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,21 @@
66
"docsSlug": "doctrine-mongodb-odm",
77
"versions": [
88
{
9-
"name": "2.14",
10-
"branchName": "2.14.x",
9+
"name": "2.15",
10+
"branchName": "2.15.x",
1111
"slug": "latest",
1212
"upcoming": true
1313
},
14+
{
15+
"name": "2.14",
16+
"branchName": "2.14.x",
17+
"slug": "2.14",
18+
"current": true
19+
},
1420
{
1521
"name": "2.13",
16-
"branchName": "2.13.x",
1722
"slug": "2.13",
18-
"current": true
23+
"maintained": false
1924
},
2025
{
2126
"name": "2.12",

.github/workflows/atlas-ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,5 @@ jobs:
9696
run: "vendor/bin/phpunit --group atlas"
9797
env:
9898
DOCTRINE_MONGODB_SERVER: "mongodb://127.0.0.1:27017/?directConnection=true"
99-
USE_LAZY_GHOST_OBJECTS: ${{ matrix.proxy == 'lazy-ghost' && '1' || '0' }}
99+
USE_LAZY_GHOST_OBJECT: ${{ matrix.proxy == 'lazy-ghost' && '1' || '0' }}
100+
USE_NATIVE_LAZY_OBJECT: ${{ matrix.proxy == 'native' && '1' || '0' }}

.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@12.0.0"
14+
uses: "doctrine/.github/.github/workflows/coding-standards.yml@12.1.0"

.github/workflows/continuous-integration.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,13 @@ jobs:
7777
dependencies: "highest"
7878
symfony-version: "stable"
7979
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"
8087
# Test with extension 1.21
8188
- topology: "server"
8289
php-version: "8.2"
@@ -159,8 +166,9 @@ jobs:
159166
topology: ${{ matrix.topology }}
160167

161168
- name: "Run PHPUnit"
162-
run: "vendor/bin/phpunit --exclude-group=atlas"
169+
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' || '' }}"
163170
env:
164171
DOCTRINE_MONGODB_SERVER: ${{ steps.setup-mongodb.outputs.cluster-uri }}
165-
USE_LAZY_GHOST_OBJECTS: ${{ matrix.proxy == 'lazy-ghost' && '1' || '0' }}"
172+
USE_LAZY_GHOST_OBJECT: ${{ matrix.proxy == 'lazy-ghost' && '1' || '0' }}
173+
USE_NATIVE_LAZY_OBJECT: ${{ matrix.proxy == 'native' && '1' || '0' }}
166174
CRYPT_SHARED_LIB_PATH: ${{ steps.setup-mongodb.outputs.crypt-shared-lib-path }}

.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@12.0.0"
20+
uses: "doctrine/.github/.github/workflows/documentation.yml@12.1.0"

.github/workflows/performance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
uses: "ramsey/composer-install@v3"
5757

5858
- name: "Upload composer.lock as build artifact"
59-
uses: actions/upload-artifact@v4
59+
uses: actions/upload-artifact@v5
6060
with:
6161
name: composer.lock
6262
path: composer.lock

.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@12.0.0"
11+
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@12.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
@@ -51,7 +51,7 @@ jobs:
5151
uses: "ramsey/composer-install@v3"
5252

5353
- name: "Upload composer.lock as build artifact"
54-
uses: actions/upload-artifact@v4
54+
uses: actions/upload-artifact@v5
5555
with:
5656
name: "composer-lock-static-analysis-phpstan"
5757
path: composer.lock

.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@12.0.0"
21+
uses: "doctrine/.github/.github/workflows/website-schema.yml@12.1.0"

composer.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,17 @@
6363
"ext-bcmath": "Decimal128 type support"
6464
},
6565
"autoload": {
66-
"psr-4": { "Doctrine\\ODM\\MongoDB\\": "lib/Doctrine/ODM/MongoDB" }
66+
"psr-4": { "Doctrine\\ODM\\MongoDB\\": "src" }
6767
},
6868
"autoload-dev": {
6969
"psr-4": {
7070
"Doctrine\\ODM\\MongoDB\\Benchmark\\": "benchmark",
71-
"Doctrine\\ODM\\MongoDB\\Tests\\": "tests/Doctrine/ODM/MongoDB/Tests",
71+
"Doctrine\\ODM\\MongoDB\\Tests\\": "tests/Tests",
7272
"Documentation\\": "tests/Documentation",
7373
"Documents\\": "tests/Documents",
74+
"Documents84\\": "tests/Documents84",
7475
"Stubs\\": "tests/Stubs",
75-
"TestDocuments\\" :"tests/Doctrine/ODM/MongoDB/Tests/Mapping/Driver/fixtures"
76+
"TestDocuments\\" :"tests/Tests/Mapping/Driver/fixtures"
7677
}
7778
},
7879
"config": {

0 commit comments

Comments
 (0)