From d6da26e979832a0f9ab1b61d9ea415020b34d107 Mon Sep 17 00:00:00 2001 From: Dawid Parafinski Date: Thu, 17 Sep 2026 16:27:24 +0200 Subject: [PATCH 1/7] IBX-12606: Replaced the Symfony deprecation thresholds with PHPUnit's native deprecation gate --- phpunit-integration-legacy-solr.xml | 2 - phpunit-integration-legacy.xml | 2 - phpunit-integration.xml | 1 - phpunit.baseline.xml | 78 +++++++++++++++++++++++++++++ phpunit.xml | 8 ++- 5 files changed, 84 insertions(+), 7 deletions(-) create mode 100644 phpunit.baseline.xml diff --git a/phpunit-integration-legacy-solr.xml b/phpunit-integration-legacy-solr.xml index 750f1b1199..fe7776a743 100644 --- a/phpunit-integration-legacy-solr.xml +++ b/phpunit-integration-legacy-solr.xml @@ -6,12 +6,10 @@ - - diff --git a/phpunit-integration-legacy.xml b/phpunit-integration-legacy.xml index 15e6394eb9..9d21eef509 100644 --- a/phpunit-integration-legacy.xml +++ b/phpunit-integration-legacy.xml @@ -4,12 +4,10 @@ - - diff --git a/phpunit-integration.xml b/phpunit-integration.xml index 6da6168244..e35b9df22e 100644 --- a/phpunit-integration.xml +++ b/phpunit-integration.xml @@ -1,7 +1,6 @@ - diff --git a/phpunit.baseline.xml b/phpunit.baseline.xml new file mode 100644 index 0000000000..f4fed39bd4 --- /dev/null +++ b/phpunit.baseline.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/phpunit.xml b/phpunit.xml index 8d982c6a79..91f127707c 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,8 +1,7 @@ - + - @@ -24,6 +23,11 @@ tests/bundle/LegacySearchEngine + + + src + + From 803e2d8464e3888fbe50eb1e71e8d7ad4959dfd6 Mon Sep 17 00:00:00 2001 From: Dawid Parafinski Date: Fri, 18 Sep 2026 14:43:13 +0200 Subject: [PATCH 2/7] IBX-12606: Failed test runs on PHP notices and warnings to keep the PHPUnit 9 convert*ToExceptions strictness --- phpunit-integration-legacy-solr.xml | 2 +- phpunit-integration-legacy.xml | 2 +- phpunit-integration.xml | 2 +- phpunit.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/phpunit-integration-legacy-solr.xml b/phpunit-integration-legacy-solr.xml index fe7776a743..389cc31d4b 100644 --- a/phpunit-integration-legacy-solr.xml +++ b/phpunit-integration-legacy-solr.xml @@ -1,5 +1,5 @@ - + diff --git a/phpunit-integration-legacy.xml b/phpunit-integration-legacy.xml index 9d21eef509..22bb28c0de 100644 --- a/phpunit-integration-legacy.xml +++ b/phpunit-integration-legacy.xml @@ -1,5 +1,5 @@ - + diff --git a/phpunit-integration.xml b/phpunit-integration.xml index e35b9df22e..d4973f4a48 100644 --- a/phpunit-integration.xml +++ b/phpunit-integration.xml @@ -1,5 +1,5 @@ - + diff --git a/phpunit.xml b/phpunit.xml index 91f127707c..a574a69015 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,5 +1,5 @@ - + From a90e5e1e221c3bab791dbe846d0740d879dae54b Mon Sep 17 00:00:00 2001 From: Dawid Parafinski Date: Fri, 18 Sep 2026 14:50:16 +0200 Subject: [PATCH 3/7] IBX-12606: Replaced the inert Symfony bridge expectDeprecation() with PHPUnit's expectUserDeprecationMessage() --- phpunit.baseline.xml | 1 + .../Controller/Controller/Content/DownloadControllerTest.php | 4 +--- .../lib/Repository/Service/Mock/ContentDomainMapperTest.php | 5 +---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/phpunit.baseline.xml b/phpunit.baseline.xml index f4fed39bd4..a5f3364ad8 100644 --- a/phpunit.baseline.xml +++ b/phpunit.baseline.xml @@ -35,6 +35,7 @@ + diff --git a/tests/lib/MVC/Symfony/Controller/Controller/Content/DownloadControllerTest.php b/tests/lib/MVC/Symfony/Controller/Controller/Content/DownloadControllerTest.php index db83e56236..d215e41e24 100644 --- a/tests/lib/MVC/Symfony/Controller/Controller/Content/DownloadControllerTest.php +++ b/tests/lib/MVC/Symfony/Controller/Controller/Content/DownloadControllerTest.php @@ -15,7 +15,6 @@ use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; -use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -23,7 +22,6 @@ final class DownloadControllerTest extends TestCase { use DownloadControllerTestTrait; - use ExpectDeprecationTrait; private const string FILENAME = 'Test-file.pdf'; @@ -171,7 +169,7 @@ public function testDownloadBinaryFileByIdActionTriggersDeprecationWithoutFilena ->method('loadBinaryFile') ->willReturn($this->createBinaryFile()); - $this->expectDeprecation( + $this->expectUserDeprecationMessage( 'Since ibexa/core 5.0: The "ibexa.content.download.field_id" route (/content/download/{contentId}/{fieldId})' . ' is deprecated and will be removed in 6.0.' . ' Use the "ibexa.content.download.field_id.filename" route' diff --git a/tests/lib/Repository/Service/Mock/ContentDomainMapperTest.php b/tests/lib/Repository/Service/Mock/ContentDomainMapperTest.php index e824546af8..a8e5822737 100644 --- a/tests/lib/Repository/Service/Mock/ContentDomainMapperTest.php +++ b/tests/lib/Repository/Service/Mock/ContentDomainMapperTest.php @@ -31,13 +31,10 @@ use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Group; use Psr\Log\LoggerInterface; -use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait; #[CoversClass(ContentDomainMapper::class)] final class ContentDomainMapperTest extends BaseServiceMockTest { - use ExpectDeprecationTrait; - private const EXAMPLE_CONTENT_INFO_ID = 1; private const EXAMPLE_CONTENT_TYPE_ID = 1; private const EXAMPLE_NAME = 'Example'; @@ -162,7 +159,7 @@ public function testBuildDomainFieldsDeprecatedBehavior(): void ->with($persistenceContentType, [])->willReturn($apiContentTypeMock) ; - $this->expectDeprecation( + $this->expectUserDeprecationMessage( 'Since ibexa/core 4.6: Passing Ibexa\Contracts\Core\Persistence\Content\Type instead of ' . 'Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType as 2nd argument of ' . 'Ibexa\Core\Repository\Mapper\ContentDomainMapper::buildDomainFields() method is deprecated and will cause ' . From 61fdbdbc3f88c35892904e9c8cebf0175bc943b4 Mon Sep 17 00:00:00 2001 From: Dawid Parafinski Date: Mon, 21 Sep 2026 11:38:57 +0200 Subject: [PATCH 4/7] IBX-12606: Gated deprecations on the SQLite integration suites the same way as the unit suite --- phpunit-integration-legacy.baseline.xml | 95 +++++++++++++++++++++++++ phpunit-integration-legacy.xml | 4 +- phpunit-integration.baseline.xml | 21 ++++++ phpunit-integration.xml | 7 +- 4 files changed, 124 insertions(+), 3 deletions(-) create mode 100644 phpunit-integration-legacy.baseline.xml create mode 100644 phpunit-integration.baseline.xml diff --git a/phpunit-integration-legacy.baseline.xml b/phpunit-integration-legacy.baseline.xml new file mode 100644 index 0000000000..4e75c97850 --- /dev/null +++ b/phpunit-integration-legacy.baseline.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/phpunit-integration-legacy.xml b/phpunit-integration-legacy.xml index 22bb28c0de..8529df7386 100644 --- a/phpunit-integration-legacy.xml +++ b/phpunit-integration-legacy.xml @@ -1,5 +1,5 @@ - + @@ -46,7 +46,7 @@ tests/integration/RepositoryInstaller - + tests/integration diff --git a/phpunit-integration.baseline.xml b/phpunit-integration.baseline.xml new file mode 100644 index 0000000000..9dd4bd23c0 --- /dev/null +++ b/phpunit-integration.baseline.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/phpunit-integration.xml b/phpunit-integration.xml index d4973f4a48..4291690eb9 100644 --- a/phpunit-integration.xml +++ b/phpunit-integration.xml @@ -1,5 +1,5 @@ - + @@ -29,6 +29,11 @@ tests/integration/Core/Repository/KeywordFieldCriterionTest.php + + + src + + From 7d6249acea78d15a9c2161f473f81c9ae1dd702d Mon Sep 17 00:00:00 2001 From: Dawid Parafinski Date: Mon, 21 Sep 2026 12:10:33 +0200 Subject: [PATCH 5/7] IBX-12606: Regenerated the integration deprecation baselines on PHP 8.4, matching CI's matrix --- phpunit-integration-legacy.baseline.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/phpunit-integration-legacy.baseline.xml b/phpunit-integration-legacy.baseline.xml index 4e75c97850..0cfb53fcaf 100644 --- a/phpunit-integration-legacy.baseline.xml +++ b/phpunit-integration-legacy.baseline.xml @@ -1,11 +1,19 @@ + + + + + + + + From 575471ecb4c4fcaa1bbeea3eaf30611ab14d0e59 Mon Sep 17 00:00:00 2001 From: Dawid Parafinski Date: Mon, 21 Sep 2026 12:51:46 +0200 Subject: [PATCH 6/7] IBX-12606: Baselined the real-schema-install libxml_disable_entity_loader() deprecation, triggered on MySQL/PostgreSQL but not the SQLite fixture --- phpunit-integration-legacy.baseline.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/phpunit-integration-legacy.baseline.xml b/phpunit-integration-legacy.baseline.xml index 0cfb53fcaf..3aad984ecb 100644 --- a/phpunit-integration-legacy.baseline.xml +++ b/phpunit-integration-legacy.baseline.xml @@ -41,6 +41,16 @@ + + + + + + + + + + From 42d1c4d1b071834c3bbbfb5499447a7b8aae7d14 Mon Sep 17 00:00:00 2001 From: Dawid Parafinski Date: Mon, 21 Sep 2026 14:31:52 +0200 Subject: [PATCH 7/7] IBX-12606: Reformatted phpunit config root attributes to one per line for readability --- phpunit-integration-legacy-solr.xml | 14 +++++++++++++- phpunit-integration-legacy.xml | 16 +++++++++++++++- phpunit-integration.xml | 14 +++++++++++++- phpunit.xml | 13 ++++++++++++- 4 files changed, 53 insertions(+), 4 deletions(-) diff --git a/phpunit-integration-legacy-solr.xml b/phpunit-integration-legacy-solr.xml index 389cc31d4b..b07b8ad9f8 100644 --- a/phpunit-integration-legacy-solr.xml +++ b/phpunit-integration-legacy-solr.xml @@ -1,5 +1,17 @@ - + diff --git a/phpunit-integration-legacy.xml b/phpunit-integration-legacy.xml index 8529df7386..55752c0454 100644 --- a/phpunit-integration-legacy.xml +++ b/phpunit-integration-legacy.xml @@ -1,5 +1,19 @@ - + diff --git a/phpunit-integration.xml b/phpunit-integration.xml index 4291690eb9..18fe869fcd 100644 --- a/phpunit-integration.xml +++ b/phpunit-integration.xml @@ -1,5 +1,17 @@ - + diff --git a/phpunit.xml b/phpunit.xml index a574a69015..33a42c2200 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,5 +1,16 @@ - +