Skip to content

Commit 1baa268

Browse files
GromNaNGromNaN
authored
Merge release 2.12.0 into 3.0.x #2809
Merge release 2.12.0 into 3.0.x
2 parents b5ed621 + c88837c commit 1baa268

File tree

104 files changed

+3973
-673
lines changed

Some content is hidden

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

104 files changed

+3973
-673
lines changed

‎.doctrine-project.json‎

Lines changed: 34 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -5,142 +5,113 @@
55
"slug": "mongodb-odm",
66
"docsSlug": "doctrine-mongodb-odm",
77
"versions": [
8+
{
9+
"name": "2.13",
10+
"branchName": "2.13.x",
11+
"slug": "latest",
12+
"upcoming": true
13+
},
14+
{
15+
"name": "2.12",
16+
"branchName": "2.12.x",
17+
"slug": "latest",
18+
"current": true
19+
},
20+
{
21+
"name": "2.11",
22+
"branchName": "2.11.x",
23+
"slug": "2.11",
24+
"maintained": false
25+
},
826
{
927
"name": "2.10",
1028
"branchName": "2.10.x",
11-
"slug": "latest",
12-
"upcoming": true,
13-
"aliases": [
14-
"2.10.x"
15-
]
29+
"slug": "2.10",
30+
"maintained": false
1631
},
1732
{
1833
"name": "2.9",
1934
"branchName": "2.9.x",
2035
"slug": "2.9",
21-
"current": true,
22-
"aliases": [
23-
"current",
24-
"stable",
25-
"2.9.x"
26-
]
36+
"maintained": false
2737
},
2838
{
2939
"name": "2.8",
3040
"branchName": "2.8.x",
3141
"slug": "2.8",
32-
"maintained": false,
33-
"aliases": [
34-
"2.8.x"
35-
]
42+
"maintained": false
3643
},
3744
{
3845
"name": "2.7",
3946
"branchName": "2.7.x",
4047
"slug": "2.7",
41-
"maintained": false,
42-
"aliases": [
43-
"2.7.x"
44-
]
48+
"maintained": false
4549
},
4650
{
4751
"name": "2.6",
4852
"branchName": "2.6.x",
4953
"slug": "2.6",
50-
"maintained": false,
51-
"aliases": [
52-
"2.6.x"
53-
]
54+
"maintained": false
5455
},
5556
{
5657
"name": "2.5",
5758
"branchName": "2.5.x",
5859
"slug": "2.5",
59-
"maintained": false,
60-
"aliases": [
61-
"2.5.x"
62-
]
60+
"maintained": false
6361
},
6462
{
6563
"name": "2.4",
6664
"branchName": "2.4.x",
6765
"slug": "2.4",
68-
"maintained": false,
69-
"aliases": [
70-
"2.4.x"
71-
]
66+
"maintained": false
7267
},
7368
{
7469
"name": "2.3",
7570
"branchName": "2.3.x",
7671
"slug": "2.3",
77-
"maintained": false,
78-
"aliases": [
79-
"2.3.x"
80-
]
72+
"maintained": false
8173
},
8274
{
8375
"name": "2.2",
8476
"branchName": "2.2.x",
8577
"slug": "2.2",
86-
"maintained": false,
87-
"aliases": [
88-
"2.2.x"
89-
]
78+
"maintained": false
9079
},
9180
{
9281
"name": "2.1",
9382
"branchName": "2.1.x",
9483
"slug": "2.1",
95-
"maintained": false,
96-
"aliases": [
97-
"2.1.x"
98-
]
84+
"maintained": false
9985
},
10086
{
10187
"name": "2.0",
10288
"branchName": "2.0.x",
10389
"slug": "2.0",
104-
"maintained": false,
105-
"aliases": [
106-
"2.0.x"
107-
]
90+
"maintained": false
10891
},
10992
{
11093
"name": "1.3",
11194
"branchName": "1.3.x",
11295
"slug": "1.3",
113-
"maintained": false,
114-
"aliases": [
115-
"1.3.x"
116-
]
96+
"maintained": false
11797
},
11898
{
11999
"name": "1.2",
120100
"branchName": "1.2.x",
121101
"slug": "1.2",
122-
"maintained": false,
123-
"aliases": [
124-
"1.2.x"
125-
]
102+
"maintained": false
126103
},
127104
{
128105
"name": "1.1",
129106
"branchName": "1.1.x",
130107
"slug": "1.1",
131-
"maintained": false,
132-
"aliases": [
133-
"1.1.x"
134-
]
108+
"maintained": false
135109
},
136110
{
137111
"name": "1.0",
138112
"branchName": "1.0.x",
139113
"slug": "1.0",
140-
"maintained": false,
141-
"aliases": [
142-
"1.0.x"
143-
]
114+
"maintained": false
144115
}
145116
]
146117
}

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

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,14 @@ jobs:
6262
dependencies: "highest"
6363
symfony-version: "stable"
6464
proxy: "lazy-ghost"
65+
# Test with a 8.0 replica set
66+
- topology: "replica_set"
67+
php-version: "8.2"
68+
mongodb-version: "8.0"
69+
driver-version: "stable"
70+
dependencies: "highest"
71+
symfony-version: "stable"
72+
proxy: "lazy-ghost"
6573
# Test with ProxyManager
6674
- php-version: "8.2"
6775
mongodb-version: "6.0"
@@ -89,7 +97,7 @@ jobs:
8997

