IBX-12606: Migrated the test suites to PHPUnit 11

.gitignore

@@ -6,6 +6,7 @@ var/
 composer.lock
 .php-cs-fixer.cache
 .phpunit.result.cache
+.phpunit.cache/
 /.deptrac.cache
 phpstan.neon
 .rules/

composer.json

@@ -71,11 +71,11 @@
         "ibexa/rector": "~6.0.x-dev",
         "ibexa/test-core": "~6.0.x-dev",
         "jenner/simple_fork": "^1.2",
-        "matthiasnoback/symfony-dependency-injection-test": "^5.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^6.0",
         "phpstan/phpstan": "^2.0",
         "phpstan/phpstan-phpunit": "^2.0",
         "phpstan/phpstan-symfony": "^2.0",
-        "phpunit/phpunit": "^9.6",
+        "phpunit/phpunit": "^11.5",
         "symfony/phpunit-bridge": "^7.4",
         "symfony/runtime": "^7.4",
         "webmozart/assert": "^2.3"

phpunit-integration-legacy-solr.xml

@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="bootstrap.php" processIsolation="false" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" beStrictAboutTestsThatDoNotTestAnything="false" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage>
-    <include>
-      <directory suffix=".php">tests/integration</directory>
-    </include>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="bootstrap.php" processIsolation="false" beStrictAboutTestsThatDoNotTestAnything="false" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
   <php>
     <env name="setupFactory" value="Ibexa\Tests\Solr\SetupFactory\LegacySetupFactory"/>
     <env name="backendVersion" value="5"/>
@@ -43,4 +38,9 @@
       <exclude>tests/integration/Core/Repository/KeywordFieldCriterionTest.php</exclude>
     </testsuite>
   </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">tests/integration</directory>
+    </include>
+  </source>
 </phpunit>

phpunit-integration-legacy.xml

@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="bootstrap.php" processIsolation="false" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" beStrictAboutTestsThatDoNotTestAnything="false" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage>
-    <include>
-      <directory suffix=".php">tests/integration</directory>
-    </include>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="bootstrap.php" processIsolation="false" beStrictAboutTestsThatDoNotTestAnything="false" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
   <php>
     <env name="setupFactory" value="\Ibexa\Contracts\Core\Test\Repository\SetupFactory\Legacy"/>
     <env name="backendVersion" value="5"/>
@@ -53,4 +48,9 @@
       <directory>tests/integration/RepositoryInstaller</directory>
     </testsuite>
   </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">tests/integration</directory>
+    </include>
+  </source>
 </phpunit>

phpunit-integration.xml

