Skip to content

Commit cfaf99d

Browse files
greg0iregreg0ire
committed
Merge remote-tracking branch 'origin/3.1.x' into 3.2.x
2 parents 812edf8 + 1ffb6fa commit cfaf99d

6 files changed

Lines changed: 13 additions & 132 deletions

File tree

‎.doctrine-project.json‎

Lines changed: 8 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,22 @@
1010
"slug": "latest",
1111
"upcoming": true
1212
},
13+
{
14+
"name": "3.2",
15+
"branchName": "3.2.x",
16+
"slug": "3.2",
17+
"upcoming": true
18+
},
1319
{
1420
"name": "3.1",
1521
"branchName": "3.1.x",
1622
"slug": "3.1",
17-
"upcoming": true
23+
"current": true
1824
},
1925
{
2026
"name": "3.0",
21-
"branchName": "3.0.x",
2227
"slug": "3.0",
23-
"current": true
28+
"maintained": false
2429
},
2530
{
2631
"name": "2.19",
@@ -34,12 +39,6 @@
3439
"slug": "2.18",
3540
"maintained": true
3641
},
37-
{
38-
"name": "2.17",
39-
"branchName": "2.17.x",
40-
"slug": "2.17",
41-
"maintained": false
42-
},
4342
{
4443
"name": "2.16",
4544
"slug": "2.16",
@@ -75,16 +74,6 @@
7574
"slug": "2.10",
7675
"maintained": false
7776
},
78-
{
79-
"name": "2.9",
80-
"slug": "2.9",
81-
"maintained": false
82-
},
83-
{
84-
"name": "2.8",
85-
"slug": "2.8",
86-
"maintained": false
87-
},
8877
{
8978
"name": "2.7",
9079
"slug": "2.7",
@@ -95,31 +84,6 @@
9584
"slug": "2.6",
9685
"maintained": false
9786
},
98-
{
99-
"name": "2.5",
100-
"slug": "2.5",
101-
"maintained": false
102-
},
103-
{
104-
"name": "2.4",
105-
"slug": "2.4",
106-
"maintained": false
107-
},
108-
{
109-
"name": "2.3",
110-
"slug": "2.3",
111-
"maintained": false
112-
},
113-
{
114-
"name": "2.2",
115-
"slug": "2.2",
116-
"maintained": false
117-
},
118-
{
119-
"name": "2.1",
120-
"slug": "2.1",
121-
"maintained": false
122-
},
12387
{
12488
"name": "2.0",
12589
"slug": "2.0",
@@ -129,61 +93,6 @@
12993
"name": "1.12",
13094
"slug": "1.12",
13195
"maintained": false
132-
},
133-
{
134-
"name": "1.11",
135-
"slug": "1.11",
136-
"maintained": false
137-
},
138-
{
139-
"name": "1.10",
140-
"slug": "1.10",
141-
"maintained": false
142-
},
143-
{
144-
"name": "1.9",
145-
"slug": "1.9",
146-
"maintained": false
147-
},
148-
{
149-
"name": "1.8",
150-
"slug": "1.8",
151-
"maintained": false
152-
},
153-
{
154-
"name": "1.7",
155-
"slug": "1.7",
156-
"maintained": false
157-
},
158-
{
159-
"name": "1.6",
160-
"slug": "1.6",
161-
"maintained": false
162-
},
163-
{
164-
"name": "1.5",
165-
"slug": "1.5",
166-
"maintained": false
167-
},
168-
{
169-
"name": "1.4",
170-
"slug": "1.4",
171-
"maintained": false
172-
},
173-
{
174-
"name": "1.3",
175-
"slug": "1.3",
176-
"maintained": false
177-
},
178-
{
179-
"name": "1.2",
180-
"slug": "1.2",
181-
"maintained": false
182-
},
183-
{
184-
"name": "1.1",
185-
"slug": "1.1",
186-
"maintained": false
18796
}
18897
]
18998
}

‎.symfony.bundle.yaml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,25 @@
11
branches:
2-
- "2.5.x"
32
- "2.6.x"
43
- "2.7.x"
5-
- "2.8.x"
6-
- "2.9.x"
74
- "2.10.x"
85
- "2.11.x"
96
- "2.12.x"
107
- "2.13.x"
118
- "2.14.x"
129
- "2.15.x"
1310
- "2.16.x"
14-
- "2.17.x"
1511
- "2.18.x"
1612
- "2.19.x"
1713
- "3.0.x"
1814
- "3.1.x"
15+
- "3.2.x"
1916
- "4.0.x"
2017
maintained_branches:
2118
- "2.18.x"
2219
- "2.19.x"
23-
- "3.0.x"
2420
- "3.1.x"
21+
- "3.2.x"
2522
- "4.0.x"
2623
doc_dir: "docs/en/"
27-
current_branch: "3.0.x"
28-
dev_branch: "3.1.x"
24+
current_branch: "3.1.x"
25+
dev_branch: "3.2.x"

