sonata-project · VincentLanglet · Sep 14, 2025 · Sep 14, 2025 · Sep 14, 2025 · Sep 14, 2025
diff --git a/composer.json b/composer.json
@@ -49,15 +49,15 @@
         "knplabs/knp-menu": "^3.0",
         "knplabs/knp-menu-bundle": "^3.0",
         "masterminds/html5": "^2.7",
-        "matthiasnoback/symfony-config-test": "^4.2 || ^5.1",
-        "matthiasnoback/symfony-dependency-injection-test": "^4.0 || ^5.0",
+        "matthiasnoback/symfony-config-test": "^6.1",
+        "matthiasnoback/symfony-dependency-injection-test": "^6.1",
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpdoc-parser": "^1.0",
         "phpstan/phpstan": "^1.0 || ^2.0",
         "phpstan/phpstan-phpunit": "^1.0 || ^2.0",
         "phpstan/phpstan-strict-rules": "^1.0 || ^2.0",
         "phpstan/phpstan-symfony": "^1.0 || ^2.0",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^10.5.54 || ^11.5.38 || ^12.3.10",
         "psalm/plugin-phpunit": "^0.18 || ^0.19",
         "psalm/plugin-symfony": "^5.0",
         "rector/rector": "^1.1 || ^2.0",
@@ -67,7 +67,6 @@
         "symfony/asset": "^6.4 || ^7.1",
         "symfony/browser-kit": "^6.4 || ^7.1",
         "symfony/filesystem": "^6.4 || ^7.1",
-        "symfony/phpunit-bridge": "^6.4 || ^7.1",
         "symfony/security-bundle": "^6.4 || ^7.1",
         "symfony/security-csrf": "^6.4 || ^7.1",
         "symfony/twig-bundle": "^6.4 || ^7.1",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -6,37 +6,32 @@ DO NOT EDIT THIS FILE!
 It's auto-generated by sonata-project/dev-kit package.
 -->
 
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          colors="true"
          failOnWarning="true"
          failOnRisky="true"
-         stopOnFailure="false"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         displayDetailsOnAllIssues="true"
          bootstrap="tests/bootstrap.php"
 >
     <testsuites>
         <testsuite name="SonataClassificationBundle Test Suite">
-            <directory suffix="Test.php">./tests/</directory>
+            <directory>./tests/</directory>
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <source ignoreSuppressionOfDeprecations="true">
         <include>
-            <directory suffix=".php">./src/</directory>
+            <directory>src</directory>
         </include>
-    </coverage>
-
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
-    </listeners>
+    </source>
 
     <extensions>
-        <extension class="DAMA\DoctrineTestBundle\PHPUnit\PHPUnitExtension" />
+        <bootstrap class="DAMA\DoctrineTestBundle\PHPUnit\PHPUnitExtension" />
     </extensions>
 
     <php>
         <ini name="precision" value="8" />
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0" />
         <env name="KERNEL_CLASS" value="\Sonata\ClassificationBundle\Tests\App\AppKernel" />
         <server name="APP_ENV" value="test" force="true" />
         <server name="APP_DEBUG" value="false" />

diff --git a/rector.php b/rector.php
@@ -34,7 +34,7 @@
 
     $rectorConfig->sets([
         LevelSetList::UP_TO_PHP_81,
-        PHPUnitSetList::PHPUNIT_90,
+        PHPUnitSetList::PHPUNIT_100,
         PHPUnitSetList::PHPUNIT_CODE_QUALITY,
     ]);
 

diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php
@@ -18,6 +18,7 @@
 use Sonata\AdminBundle\Admin\AdminExtensionInterface;
 use Sonata\ClassificationBundle\Admin\ContextAdmin;
 use Sonata\ClassificationBundle\Admin\ContextAwareAdmin;
+use Sonata\ClassificationBundle\Model\ContextAwareInterface;
 use Sonata\ClassificationBundle\Model\ContextManagerInterface;
 
 final class AdminTest extends TestCase
@@ -44,18 +45,23 @@ public function testGetPersistentParametersWithNoExtension(): void
             'hide_context' => 0,
         ];
 