@@ -1,46 +1,37 @@
-<?xml version = '1.0' encoding = 'utf-8'?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="tests/integration/bootstrap.php"
-         processIsolation="false"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         beStrictAboutTestsThatDoNotTestAnything="false"
-         colors="true"
-         failOnWarning="true"
-         >
-    <php>
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="disabled"/>
-        <ini name="error_reporting" value="-1" />
-        <env name="DATABASE_URL" value="sqlite://i@i/var/test-bootstrapper.db" />
-        <env name="KERNEL_CLASS" value="Ibexa\Tests\Integration\Core\TestKernel"/>
-        <env name="SEARCH_ENGINE" value="legacy"/>
-    </php>
-    <testsuites>
-        <testsuite name="integration_core">
-            <file>tests/integration/Core/BasicKernelTest.php</file>
-            <file>tests/integration/Core/Repository/SerializationTest.php</file>
-            <file>tests/integration/Core/Repository/ContentTypeService/FindContentTypesTest.php</file>
-            <file>tests/integration/Core/Repository/ContentService/CopyNonTranslatableFieldsFromPublishedVersionTest.php</file>
-            <file>tests/integration/Core/Persistence/Legacy/BookmarkHandlerTest.php</file>
-            <file>tests/integration/Core/Repository/ContentService/CopyTranslationsFromPublishedVersionTest.php</file>
-            <file>tests/integration/Core/Repository/ContentService/CreateContentInNonContainerTest.php</file>
-            <file>tests/integration/Core/Repository/URLAliasService/UrlAliasLookupTest.php</file>
-            <file>tests/integration/Core/Repository/ContentService/ContentUpdateAfterAddingFieldDefinitionTest.php</file>
-            <file>tests/integration/Core/Repository/ContentService/UpdateContentTest.php</file>
-            <file>tests/integration/Core/Repository/ContentService/ImageAssetTest.php</file>
-            <file>tests/integration/Core/Repository/ContentService/LoadVersionInfoTest.php</file>
-            <file>tests/integration/Core/Repository/ContentService/DeleteContentTest.php</file>
-            <file>tests/integration/Core/Repository/ContentService/MaxLanguagesContentServiceTest.php</file>
-            <file>tests/integration/Core/Repository/SearchServiceBookmarkTest.php</file>
-            <file>tests/integration/Core/Repository/SearchServiceContentNameTest.php</file>
-            <file>tests/integration/Core/Repository/SearchServiceImageTest.php</file>
-            <file>tests/integration/Core/Repository/Filtering/LegacyContentFilteringTest.php</file>
-            <file>tests/integration/Core/Repository/KeywordFieldCriterionTest.php</file>
-        </testsuite>
-    </testsuites>
-    <extensions>
-        <extension class="DAMA\DoctrineTestBundle\PHPUnit\PHPUnitExtension" />
-    </extensions>
+<?xml version="1.0" encoding="utf-8"?>
+<phpunit backupGlobals="false" bootstrap="tests/integration/bootstrap.php" processIsolation="false" beStrictAboutTestsThatDoNotTestAnything="false" colors="true" failOnWarning="true" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <php>
+    <env name="SYMFONY_DEPRECATIONS_HELPER" value="disabled"/>
+    <ini name="error_reporting" value="-1"/>
+    <env name="DATABASE_URL" value="sqlite://i@i/var/test-bootstrapper.db"/>
+    <env name="KERNEL_CLASS" value="Ibexa\Tests\Integration\Core\TestKernel"/>
+    <env name="SEARCH_ENGINE" value="legacy"/>
+  </php>
+  <testsuites>
+    <testsuite name="integration_core">
+      <file>tests/integration/Core/BasicKernelTest.php</file>
+      <file>tests/integration/Core/Repository/SerializationTest.php</file>
+      <file>tests/integration/Core/Repository/ContentTypeService/FindContentTypesTest.php</file>
+      <file>tests/integration/Core/Repository/ContentService/CopyNonTranslatableFieldsFromPublishedVersionTest.php</file>
+      <file>tests/integration/Core/Persistence/Legacy/BookmarkHandlerTest.php</file>
+      <file>tests/integration/Core/Repository/ContentService/CopyTranslationsFromPublishedVersionTest.php</file>
+      <file>tests/integration/Core/Repository/ContentService/CreateContentInNonContainerTest.php</file>
+      <file>tests/integration/Core/Repository/URLAliasService/UrlAliasLookupTest.php</file>
+      <file>tests/integration/Core/Repository/ContentService/ContentUpdateAfterAddingFieldDefinitionTest.php</file>
+      <file>tests/integration/Core/Repository/ContentService/UpdateContentTest.php</file>
+      <file>tests/integration/Core/Repository/ContentService/ImageAssetTest.php</file>
+      <file>tests/integration/Core/Repository/ContentService/LoadVersionInfoTest.php</file>
+      <file>tests/integration/Core/Repository/ContentService/DeleteContentTest.php</file>
+      <file>tests/integration/Core/Repository/ContentService/MaxLanguagesContentServiceTest.php</file>
+      <file>tests/integration/Core/Repository/SearchServiceBookmarkTest.php</file>
+      <file>tests/integration/Core/Repository/SearchServiceContentNameTest.php</file>
+      <file>tests/integration/Core/Repository/SearchServiceImageTest.php</file>
+      <file>tests/integration/Core/Repository/Filtering/LegacyContentFilteringTest.php</file>
+      <file>tests/integration/Core/Repository/KeywordFieldCriterionTest.php</file>
+    </testsuite>
+  </testsuites>
+  <extensions>
+    <bootstrap class="DAMA\DoctrineTestBundle\PHPUnit\PHPUnitExtension"/>
+    <bootstrap class="Symfony\Bridge\PhpUnit\SymfonyExtension"/>
+  </extensions>
 </phpunit>

phpunit.xml

@@ -1,15 +1,7 @@
-<phpunit
-  backupGlobals="false"
-  backupStaticAttributes="false"
-  bootstrap="bootstrap.php"
-  convertErrorsToExceptions="true"
-  convertNoticesToExceptions="true"
-  convertWarningsToExceptions="true"
-  beStrictAboutTestsThatDoNotTestAnything="false"
-  colors="true"
-  >
+<?xml version="1.0"?>
+<phpunit backupGlobals="false" bootstrap="bootstrap.php" beStrictAboutTestsThatDoNotTestAnything="false" colors="true" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
   <php>
-    <ini name="error_reporting" value="-1" />
+    <ini name="error_reporting" value="-1"/>
     <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=82&amp;max[direct]=855&amp;max[indirect]=14&amp;verbose=0"/>
   </php>
   <testsuites>
@@ -32,7 +24,7 @@
       <directory>tests/bundle/LegacySearchEngine</directory>
     </testsuite>
   </testsuites>
-  <listeners>
-    <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
-  </listeners>
+  <extensions>
+    <bootstrap class="Symfony\Bridge\PhpUnit\SymfonyExtension"/>
+  </extensions>
 </phpunit>

tests/bundle/Core/ApiLoader/CacheFactoryTest.php

@@ -10,6 +10,7 @@
 
 use Ibexa\Bundle\Core\ApiLoader\CacheFactory;
 use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Cache\Adapter\AdapterInterface;
@@ -32,7 +33,7 @@ protected function setUp(): void
     /**
      * @return array<array{string, string}>
      */
