allow doctrine/persistence ^4.0 (#1826)

composer.json

@@ -29,7 +29,7 @@
         "doctrine/dbal": "^3.4 || ^4.0",
         "doctrine/doctrine-bundle": "^2.10",
         "doctrine/orm": "^2.17 || ^3.0",
-        "doctrine/persistence": "^3.0.2",
+        "doctrine/persistence": "^3.0.2 || ^4.0",
         "sonata-project/admin-bundle": "^4.34",
         "sonata-project/exporter": "^2.0 || ^3.0",
         "sonata-project/form-extensions": "^1.19 || ^2.0",
@@ -47,8 +47,9 @@
         "twig/twig": "^3.0"
     },
     "require-dev": {
+        "ext-pdo_sqlite": "*",
         "dama/doctrine-test-bundle": "^8.0",
-        "doctrine/doctrine-fixtures-bundle": "^3.4",
+        "doctrine/doctrine-fixtures-bundle": "^3.4 || ^4.0",
         "friendsofphp/php-cs-fixer": "^3.4",
         "matthiasnoback/symfony-dependency-injection-test": "^4.2 || ^5.0",
         "phpstan/extension-installer": "^1.0",

tests/App/AppKernel.php

@@ -32,15 +32,16 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
-use Symfony\Component\Security\Http\Attribute\IsGranted;
+use Symfony\UX\StimulusBundle\StimulusBundle;
 
 final class AppKernel extends Kernel
 {
     use MicroKernelTrait;
 
+    /** @psalm-suppress InvalidReturnType */
     public function registerBundles(): iterable
     {
-        return [
+        $bundles = [
             new DoctrineBundle(),
             new DAMADoctrineTestBundle(),
             new FrameworkBundle(),
@@ -56,6 +57,15 @@ public function registerBundles(): iterable
             new TwigBundle(),
             new DoctrineFixturesBundle(),
         ];
+
+        if (class_exists(StimulusBundle::class)) {
+            $bundles[] = new StimulusBundle();
+        }
+
+        /**
+         * @psalm-suppress InvalidReturnStatement
+         */
+        return $bundles; /* @phpstan-ignore return.type */
     }
 
     public function getCacheDir(): string
@@ -83,11 +93,6 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
         $container->setParameter('app.base_dir', $this->getBaseDir());
 
         $loader->load(__DIR__.'/config/config.yml');
-
-        if (!class_exists(IsGranted::class)) {
-            $loader->load(__DIR__.'/config/config_symfony_v5.yml');
-        }
-
         $loader->load(__DIR__.'/config/services.php');
     }
 

tests/Builder/DatagridBuilderTest.php

@@ -64,9 +64,9 @@ final class DatagridBuilderTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->formFactory = $this->createStub(FormFactoryInterface::class);
-        $this->filterFactory = $this->createStub(FilterFactoryInterface::class);
-        $this->typeGuesser = $this->createStub(TypeGuesserInterface::class);
+        $this->formFactory = static::createStub(FormFactoryInterface::class);
+        $this->filterFactory = static::createStub(FilterFactoryInterface::class);
+        $this->typeGuesser = static::createStub(TypeGuesserInterface::class);
 
         $this->datagridBuilder = new DatagridBuilder(
             $this->formFactory,
@@ -85,9 +85,9 @@ protected function setUp(): void
      */
     public function testGetBaseDatagrid(string $pagerType, string $pager): void
     {
-        $proxyQuery = $this->createStub(ProxyQueryInterface::class);
+        $proxyQuery = static::createStub(ProxyQueryInterface::class);
         $fieldDescriptionCollection = new FieldDescriptionCollection();
-        $formBuilder = $this->createStub(FormBuilderInterface::class);
+        $formBuilder = static::createStub(FormBuilderInterface::class);
 
         $this->admin->method('getPagerType')->willReturn($pagerType);
         $this->admin->method('createQuery')->willReturn($proxyQuery);
@@ -147,7 +147,7 @@ public function testFixFieldDescriptionWithoutFieldName(): void
     public function testAddFilterNoType(): void
     {
         $datagrid = $this->createMock(DatagridInterface::class);
-        $guessType = $this->createStub(TypeGuess::class);
+        $guessType = static::createStub(TypeGuess::class);
 
         $fieldDescription = new FieldDescription('test');
         $fieldDescription->setAdmin($this->admin);

tests/Builder/ListBuilderTest.php

@@ -45,7 +45,7 @@ final class ListBuilderTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->typeGuesser = $this->createStub(TypeGuesserInterface::class);
+        $this->typeGuesser = static::createStub(TypeGuesserInterface::class);
         $this->admin = $this->createMock(AdminInterface::class);
 
         $this->admin->method('getClass')->willReturn('Foo');

tests/Builder/ShowBuilderTest.php

@@ -44,7 +44,7 @@ final class ShowBuilderTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->guesser = $this->createStub(TypeGuesserInterface::class);
+        $this->guesser = static::createStub(TypeGuesserInterface::class);
 
         $this->showBuilder = new ShowBuilder(
             $this->guesser,
@@ -69,7 +69,7 @@ public function testGetBaseList(): void
 
     public function testAddFieldNoType(): void
     {
-        $typeGuess = $this->createStub(TypeGuess::class);
+        $typeGuess = static::createStub(TypeGuess::class);
 
         $fieldDescription = new FieldDescription('FakeName', [], ['type' => ClassMetadata::MANY_TO_ONE]);
         $fieldDescription->setAdmin($this->admin);

tests/Exporter/DataSourceTest.php

@@ -33,10 +33,10 @@ protected function setUp(): void
 
     public function testCreateIterator(): void
     {
-        $configuration = $this->createStub(Configuration::class);
+        $configuration = static::createStub(Configuration::class);
         $configuration->method('getDefaultQueryHints')->willReturn([]);
 
-        $em = $this->createStub(EntityManager::class);
+        $em = static::createStub(EntityManager::class);
         $em->method('getConfiguration')->willReturn($configuration);
 
         $queryBuilder = $this->getMockBuilder(QueryBuilder::class)
@@ -61,10 +61,10 @@ public function testCreateIterator(): void
 
     public function testCreateIteratorWithNormalSortBy(): void
     {
-        $configuration = $this->createStub(Configuration::class);
+        $configuration = static::createStub(Configuration::class);
         $configuration->method('getDefaultQueryHints')->willReturn([]);
 
-        $em = $this->createStub(EntityManager::class);
+        $em = static::createStub(EntityManager::class);
         $em->method('getConfiguration')->willReturn($configuration);
 
         $queryBuilder = $this->getMockBuilder(QueryBuilder::class)

tests/FieldDescription/FieldDescriptionTest.php

@@ -215,7 +215,7 @@ public function testGetValueWhenCannotRetrieve(): void
         $mockedObject = $this->getMockBuilder(\stdClass::class)->addMethods(['myMethod'])->getMock();
         $mockedObject->expects(static::never())->method('myMethod')->willReturn('myMethodValue');
 
-        $admin = $this->createStub(AdminInterface::class);
+        $admin = static::createStub(AdminInterface::class);
         $field = new FieldDescription('name');
         $field->setAdmin($admin);
 

tests/FieldDescription/FilterTypeGuesserTest.php

@@ -56,7 +56,7 @@ public function testGuess(
         int $expectedConfidence,
         array $fieldMapping = [],
     ): void {
-        $fieldDescription = $this->createStub(FieldDescriptionInterface::class);
+        $fieldDescription = static::createStub(FieldDescriptionInterface::class);
         $fieldDescription->method('getFieldName')->willReturn('foo');
         $fieldDescription->method('getMappingType')->willReturn($mappingType);
         $fieldDescription->method('getParentAssociationMappings')->willReturn([]);

tests/FieldDescription/TypeGuesserTest.php

@@ -42,7 +42,7 @@ public function testGuess(
         array $expectedOptions,
         int $expectedConfidence,
     ): void {
-        $fieldDescription = $this->createStub(FieldDescriptionInterface::class);
+        $fieldDescription = static::createStub(FieldDescriptionInterface::class);
         $fieldDescription->method('getFieldName')->willReturn('foo');
         $fieldDescription->method('getMappingType')->willReturn($mappingType);
 

tests/Filter/FilterTest.php

@@ -29,7 +29,7 @@ final class FilterTest extends FilterTestCase
      */
     public function testOrExpression(string $expected, array $filterOptionsCollection = []): void
     {
-        $entityManager = $this->createStub(EntityManagerInterface::class);
+        $entityManager = static::createStub(EntityManagerInterface::class);
         $entityManager->method('getExpressionBuilder')->willReturn(new Expr());
         $queryBuilder = new TestQueryBuilder($entityManager);
 

tests/Filter/FilterTestCase.php

@@ -52,7 +52,7 @@ final protected static function assertSameQueryParameters(array $expected, Proxy
 
     final protected function createQueryBuilderStub(): TestQueryBuilder
     {
-        $queryBuilder = $this->createStub(TestQueryBuilder::class);
+        $queryBuilder = static::createStub(TestQueryBuilder::class);
 
         $queryBuilder->method('getEntityManager')->willReturnCallback(
             fn (): EntityManagerInterface => $this->createEntityManagerStub()
@@ -115,8 +115,8 @@ static function (string $parameter, string $alias) use ($queryBuilder): TestQuer
 
     private function createEntityManagerStub(): EntityManagerInterface
     {
-        $classMetadata = $this->createStub(ClassMetadata::class);
-        $entityManager = $this->createStub(EntityManagerInterface::class);
+        $classMetadata = static::createStub(ClassMetadata::class);
+        $entityManager = static::createStub(EntityManagerInterface::class);
 
         $classMetadata->method('getIdentifierValues')->willReturnCallback(
             static fn (mixed $value): array => ['id' => $value]

tests/Model/ModelManagerTest.php

@@ -631,7 +631,7 @@ public function testFailingBatchDelete(string $expectedExceptionMessage, ?array
         $connection = $this->createMock(Connection::class);
         $connection
             ->method('getDatabasePlatform')
-            ->willReturn($this->createStub(AbstractPlatform::class));
+            ->willReturn(static::createStub(AbstractPlatform::class));
         $connection
             ->method('getParams')
             ->willReturn([]);
@@ -776,7 +776,7 @@ public function provideAddIdentifiersToQueryCases(): iterable
      */
     public function testAddIdentifiersToQueryWithEmptyIdentifiers(): void
     {
-        $datagrid = $this->createStub(ProxyQueryInterface::class);
+        $datagrid = static::createStub(ProxyQueryInterface::class);
 
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('Array passed as argument 3 to "Sonata\DoctrineORMAdminBundle\Model\ModelManager::addIdentifiersToQuery()" must not be empty.');

tests/Util/SmartPaginatorFactoryTest.php

@@ -33,7 +33,7 @@ final class SmartPaginatorFactoryTest extends TestCase
     public function testFetchJoinedCollection(QueryBuilder $queryBuilder, bool $expected): void
     {
         /** @var ProxyQueryInterface<object>&MockObject $proxyQuery */
-        $proxyQuery = $this->createStub(ProxyQueryInterface::class);
+        $proxyQuery = static::createStub(ProxyQueryInterface::class);
         $proxyQuery
             ->method('getQueryBuilder')
             ->willReturn($queryBuilder);
@@ -82,7 +82,7 @@ public function provideFetchJoinedCollectionCases(): iterable
     public function testUseOutputWalker(QueryBuilder $queryBuilder, ?bool $expected, ?string $sortBy = null): void
     {
         /** @var ProxyQueryInterface<object>&MockObject $proxyQuery */
-        $proxyQuery = $this->createStub(ProxyQueryInterface::class);
+        $proxyQuery = static::createStub(ProxyQueryInterface::class);
         $proxyQuery
             ->method('getQueryBuilder')
             ->willReturn($queryBuilder);
@@ -195,7 +195,7 @@ public function provideUseOutputWalkerCases(): iterable
     public function testCountWalkerDistinct(QueryBuilder $queryBuilder, bool $hasHint, bool $expected): void
     {
         /** @var ProxyQueryInterface<object>&MockObject $proxyQuery */
-        $proxyQuery = $this->createStub(ProxyQueryInterface::class);
+        $proxyQuery = static::createStub(ProxyQueryInterface::class);
         $proxyQuery
             ->method('getQueryBuilder')
             ->willReturn($queryBuilder);