-        $admin = $this->getMockForAbstractClass(ContextAwareAdmin::class, [
-            $this->contextManager,
-        ]);
+        $admin = new
+        /** @phpstan-extends ContextAwareAdmin<ContextAwareInterface> */
+        class($this->contextManager) extends ContextAwareAdmin {};
 
         static::assertSame($expected, $admin->getPersistentParameters());
     }
 
     public function testGetPersistentParametersWithValidExtension(): void
     {
-        $admin = $this->getMockForAbstractClass(ContextAwareAdmin::class, [
-            $this->contextManager,
-        ]);
+        $admin = new
+            /** @phpstan-extends ContextAwareAdmin<ContextAwareInterface> */
+            class($this->contextManager) extends ContextAwareAdmin {
+                public function __construct(ContextManagerInterface $contextManager)
+                {
+                    parent::__construct($contextManager);
+                }
+            };
 
         $extension = $this->createMock(AdminExtensionInterface::class);
         $extension->expects(static::once())->method('configurePersistentParameters')->with(

diff --git a/tests/Block/Service/AbstractCategoriesBlockServiceTest.php b/tests/Block/Service/AbstractCategoriesBlockServiceTest.php
@@ -52,9 +52,7 @@ protected function setUp(): void
 
     public function testDefaultSettings(): void
     {
-        $blockService = $this->getMockForAbstractClass(AbstractCategoriesBlockService::class, [
-            $this->twig, $this->contextManager, $this->categoryManager, $this->categoryAdmin,
-        ]);
+        $blockService = new class($this->twig, $this->contextManager, $this->categoryManager, $this->categoryAdmin) extends AbstractCategoriesBlockService {};
         $blockContext = $this->getBlockContext($blockService);
 
         $this->assertSettings([
@@ -71,9 +69,7 @@ public function testDefaultSettings(): void
 
     public function testLoad(): void
     {
-        $category = $this->getMockBuilder(CategoryInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+        $category = $this->createMock(CategoryInterface::class);
         $category->expects(static::any())->method('getId')->willReturn(23);
 
         $this->categoryManager->expects(static::any())
@@ -90,17 +86,13 @@ public function testLoad(): void
             ->method('setSetting')
             ->with(static::equalTo('categoryId'), static::equalTo($category));
 
-        $blockService = $this->getMockForAbstractClass(AbstractCategoriesBlockService::class, [
-            $this->twig, $this->contextManager, $this->categoryManager, $this->categoryAdmin,
-        ]);
+        $blockService = new class($this->twig, $this->contextManager, $this->categoryManager, $this->categoryAdmin) extends AbstractCategoriesBlockService {};
         $blockService->load($block);
     }
 
     public function testPrePersist(): void
     {
-        $category = $this->getMockBuilder(CategoryInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+        $category = $this->createMock(CategoryInterface::class);
         $category->expects(static::any())->method('getId')->willReturn(23);
 
         $block = $this->createMock(BlockInterface::class);
@@ -112,17 +104,13 @@ public function testPrePersist(): void
             ->method('setSetting')
             ->with(static::equalTo('categoryId'), static::equalTo(23));
 
-        $blockService = $this->getMockForAbstractClass(AbstractCategoriesBlockService::class, [
-            $this->twig, $this->contextManager, $this->categoryManager, $this->categoryAdmin,
-        ]);
+        $blockService = new class($this->twig, $this->contextManager, $this->categoryManager, $this->categoryAdmin) extends AbstractCategoriesBlockService {};
         $blockService->prePersist($block);
     }
 
     public function testPreUpdate(): void
     {
-        $category = $this->getMockBuilder(CategoryInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+        $category = $this->createMock(CategoryInterface::class);
         $category->expects(static::any())->method('getId')->willReturn(23);
 
         $block = $this->createMock(BlockInterface::class);
@@ -134,9 +122,7 @@ public function testPreUpdate(): void
             ->method('setSetting')
             ->with(static::equalTo('categoryId'), static::equalTo(23));
 
-        $blockService = $this->getMockForAbstractClass(AbstractCategoriesBlockService::class, [
-            $this->twig, $this->contextManager, $this->categoryManager, $this->categoryAdmin,
-        ]);
+        $blockService = new class($this->twig, $this->contextManager, $this->categoryManager, $this->categoryAdmin) extends AbstractCategoriesBlockService {};
         $blockService->preUpdate($block);
     }
 }
diff --git a/tests/Block/Service/AbstractCollectionsBlockServiceTest.php b/tests/Block/Service/AbstractCollectionsBlockServiceTest.php
@@ -52,9 +52,7 @@ protected function setUp(): void
 
     public function testDefaultSettings(): void
     {
-        $blockService = $this->getMockForAbstractClass(AbstractCollectionsBlockService::class, [
-            $this->twig, $this->contextManager, $this->collectionManager, $this->collectionAdmin,
-        ]);
+        $blockService = new class($this->twig, $this->contextManager, $this->collectionManager, $this->collectionAdmin) extends AbstractCollectionsBlockService {};
         $blockContext = $this->getBlockContext($blockService);
 
         $this->assertSettings([
@@ -71,9 +69,7 @@ public function testDefaultSettings(): void
 
     public function testLoad(): void
     {
-        $collection = $this->getMockBuilder(CollectionInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+        $collection = $this->createMock(CollectionInterface::class);
         $collection->expects(static::any())->method('getId')->willReturn(23);
 
         $this->collectionManager->expects(static::any())
@@ -90,17 +86,13 @@ public function testLoad(): void
             ->method('setSetting')
             ->with(static::equalTo('collectionId'), static::equalTo($collection));
 
-        $blockService = $this->getMockForAbstractClass(AbstractCollectionsBlockService::class, [
-            $this->twig, $this->contextManager, $this->collectionManager, $this->collectionAdmin,
-        ]);
+        $blockService = new class($this->twig, $this->contextManager, $this->collectionManager, $this->collectionAdmin) extends AbstractCollectionsBlockService {};
         $blockService->load($block);
     }
 
     public function testPrePersist(): void
     {
-        $collection = $this->getMockBuilder(CollectionInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+        $collection = $this->createMock(CollectionInterface::class);
         $collection->expects(static::any())->method('getId')->willReturn(23);
 
         $block = $this->createMock(BlockInterface::class);
@@ -112,17 +104,13 @@ public function testPrePersist(): void
             ->method('setSetting')
             ->with(static::equalTo('collectionId'), static::equalTo(23));
 
-        $blockService = $this->getMockForAbstractClass(AbstractCollectionsBlockService::class, [
-            $this->twig, $this->contextManager, $this->collectionManager, $this->collectionAdmin,
-        ]);
+        $blockService = new class($this->twig, $this->contextManager, $this->collectionManager, $this->collectionAdmin) extends AbstractCollectionsBlockService {};
         $blockService->prePersist($block);
     }
 
     public function testPreUpdate(): void
     {
-        $collection = $this->getMockBuilder(CollectionInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+        $collection = $this->createMock(CollectionInterface::class);
         $collection->expects(static::any())->method('getId')->willReturn(23);
 
         $block = $this->createMock(BlockInterface::class);
@@ -134,9 +122,7 @@ public function testPreUpdate(): void
             ->method('setSetting')
             ->with(static::equalTo('collectionId'), static::equalTo(23));
 
-        $blockService = $this->getMockForAbstractClass(AbstractCollectionsBlockService::class, [
-            $this->twig, $this->contextManager, $this->collectionManager, $this->collectionAdmin,
-        ]);
+        $blockService = new class($this->twig, $this->contextManager, $this->collectionManager, $this->collectionAdmin) extends AbstractCollectionsBlockService {};
         $blockService->preUpdate($block);
     }
 }
diff --git a/tests/Block/Service/AbstractTagsBlockServiceTest.php b/tests/Block/Service/AbstractTagsBlockServiceTest.php
@@ -52,9 +52,7 @@ protected function setUp(): void
 
     public function testDefaultSettings(): void
     {
-        $blockService = $this->getMockForAbstractClass(AbstractTagsBlockService::class, [
-            $this->twig, $this->contextManager, $this->tagManager, $this->tagAdmin,
-        ]);
+        $blockService = new class($this->twig, $this->contextManager, $this->tagManager, $this->tagAdmin) extends AbstractTagsBlockService {};
         $blockContext = $this->getBlockContext($blockService);
 
         $this->assertSettings([
@@ -71,9 +69,7 @@ public function testDefaultSettings(): void
 
     public function testLoad(): void
     {
-        $tag = $this->getMockBuilder(TagInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+        $tag = $this->createMock(TagInterface::class);
         $tag->expects(static::any())->method('getId')->willReturn(23);
 
         $this->tagManager->expects(static::any())
@@ -90,17 +86,13 @@ public function testLoad(): void
             ->method('setSetting')
             ->with(static::equalTo('tagId'), static::equalTo($tag));
 
-        $blockService = $this->getMockForAbstractClass(AbstractTagsBlockService::class, [
-            $this->twig, $this->contextManager, $this->tagManager, $this->tagAdmin,
-        ]);
+        $blockService = new class($this->twig, $this->contextManager, $this->tagManager, $this->tagAdmin) extends AbstractTagsBlockService {};
         $blockService->load($block);
     }
 
     public function testPrePersist(): void
     {
-        $tag = $this->getMockBuilder(TagInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+        $tag = $this->createMock(TagInterface::class);
         $tag->expects(static::any())->method('getId')->willReturn(23);
 
         $block = $this->createMock(BlockInterface::class);
@@ -112,17 +104,13 @@ public function testPrePersist(): void
             ->method('setSetting')
             ->with(static::equalTo('tagId'), static::equalTo(23));
 
-        $blockService = $this->getMockForAbstractClass(AbstractTagsBlockService::class, [
-            $this->twig, $this->contextManager, $this->tagManager, $this->tagAdmin,
-        ]);
+        $blockService = new class($this->twig, $this->contextManager, $this->tagManager, $this->tagAdmin) extends AbstractTagsBlockService {};
         $blockService->prePersist($block);
     }
 
     public function testPreUpdate(): void
     {
-        $tag = $this->getMockBuilder(TagInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+        $tag = $this->createMock(TagInterface::class);
         $tag->expects(static::any())->method('getId')->willReturn(23);
 
         $block = $this->createMock(BlockInterface::class);
@@ -134,9 +122,7 @@ public function testPreUpdate(): void
             ->method('setSetting')
             ->with(static::equalTo('tagId'), static::equalTo(23));
 
-        $blockService = $this->getMockForAbstractClass(AbstractTagsBlockService::class, [
-            $this->twig, $this->contextManager, $this->tagManager, $this->tagAdmin,
-        ]);
+        $blockService = new class($this->twig, $this->contextManager, $this->tagManager, $this->tagAdmin) extends AbstractTagsBlockService {};
         $blockService->preUpdate($block);
     }
 }