‎composer.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,12 @@
6060
"symfony/string": "^6.4 || ^7.0 || ^8.0",
6161
"symfony/twig-bridge": "^6.4 || ^7.0 || ^8.0",
6262
"symfony/validator": "^6.4 || ^7.0 || ^8.0",
63-
"symfony/var-exporter": "^6.4.1 || ^7.0.1 || ^8.0",
6463
"symfony/web-profiler-bundle": "^6.4 || ^7.0 || ^8.0",
6564
"symfony/yaml": "^6.4 || ^7.0 || ^8.0",
6665
"twig/twig": "^3.21.1"
6766
},
6867
"conflict": {
6968
"doctrine/orm": "<3.0 || >=4.0",
70-
"symfony/var-exporter": "< 6.4.1 || 7.0.0",
7169
"twig/twig": "<3.0.4"
7270
},
7371
"suggest": {

‎docs/en/doctrine-console.rst‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ names and the names used by this bundle:
2525
+--------------------------------------------+---------------------------------------+
2626
| Bundle Command Name | Original Doctrine Command Name |
2727
+============================================+=======================================+
28-
| ``doctrine:query:sql`` | ``dbal:run-sql`` |
29-
+--------------------------------------------+---------------------------------------+
3028
| ``doctrine:cache:clear-metadata`` | ``orm:clear-cache:metadata`` |
3129
+--------------------------------------------+---------------------------------------+
3230
| ``doctrine:cache:clear-query`` | ``orm:clear-cache:query`` |
@@ -39,16 +37,12 @@ names and the names used by this bundle:
3937
+--------------------------------------------+---------------------------------------+
4038
| ``doctrine:cache:clear-query-region`` | ``orm:clear-cache:region:query`` |
4139
+--------------------------------------------+---------------------------------------+
42-
| ``doctrine:mapping:convert`` | ``orm:convert-mapping`` |
43-
+--------------------------------------------+---------------------------------------+
4440
| ``doctrine:schema:create`` | ``orm:schema-tool:create`` |
4541
+--------------------------------------------+---------------------------------------+
4642
| ``doctrine:schema:drop`` | ``orm:schema-tool:drop`` |
4743
+--------------------------------------------+---------------------------------------+
4844
| ``doctrine:schema:update`` | ``orm:schema-tool:update`` |
4945
+--------------------------------------------+---------------------------------------+
50-
| ``doctrine:ensure-production-settings`` | ``orm:ensure-production-settings`` |
51-
+--------------------------------------------+---------------------------------------+
5246
| ``doctrine:mapping:info`` | ``orm:info`` |
5347
+--------------------------------------------+---------------------------------------+
5448
| ``doctrine:mapping:describe`` | ``orm:mapping:describe`` |
@@ -62,7 +56,6 @@ Additionally, the bundle provides the following commands:
6256

6357
- ``doctrine:database:create``
6458
- ``doctrine:database:drop``
65-
- ``doctrine:mapping:import``
6659

6760
To get a list of all available Doctrine commands, run:
6861

‎tests/DependencyInjection/AbstractDoctrineExtensionTestCase.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
use PDO;
2828
use PHPUnit\Framework\Attributes\DataProvider;
2929
use PHPUnit\Framework\Attributes\IgnoreDeprecations;
30-
use PHPUnit\Framework\Attributes\RequiresMethod;
3130
use PHPUnit\Framework\TestCase;
3231
use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterEventListenersAndSubscribersPass;
3332
use Symfony\Bundle\DoctrineBundle\Tests\DependencyInjection\TestHydrator;
@@ -42,7 +41,6 @@
4241
use Symfony\Component\DependencyInjection\Reference;
4342
use Symfony\Component\DependencyInjection\ServiceLocator;
4443
use Symfony\Component\Security\Core\User\UserInterface;
45-
use Symfony\Component\VarExporter\ProxyHelper;
4644

4745
use function array_filter;
4846
use function array_keys;
@@ -1190,7 +1188,6 @@ public function testDisableSchemaValidation(): void
11901188
$this->assertFalse($collectorDefinition->getArguments()[1]);
11911189
}
11921190

1193-
#[RequiresMethod(ProxyHelper::class, 'generateLazyGhost')]
11941191
public function testNativeLazyObjectsWithoutConfig(): void
11951192
{
11961193
if (! interface_exists(EntityManagerInterface::class)) {
@@ -1215,15 +1212,14 @@ public function testNativeLazyObjectsWithConfigTrue(): void
12151212
);
12161213
}
12171214

1218-
#[RequiresMethod(ProxyHelper::class, 'generateLazyGhost')]
12191215
public function testNativeLazyObjectsWithConfigFalse(): void
12201216
{
12211217
if (! interface_exists(EntityManagerInterface::class)) {
12221218
self::markTestSkipped('This test requires ORM');
12231219
}
12241220

12251221
$this->expectException(InvalidConfigurationException::class);
1226-
$container = $this->loadContainer('orm_native_lazy_objects_disable');
1222+
$this->loadContainer('orm_native_lazy_objects_disable');
12271223
}
12281224

12291225
/** @param list<string> $bundles */

‎tests/LazyObjectEntityManagerInterface.php‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)