require-dev compatibility for Doctrine ORM 3 (#2448)

sonata-project · Mar 17, 2024 · 33b6cea · 33b6cea
1 parent e0436cc
commit 33b6cea
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -67,9 +67,9 @@
         "async-aws/simple-s3": "^1.0",
         "aws/aws-sdk-php": "^3.0",
         "dama/doctrine-test-bundle": "^8.0.1",
-        "doctrine/doctrine-bundle": "^2.7",
+        "doctrine/doctrine-bundle": "^2.11",
         "doctrine/mongodb-odm": "^2.4",
-        "doctrine/orm": "^2.14",
+        "doctrine/orm": "^2.16 || ^3.0",
         "friendsofphp/php-cs-fixer": "^3.4",
         "knplabs/knp-menu-bundle": "^3.0",
         "liip/imagine-bundle": "^2.0",

diff --git a/src/Resources/config/doctrine/BaseMedia.orm.xml b/src/Resources/config/doctrine/BaseMedia.orm.xml
@@ -14,7 +14,7 @@
         </field>
         <field name="width" column="width" type="integer" nullable="true"/>
         <field name="height" column="height" type="integer" nullable="true"/>
-        <field name="length" column="length" type="decimal" nullable="true"/>
+        <field name="length" column="length" type="decimal" nullable="true" precision="10"/>
         <field name="contentType" column="content_type" type="string" nullable="true" length="255"/>
         <field name="size" column="content_size" type="integer" nullable="true"/>
         <field name="copyright" column="copyright" type="string" nullable="true"/>

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

diff --git a/tests/custom_bootstrap.php b/tests/custom_bootstrap.php
@@ -20,19 +20,14 @@
 $kernel = new AppKernel($_SERVER['APP_ENV'] ?? 'test', (bool) ($_SERVER['APP_DEBUG'] ?? false));
 $application = new Application($kernel);
 $application->setAutoExit(false);
+$application->setCatchExceptions(false);
 
 $input = new ArrayInput([
     'command' => 'doctrine:database:drop',
     '--force' => true,
 ]);
 $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',
 ]);