Fix

Author: VincentLanglet

tests/Admin/AdminTest.php

@@ -13,7 +13,6 @@
 
 namespace Sonata\ClassificationBundle\Tests\Admin;
 
-use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Sonata\AdminBundle\Admin\AbstractAdmin;
 use Sonata\AdminBundle\Admin\AdminExtensionInterface;
@@ -46,21 +45,23 @@ public function testGetPersistentParametersWithNoExtension(): void
             'hide_context' => 0,
         ];
 
+        $admin = new
         /** @phpstan-extends ContextAwareAdmin<ContextAwareInterface> */
-        $admin = new class($this->contextManager) extends ContextAwareAdmin {};
+        class($this->contextManager) extends ContextAwareAdmin {};
 
         static::assertSame($expected, $admin->getPersistentParameters());
     }
 
     public function testGetPersistentParametersWithValidExtension(): void
     {
-        /** @phpstan-extends ContextAwareAdmin<ContextAwareInterface> */
-        $admin = new class($this->contextManager) extends ContextAwareAdmin {
-            public function __construct(ContextManagerInterface $contextManager)
-            {
-                parent::__construct($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(

tests/Entity/ContextTest.php

@@ -26,7 +26,7 @@ public function testSetterGetter(): void
         $time = new \DateTime();
 
         $context = new class extends Context {
-            public function getId(): ?string
+            public function getId(): string
             {
                 return '2';
             }
@@ -49,7 +49,7 @@ public function getId(): ?string
     public function testPreUpdate(): void
     {
         $context = new class extends Context {
-            public function getId(): ?string
+            public function getId(): string
             {
                 return '42';
             }