Skip to content

Commit b7e1c5a

Browse files
committed
upgraded to doctrine/doctrine-module ^6.2.0
1 parent 1032297 commit b7e1c5a

File tree

2 files changed

+11
-28
lines changed

2 files changed

+11
-28
lines changed

composer.json

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@
1414
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
1515
"ext-json": "*",
1616
"doctrine/dbal": "^3.3.2",
17-
"doctrine/doctrine-laminas-hydrator": "^3.0.0",
18-
"doctrine/doctrine-module": "^5.3.0 || ^6.0.5",
17+
"doctrine/doctrine-laminas-hydrator": "^3.2.0",
18+
"doctrine/doctrine-module": "^6.2.0",
1919
"doctrine/event-manager": "^2.0.0",
2020
"doctrine/orm": "^2.13.0",
21-
"doctrine/persistence": "^2.3.0 || ^3.0.0",
22-
"laminas/laminas-eventmanager": "^3.4.0",
21+
"doctrine/persistence": "^3.0.0",
22+
"laminas/laminas-eventmanager": "^3.5.0",
2323
"laminas/laminas-modulemanager": "^2.11.0",
24-
"laminas/laminas-mvc": "^3.3.2",
25-
"laminas/laminas-paginator": "^2.12.2",
24+
"laminas/laminas-mvc": "^3.3.5",
25+
"laminas/laminas-paginator": "^2.13.0",
2626
"laminas/laminas-servicemanager": "^3.17.0",
27-
"laminas/laminas-stdlib": "^3.7.1",
27+
"laminas/laminas-stdlib": "^3.13.0",
2828
"psr/container": "^1.1.2",
29-
"symfony/console": "^5.4.3 || ^6.0.3"
29+
"symfony/console": "^6.1.2 || ^7.0.0"
3030
},
3131
"require-dev": {
32-
"doctrine/annotations": "^1.13.2",
32+
"doctrine/annotations": "^2.0.0",
3333
"doctrine/coding-standard": "^9.0.0",
3434
"doctrine/data-fixtures": "^1.5.2",
3535
"doctrine/migrations": "^3.8.0",
@@ -45,7 +45,8 @@
4545
"squizlabs/php_codesniffer": "^3.6.2"
4646
},
4747
"conflict": {
48-
"doctrine/migrations": "<3.8"
48+
"doctrine/migrations": "<3.8",
49+
"laminas/laminas-form": "<3.10"
4950
},
5051
"suggest": {
5152
"doctrine/migrations": "doctrine migrations if you want to keep your schema definitions versioned",

tests/CliConfiguratorTest.php

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -112,15 +112,6 @@ public function testValidHelpers(): void
112112
assert($emHelper instanceof EntityManagerHelper);
113113
$this->assertInstanceOf(EntityManagerHelper::class, $emHelper);
114114
$this->assertSame($this->objectManager, $emHelper->getEntityManager());
115-
116-
if (! class_exists(ConnectionHelper::class)) {
117-
return;
118-
}
119-
120-
$dbHelper = $helperSet->get('db');
121-
assert($dbHelper instanceof ConnectionHelper);
122-
$this->assertInstanceOf(ConnectionHelper::class, $dbHelper);
123-
$this->assertSame($this->objectManager->getConnection(), $dbHelper->getConnection());
124115
}
125116

126117
/**
@@ -140,7 +131,6 @@ public function testValidCommands(string $commandName, string $className): void
140131
$cliConfigurator->configure($application);
141132

142133
$command = $application->get($commandName);
143-
assert($command instanceof Command);
144134
$this->assertInstanceOf($className, $command);
145135

146136
// check for the entity-manager option
@@ -224,14 +214,6 @@ public function dataProviderForTestValidCommands(): array
224214
],
225215
];
226216

227-
// this is only available with DBAL 2.x
228-
if (class_exists(ImportCommand::class)) {
229-
$data[] = [
230-
'dbal:import',
231-
ImportCommand::class,
232-
];
233-
}
234-
235217
return $data;
236218
}
237219
}

0 commit comments

Comments
 (0)