require-dev support for ORM 3 (#792)

sonata-project · Mar 17, 2024 · 3e529ee · 3e529ee
1 parent a946f3c
commit 3e529ee
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -42,9 +42,9 @@
         "twig/twig": "^3.0"
     },
     "require-dev": {
-        "dama/doctrine-test-bundle": "^8.0",
-        "doctrine/doctrine-bundle": "^2.7",
-        "doctrine/orm": "^2.14",
+        "dama/doctrine-test-bundle": "^8.0.2",
+        "doctrine/doctrine-bundle": "^2.11",
+        "doctrine/orm": "^2.16 || ^3.0",
         "friendsofphp/php-cs-fixer": "^3.4",
         "knplabs/knp-menu-bundle": "^3.0",
         "matthiasnoback/symfony-config-test": "^4.2 || ^5.0",
@@ -62,7 +62,7 @@
         "sonata-project/classification-bundle": "^4.0",
         "sonata-project/doctrine-extensions": "^1.0 || ^2.0",
         "sonata-project/doctrine-orm-admin-bundle": "^4.0",
-        "sonata-project/media-bundle": "^4.2",
+        "sonata-project/media-bundle": "^4.13",
         "sonata-project/twig-extensions": "^1.0 || ^2.0",
         "symfony/browser-kit": "^5.4 || ^6.2 || ^7.0",
         "symfony/filesystem": "^5.4 || ^6.2 || ^7.0",

diff --git a/tests/App/config/config.yaml b/tests/App/config/config.yaml
@@ -20,6 +20,7 @@ doctrine:
     orm:
         entity_managers:
             default:
+                report_fields_where_declared: true
                 mappings:
                     SonataMediaBundle: null
                     SonataFormatterTest:

diff --git a/tests/custom_bootstrap.php b/tests/custom_bootstrap.php
@@ -19,6 +19,7 @@
 
 $kernel = new AppKernel($_SERVER['APP_ENV'] ?? 'test', (bool) ($_SERVER['APP_DEBUG'] ?? false));
 $application = new Application($kernel);
+$application->setCatchExceptions(false);
 $application->setAutoExit(false);
 
 $input = new ArrayInput([
@@ -27,12 +28,6 @@
 ]);
 $application->run($input, new NullOutput());
 
-$input = new ArrayInput([
-    'command' => 'doctrine:database:create',
-    '--no-interaction' => true,
-]);
-$application->run($input, new NullOutput());
-
 $input = new ArrayInput([
     'command' => 'doctrine:schema:create',
 ]);