-    public function providerGetService(): array
+    public static function providerGetService(): array
     {
         return [
             ['default', 'default'],
@@ -41,9 +42,7 @@ public function providerGetService(): array
         ];
     }
 
-    /**
-     * @dataProvider providerGetService
-     */
+    #[DataProvider('providerGetService')]
     public function testGetService($name, $expected): void
     {
         $this->configResolver
@@ -56,7 +55,7 @@ public function testGetService($name, $expected): void
             ->expects(self::once())
             ->method('get')
             ->with($expected)
-            ->will(self::returnValue($this->createMock(AdapterInterface::class)));
+            ->will(self::returnValue(self::createStub(AdapterInterface::class)));
 
         $factory = new CacheFactory($this->container);
 

tests/bundle/Core/ApiLoader/RepositoryConfigurationProviderTest.php

@@ -11,13 +11,14 @@
 use Ibexa\Bundle\Core\ApiLoader\Exception\InvalidRepositoryException;
 use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\Core\Base\Container\ApiLoader\RepositoryConfigurationProvider;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 
 /**
- * @covers \Ibexa\Core\Base\Container\ApiLoader\RepositoryConfigurationProvider
- *
  * @phpstan-import-type TRepositoryListConfiguration from \Ibexa\Core\Base\Container\ApiLoader\RepositoryConfigurationProvider
  */
+#[CoversClass(RepositoryConfigurationProvider::class)]
 final class RepositoryConfigurationProviderTest extends BaseRepositoryConfigurationProviderTestCase
 {
     /**
@@ -61,12 +62,11 @@ public function testGetRepositoryConfigNotSpecifiedRepository(): void
     }
 
     /**
-     * @dataProvider providerForRepositories
-     *
      * @phpstan-param TRepositoryListConfiguration $repositories
      *
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException
      */
+    #[DataProvider('providerForRepositories')]
     public function testGetRepositoryConfigUndefinedRepository(array $repositories): void
     {
         $this->expectException(InvalidRepositoryException::class);
@@ -83,12 +83,11 @@ public function testGetRepositoryConfigUndefinedRepository(array $repositories):
     }
 
     /**
-     * @dataProvider providerForRepositories
-     *
      * @phpstan-param TRepositoryListConfiguration $repositories
      *
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException
      */
+    #[DataProvider('providerForRepositories')]
     public function testGetDefaultRepositoryAlias(array $repositories): void
     {
         $configResolver = $this->getConfigResolverMock();
@@ -100,10 +99,9 @@ public function testGetDefaultRepositoryAlias(array $repositories): void
     }
 
     /**
-     * @dataProvider providerForRepositories
-     *
      * @phpstan-param TRepositoryListConfiguration $repositories
      */
+    #[DataProvider('providerForRepositories')]
     public function testGetCurrentRepositoryAlias(array $repositories): void
     {
         $configResolver = $this->getConfigResolverMock();
@@ -117,7 +115,7 @@ public function testGetCurrentRepositoryAlias(array $repositories): void
     /**
      * @phpstan-return list<list<TRepositoryListConfiguration>> $repositories
      */
-    public function providerForRepositories(): array
+    public static function providerForRepositories(): array
     {
         return [
             [self::REPOSITORIES_CONFIG],

tests/bundle/Core/ApiLoader/StorageConnectionFactoryTest.php

@@ -14,15 +14,14 @@
 use Ibexa\Contracts\Core\Container\ApiLoader\RepositoryConfigurationProviderInterface;
 use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\Core\Base\Container\ApiLoader\RepositoryConfigurationProvider;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\ServiceLocator;
 
 final class StorageConnectionFactoryTest extends BaseRepositoryConfigurationProviderTestCase
 {
-    /**
-     * @dataProvider getConnectionProvider
-     */
+    #[DataProvider('getConnectionProvider')]
     public function testGetConnection(string $repositoryAlias, string $doctrineConnection): void
     {
         $repositories = [
@@ -143,7 +142,7 @@ private function buildStorageConnectionFactory(
         ;
         $serviceLocatorMock->method('getProvidedServices')->willReturn($doctrineConnections);
         if (isset($doctrineConnections[$connectionName])) {
-            $serviceLocatorMock->method('get')->with($connectionName)->willReturn($this->createMock(Connection::class));
+            $serviceLocatorMock->method('get')->with($connectionName)->willReturn(self::createStub(Connection::class));
         } else {
             $serviceLocatorMock->expects(self::never())->method('get');
         }

tests/bundle/Core/ApiLoader/StorageEngineFactoryTest.php

@@ -19,7 +19,7 @@ final class StorageEngineFactoryTest extends BaseRepositoryConfigurationProvider
 {
     public function testRegisterStorageEngine(): void
     {
-        $repositoryConfigurationProvider = $this->createMock(RepositoryConfigurationProviderInterface::class);
+        $repositoryConfigurationProvider = self::createStub(RepositoryConfigurationProviderInterface::class);
         $factory = new StorageEngineFactory($repositoryConfigurationProvider);
 
         $storageEngines = [