Skip to content

Commit e493866

Browse files
committed
remove workarounds for symfony 5
1 parent af24cbb commit e493866

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

composer.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@
2727
"symfony/phpunit-bridge": "^7.0.3"
2828
},
2929
"conflict": {
30+
"doctrine/phpcr-odm": "<2.0",
3031
"doctrine/phpcr-bundle": "<3.0",
31-
"symfony/framework-bundle": "<5.4.6"
32+
"symfony/framework-bundle": "<6.4"
3233
},
3334
"autoload": {
3435
"psr-4": {

resources/config/dist/security.php

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
],
4141
];
4242

43-
4443
if (class_exists(\Symfony\Component\Security\Core\Security::class)) {
4544
// Symfony 6 but not 7
4645
$config['enable_authenticator_manager'] = true;

src/Functional/BaseTestCase.php

+1-8
Original file line numberDiff line numberDiff line change
@@ -143,14 +143,7 @@ protected function getDbManager(string $type)
143143
));
144144
}
145145

146-
$refl = new \ReflectionClass($className);
147-
if (1 === $refl->getConstructor()->getNumberOfParameters()) {
148-
// phpcr-bundle < 3
149-
$dbManager = new $className(self::getContainer());
150-
} else {
151-
// phpcr-bundle >= 3
152-
$dbManager = new $className(self::getContainer()->get('doctrine_phpcr'), self::getContainer()->get('doctrine_phpcr.initializer_manager'));
153-
}
146+
$dbManager = new $className(self::getContainer());
154147

155148
$this->dbManagers[$type] = $dbManager;
156149

0 commit comments

Comments
 (0)