Add support for Doctrine DBAL 4 and ORM 3 #494

dmaicher · 2023-11-13T20:09:00Z

Subject

I am targeting this branch, because its BC.

Changelog

### Added
- compatibility with `doctrine/dbal` 4 and `doctrine/orm` 3

dmaicher · 2023-11-13T20:12:16Z

currently CI does not run any build with stability=dev dependencies. Shall I add that somehow on devkit? Not so familiar with that.

passes fine locally with dev dependencies and DBAL 4 + ORM 3

PHPUnit 9.6.13 by Sebastian Bergmann and contributors.

Testing 
.........................................                         41 / 41 (100%)

Time: 00:00.255, Memory: 30.00 MB

OK (41 tests, 76 assertions)

Remaining indirect deprecation notices (5)

  2x: Since symfony/framework-bundle 6.4: Not setting the "framework.handle_all_throwables" config option is deprecated. It will default to "true" in 7.0.
    2x in DoctrineORMMapperTest::testDoctrineMappingLoaded from Sonata\Doctrine\Tests\Mapper\ORM

  2x: Since symfony/framework-bundle 6.4: Not setting the "framework.php_errors.log" config option is deprecated. It will default to "true" in 7.0.
    2x in DoctrineORMMapperTest::testDoctrineMappingLoaded from Sonata\Doctrine\Tests\Mapper\ORM

  1x: Since symfony/framework-bundle 6.4: Enabling the integration of Doctrine annotations is deprecated. Set the "framework.annotations.enabled" config option to false.
    1x in DoctrineORMMapperTest::testDoctrineMappingLoaded from Sonata\Doctrine\Tests\Mapper\ORM

Other deprecation notices (2)

  1x: Since symfony/framework-bundle 6.4: The "annotations.cache_warmer" service is deprecated without replacement.
    1x in DoctrineORMMapperTest::testDoctrineMappingLoaded from Sonata\Doctrine\Tests\Mapper\ORM

  1x: Since symfony/framework-bundle 6.4: The "annotations.reader" service is deprecated without replacement.
    1x in DoctrineORMMapperTest::testDoctrineMappingLoaded from Sonata\Doctrine\Tests\Mapper\ORM

dmaicher · 2023-11-13T20:20:48Z

tests/App/Kernel.php