9098
steps:
9199
- name: "Checkout"
92-
uses: "actions/checkout@v4"
100+
uses: "actions/checkout@v5"
93101
with:
94102
fetch-depth: 2
95103

@@ -155,3 +163,4 @@ jobs:
155163
env:
156164
DOCTRINE_MONGODB_SERVER: ${{ steps.setup-mongodb.outputs.cluster-uri }}
157165
USE_LAZY_GHOST_OBJECTS: ${{ matrix.proxy == 'lazy-ghost' && '1' || '0' }}"
166+
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
@@ -21,7 +21,7 @@ jobs:
2121

2222
steps:
2323
- name: "Checkout code"
24-
uses: "actions/checkout@v4"
24+
uses: "actions/checkout@v5"
2525

2626
- name: "Install PHP"
2727
uses: "shivammathur/setup-php@v2"

‎.github/workflows/performance.yml‎

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

2626
steps:
2727
- name: "Checkout"
28-
uses: "actions/checkout@v4"
28+
uses: "actions/checkout@v5"
2929

3030
- name: Setup cache environment
3131
id: extcache

‎.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@7.2.2"
11+
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@7.3.0"
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ jobs:
1616
strategy:
1717
matrix:
1818
php-version:
19-
- "8.2"
19+
- "8.4"
2020

2121
steps:
2222
- name: "Checkout code"
23-
uses: "actions/checkout@v4"
23+
uses: "actions/checkout@v5"
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@7.2.2"
21+
uses: "doctrine/.github/.github/workflows/website-schema.yml@7.3.0"

‎composer.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"doctrine/instantiator": "^1.1 || ^2",
3131
"doctrine/persistence": "^3.2 || ^4",
3232
"friendsofphp/proxy-manager-lts": "^1.0",
33-
"mongodb/mongodb": "^1.21 || ^2.0@dev",
33+
"mongodb/mongodb": "^1.21.2 || ^2.1.1",
3434
"psr/cache": "^1.0 || ^2.0 || ^3.0",
3535
"symfony/console": "^5.4 || ^6.0 || ^7.0",
3636
"symfony/deprecation-contracts": "^2.2 || ^3.0",
@@ -44,8 +44,9 @@
4444
"doctrine/orm": "^3.2",
4545
"jmikola/geojson": "^1.0",
4646
"phpbench/phpbench": "^1.0.0",
47-
"phpstan/phpstan": "~1.10.67",
48-
"phpstan/phpstan-phpunit": "^1.0",
47+
"phpstan/phpstan": "^2.1",
48+
"phpstan/phpstan-deprecation-rules": "^2.0",
49+
"phpstan/phpstan-phpunit": "^2.0",
4950
"phpunit/phpunit": "^10.4",
5051
"squizlabs/php_codesniffer": "^3.5",
5152
"symfony/cache": "^5.4 || ^6.0 || ^7.0"

‎docs/en/cookbook/lookup-reference.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ and a date.
6868
#[Field(type: 'date_immutable')]
6969
public DateTimeImmutable $date;
7070
71-
/** @var Collection<Item> */
71+
/** @var Collection<int, Item> */
7272
#[ReferenceMany(
7373
targetDocument: Item::class,
7474
cascade: 'all',
@@ -378,7 +378,7 @@ You need to create a new class to hold the result of the aggregation.
378378
#[Field(type: 'date_immutable')]
379379
public DateTimeImmutable $date;
380380
381-
/** @var Collection<Item> */
381+
/** @var Collection<int, Item> */
382382
#[EmbedMany(targetDocument: Item::class)]
383383
public Collection $items;
384384
@@ -631,7 +631,7 @@ but not the user.
631631
#[Field(type: 'string')]
632632
public string $name;
633633
634-
/** @var Collection<UserOrderResult> */
634+
/** @var Collection<int, UserOrderResult> */
635635
#[EmbedMany(targetDocument: UserOrderResult::class)]
636636
public Collection $orders;
637637
}
@@ -645,7 +645,7 @@ but not the user.
645645
#[Field(type: 'date_immutable')]
646646
public DateTimeImmutable $date;
647647
648-
/** @var Collection<Item> */
648+
/** @var Collection<int, Item> */
649649
#[EmbedMany(targetDocument: Item::class)]
650650
public Collection $items;
651651
}

0 commit comments

Comments
 (0)