diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c1566e72..86b86288b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [4.13.0](https://github.com/sonata-project/SonataMediaBundle/compare/4.12.0...4.13.0) - 2024-03-17 +### Added +- [[#2448](https://github.com/sonata-project/SonataMediaBundle/pull/2448)] Compatibility with ORM 3 ([@dmaicher](https://github.com/dmaicher)) + ## [4.12.0](https://github.com/sonata-project/SonataMediaBundle/compare/4.11.1...4.12.0) - 2024-03-08 ### Changed - [[#2444](https://github.com/sonata-project/SonataMediaBundle/pull/2444)] Throw TransformationFailedException when reverse transformation fails in ProviderDataTransformer. ([@jorrit](https://github.com/jorrit)) diff --git a/composer.json b/composer.json index f2828d78d..807e8915a 100644 --- 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 index 4b20327ce..dbc2188a3 100644 --- a/src/Resources/config/doctrine/BaseMedia.orm.xml +++ b/src/Resources/config/doctrine/BaseMedia.orm.xml @@ -14,7 +14,7 @@ - + diff --git a/tests/App/config/config.yaml b/tests/App/config/config.yaml index a57472321..b6fbda44d 100644 --- 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 index c3b163b37..d242405a5 100644 --- a/tests/custom_bootstrap.php +++ b/tests/custom_bootstrap.php @@ -20,6 +20,7 @@ $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', @@ -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', ]);