@@ -63,6 +63,7 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
        $container->loadFromExtension('doctrine', [
            'dbal' => ['url' => 'sqlite://:memory:'],
            'orm' => [
+                'report_fields_where_declared' => true,


needed on ORM 3. Otherwise:

1) Sonata\Doctrine\Tests\Mapper\ORM\DoctrineORMMapperTest::testDoctrineMappingLoaded InvalidArgumentException: The $reportFieldsWhereDeclared argument is no longer supported, make sure to omit it when calling Doctrine\ORM\Mapping\Driver\AttributeDriver::__construct. /var/www/sonata-doctrine-extensions/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/Driver/AttributeDriver.php:45 /tmp/sonata-doctrine-extensions/var/cache/ContainerKqO7EY2/get_Doctrine_Orm_DefaultMetadataDriverService.php:21 /tmp/sonata-doctrine-extensions/var/cache/ContainerKqO7EY2/Sonata_Doctrine_Tests_App_KernelTestDebugContainer.php:98 /tmp/sonata-doctrine-extensions/var/cache/ContainerKqO7EY2/getDoctrine_Orm_DefaultConfigurationService.php:26 /tmp/sonata-doctrine-extensions/var/cache/ContainerKqO7EY2/Sonata_Doctrine_Tests_App_KernelTestDebugContainer.php:98 /tmp/sonata-doctrine-extensions/var/cache/ContainerKqO7EY2/getDoctrine_Orm_DefaultEntityManagerService.php:24 /tmp/sonata-doctrine-extensions/var/cache/ContainerKqO7EY2/getDoctrine_Orm_DefaultEntityManagerService.php:21 /var/www/sonata-doctrine-extensions/vendor/symfony/var-exporter/Internal/LazyObjectState.php:97 /var/www/sonata-doctrine-extensions/vendor/symfony/var-exporter/LazyGhostTrait.php:176 /var/www/sonata-doctrine-extensions/vendor/doctrine/orm/lib/Doctrine/ORM/EntityManager.php:513 /var/www/sonata-doctrine-extensions/vendor/symfony/doctrine-bridge/CacheWarmer/ProxyCacheWarmer.php:48 /var/www/sonata-doctrine-extensions/vendor/symfony/http-kernel/CacheWarmer/CacheWarmerAggregate.php:108 /var/www/sonata-doctrine-extensions/vendor/symfony/http-kernel/Kernel.php:545 /var/www/sonata-doctrine-extensions/vendor/symfony/http-kernel/Kernel.php:763 /var/www/sonata-doctrine-extensions/vendor/symfony/http-kernel/Kernel.php:126 /var/www/sonata-doctrine-extensions/vendor/symfony/framework-bundle/Test/KernelTestCase.php:73 /var/www/sonata-doctrine-extensions/tests/Mapper/ORM/DoctrineORMMapperTest.php:58 /var/www/sonata-doctrine-extensions/vendor/phpunit/phpunit/src/Framework/TestResult.php:728 /var/www/sonata-doctrine-extensions/vendor/phpunit/phpunit/src/Framework/TestSuite.php:684 /var/www/sonata-doctrine-extensions/vendor/phpunit/phpunit/src/Framework/TestSuite.php:684 /var/www/sonata-doctrine-extensions/vendor/phpunit/phpunit/src/Framework/TestSuite.php:684 /var/www/sonata-doctrine-extensions/vendor/phpunit/phpunit/src/TextUI/TestRunner.php:651

VincentLanglet · 2023-11-14T08:31:27Z

currently CI does not run any build with stability=dev dependencies. Shall I add that somehow on devkit? Not so familiar with that.

That could be an idea.

So far we used variant
https://github.com/sonata-project/dev-kit/blob/master/templates/project/.github/workflows/test.yaml.twig#L60
Not sure if we can add a variant with multiple lib.

Another idea would be to add a Ci with stability dev, maybe allowToFail: true for this build ?

VincentLanglet · 2024-01-22T22:17:44Z

Hi, Any news about this PR @dmaicher ?

dmaicher · 2024-01-23T13:44:59Z

@VincentLanglet the dev build works using DBAL 4 and ORM 3: https://github.com/sonata-project/sonata-doctrine-extensions/actions/runs/7626608873/job/20773373404?pr=494

Now just the question how to get this working with dev-kit 😄

VincentLanglet · 2024-01-27T00:37:23Z

Now just the question how to get this working with dev-kit 😄

Do you need help with this ?

dmaicher · 2024-01-27T12:52:21Z

Now just the question how to get this working with dev-kit 😄

Do you need help with this ?

Yeah I won't look into this anytime soon I think. If someone could help out that would be nice.

dmaicher · 2024-02-04T19:39:04Z

@VincentLanglet final versions for ORM and DBAL have been released - so no devkit changes needed for now.

But the static analysis fails seem interesting. Probably we are indeed not compatible with ORM 3 and its not covered by tests

VincentLanglet · 2024-02-04T19:51:33Z

@VincentLanglet final versions for ORM and DBAL have been released - so no devkit changes needed for now.

But the static analysis fails seem interesting. Probably we are indeed not compatible with ORM 3 and its not covered by tests

Indeed, discriminator column is now a class
https://github.com/doctrine/orm/blob/3.0.x/src/Mapping/DiscriminatorColumnMapping.php

Maybe adding a toArray on the doctrine side would be helpful for library to support both ORM 2 and 3.
WDYT @dmaicher

cc @greg0ire

src/Mapper/ORM/DoctrineORMMapper.php

tests/Mapper/ORM/DoctrineORMMapperTest.php

VincentLanglet · 2024-02-06T06:09:56Z

I opened doctrine/orm#11226 for the static analysis

And you can rebase for the rector build.

VincentLanglet · 2024-02-18T23:19:56Z

I opened doctrine/orm#11226 for the static analysis

We can ignore the error until the PR is merged/released.

Do you have time to finish the PR @dmaicher ?

dmaicher · 2024-02-19T08:09:58Z

I opened doctrine/orm#11226 for the static analysis

We can ignore the error until the PR is merged/released.

Do you have time to finish the PR @dmaicher ?

I will take a look later today 👍

VincentLanglet · 2024-02-21T16:21:18Z

2.4.0 is released

dmaicher requested a review from a team November 13, 2023 20:12

dmaicher commented Nov 13, 2023

View reviewed changes

dmaicher mentioned this pull request Nov 15, 2023

Enable report_fields_where_declared for ORM 3 doctrine/DoctrineBundle#1729

Merged

VincentLanglet mentioned this pull request Nov 19, 2023

Doctrine ORM 3 support sonata-project/SonataDoctrineORMAdminBundle#1774

Closed

dmaicher force-pushed the doctrine_dbal_orm branch from 6f15d8a to 26f3870 Compare January 23, 2024 13:41

dmaicher force-pushed the doctrine_dbal_orm branch 2 times, most recently from 6543c1b to dbe3dbd Compare January 23, 2024 13:52

dmaicher force-pushed the doctrine_dbal_orm branch from dbe3dbd to 6ed9c1a Compare February 4, 2024 19:34

dmaicher commented Feb 5, 2024

View reviewed changes

src/Mapper/ORM/DoctrineORMMapper.php Outdated Show resolved Hide resolved

dmaicher commented Feb 5, 2024

View reviewed changes

tests/Mapper/ORM/DoctrineORMMapperTest.php Outdated Show resolved Hide resolved

VincentLanglet reviewed Feb 5, 2024

View reviewed changes

tests/Mapper/ORM/DoctrineORMMapperTest.php Show resolved Hide resolved

dmaicher added 6 commits February 19, 2024 19:35

Add support for Doctrine DBAL 4 and ORM 3

8ac2653

try to make it work with ORM 3

b8e3e26

simplify

19806bd

use assertSame + cast to array

3cc1198

sort arrays before assert

029f9c5

cs fixer

83e84e9

dmaicher force-pushed the doctrine_dbal_orm branch 2 times, most recently from 7a7e42a to bece345 Compare February 19, 2024 18:42

dmaicher force-pushed the doctrine_dbal_orm branch from bece345 to 797cd6b Compare February 19, 2024 18:43

ignore errors for now

1728bb2

dmaicher force-pushed the doctrine_dbal_orm branch from 797cd6b to 1728bb2 Compare February 19, 2024 18:44

dmaicher requested a review from VincentLanglet February 19, 2024 18:45

VincentLanglet approved these changes Feb 19, 2024

View reviewed changes

dmaicher merged commit 65c4a93 into sonata-project:2.x Feb 19, 2024
14 checks passed

dmaicher deleted the doctrine_dbal_orm branch February 19, 2024 19:31

VincentLanglet added the minor label Feb 21, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for Doctrine DBAL 4 and ORM 3 #494

Add support for Doctrine DBAL 4 and ORM 3 #494

dmaicher commented Nov 13, 2023

dmaicher commented Nov 13, 2023 •

edited

Loading

dmaicher Nov 13, 2023

VincentLanglet commented Nov 14, 2023

VincentLanglet commented Jan 22, 2024

dmaicher commented Jan 23, 2024

VincentLanglet commented Jan 27, 2024

dmaicher commented Jan 27, 2024

dmaicher commented Feb 4, 2024 •

edited

Loading

VincentLanglet commented Feb 4, 2024

VincentLanglet commented Feb 6, 2024 •

edited

Loading

VincentLanglet commented Feb 18, 2024

dmaicher commented Feb 19, 2024

VincentLanglet commented Feb 21, 2024

Add support for Doctrine DBAL 4 and ORM 3 #494

Add support for Doctrine DBAL 4 and ORM 3 #494

Conversation

dmaicher commented Nov 13, 2023

Subject

Changelog

dmaicher commented Nov 13, 2023 • edited Loading

dmaicher Nov 13, 2023

Choose a reason for hiding this comment

VincentLanglet commented Nov 14, 2023

VincentLanglet commented Jan 22, 2024

dmaicher commented Jan 23, 2024

VincentLanglet commented Jan 27, 2024

dmaicher commented Jan 27, 2024

dmaicher commented Feb 4, 2024 • edited Loading

VincentLanglet commented Feb 4, 2024

VincentLanglet commented Feb 6, 2024 • edited Loading

VincentLanglet commented Feb 18, 2024

dmaicher commented Feb 19, 2024

VincentLanglet commented Feb 21, 2024

dmaicher commented Nov 13, 2023 •

edited

Loading

dmaicher commented Feb 4, 2024 •

edited

Loading

VincentLanglet commented Feb 6, 2024 •

edited

Loading