Deprecate HttpTester; refactor remaining tests

packages/security/Tests/Http/Authenticator/JwtAuthenticatorTest.php

@@ -6,6 +6,7 @@
 use Draw\Component\Security\Http\Authenticator\JwtAuthenticator;
 use Draw\Component\Security\Http\Authenticator\Passport\Badge\JwtPayloadBadge;
 use Draw\Component\Security\Jwt\JwtEncoder;
+use Draw\Component\Security\Tests\Mock\MockableUserInterface;
 use Draw\Component\Tester\MockTrait;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -39,10 +40,10 @@ class JwtAuthenticatorTest extends TestCase
 
     private string $userIdentifierPayloadKey;
 
-    private string $userIdentifierGetter;
-
     private TranslatorInterface&MockObject $translator;
 
+    private static string $userIdentifierGetter = 'getIdentifierForJwtAuthenticatorTest';
+
     protected function setUp(): void
     {
         $this->userProvider = $this->createMock(UserProviderInterface::class);
@@ -51,7 +52,7 @@ protected function setUp(): void
             $this->jwtEncoder = $this->createMock(JwtEncoder::class),
             $this->userProvider,
             $this->userIdentifierPayloadKey = uniqid('key'),
-            $this->userIdentifierGetter = uniqid('get'),
+            self::$userIdentifierGetter,
             $this->translator = $this->createMock(TranslatorInterface::class)
         );
     }
@@ -92,14 +93,11 @@ public function testSupportsNoToken(): void
 
     public function testGenerateToken(): void
     {
-        $user = $this->createMockWithExtraMethods(
-            UserInterface::class,
-            [$this->userIdentifierGetter]
-        );
+        $user = $this->createMock(MockableUserInterface::class);
 
         $user
             ->expects(static::once())
-            ->method($this->userIdentifierGetter)
+            ->method(self::$userIdentifierGetter)
             ->willReturn($userId = uniqid('id'));
 
         $this->jwtEncoder
@@ -125,14 +123,11 @@ public function testGenerateTokenDefaultNull(): void
             null
         );
 
-        $user = $this->createMockWithExtraMethods(
-            UserInterface::class,
-            [$this->userIdentifierGetter]
-        );
+        $user = $this->createMock(MockableUserInterface::class);
 
         $user
             ->expects(static::once())
-            ->method($this->userIdentifierGetter)
+            ->method(self::$userIdentifierGetter)
             ->willReturn($userId = uniqid('id'));
 
         $this->jwtEncoder
@@ -151,14 +146,11 @@ public function testGenerateTokenDefaultNull(): void
 
     public function testGenerateTokenWithExpiration(): void
     {
-        $user = $this->createMockWithExtraMethods(
-            UserInterface::class,
-            [$this->userIdentifierGetter]
-        );
+        $user = $this->createMock(MockableUserInterface::class);
 
         $user
             ->expects(static::once())
-            ->method($this->userIdentifierGetter)
+            ->method(self::$userIdentifierGetter)
             ->willReturn($userId = uniqid('id'));
 
         $this->jwtEncoder
@@ -180,14 +172,11 @@ public function testGenerateTokenWithExpiration(): void
 
     public function testGenerateTokenWithExtraPayload(): void
     {
-        $user = $this->createMockWithExtraMethods(
-            UserInterface::class,
-            [$this->userIdentifierGetter]
-        );
+        $user = $this->createMock(MockableUserInterface::class);
 
         $user
             ->expects(static::once())
-            ->method($this->userIdentifierGetter)
+            ->method(self::$userIdentifierGetter)
             ->willReturn($userId = uniqid('id'));
 
         $extraPayload = [

packages/security/Tests/Mock/MockableUserInterface.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Draw\Component\Security\Tests\Mock;
+
+use Symfony\Component\Security\Core\User\UserInterface;
+
+interface MockableUserInterface extends UserInterface
+{
+    public function getIdentifierForJwtAuthenticatorTest(): ?string;
+}

packages/tester/.phpstorm.meta.php

@@ -2,12 +2,7 @@
 
 namespace PHPSTORM_META;
 
-override(
-    \Draw\Component\Tester\MockTrait::createMockWithExtraMethods(),
-    map(["" => "@"])
-);
-
 override(
     \Draw\Component\Tester\MockTrait::mockProperty(2),
     map([""=>"$2"])
-);
+);

packages/tester/HttpTesterTrait.php

@@ -5,6 +5,9 @@
 use Draw\Component\Tester\Http\ClientInterface;
 use PHPUnit\Framework\Attributes\BeforeClass;
 
+/**
+ * @deprecated
+ */
 trait HttpTesterTrait
 {
     protected static ?ClientInterface $httpTesterClient = null;

packages/tester/MockTrait.php

@@ -14,25 +14,6 @@ abstract public function getMockBuilder(string $className): MockBuilder;
 
     abstract protected function createMock(string $originalClassName): MockObject;
 
-    /**
-     * @template T of object
-     *
-     * @phpstan-param class-string<T> $originalClassName
-     *
-     * @return MockObject&T
-     */
-    protected function createMockWithExtraMethods(string $originalClassName, array $methods): MockObject
-    {
-        return $this->getMockBuilder($originalClassName)
-            ->disableOriginalConstructor()
-            ->disableOriginalClone()
-            ->disableArgumentCloning()
-            ->disallowMockingUnknownTypes()
-            ->onlyMethods(get_class_methods($originalClassName))
-            ->addMethods($methods)
-            ->getMock();
-    }
-
     /**
      * @template T of object
      *

phpstan.dist.neon

@@ -11,11 +11,10 @@ parameters:
   	- packages/fixer/Tests/fixtures/*
   ignoreErrors:
       - '#Call to an undefined method Symfony\\Component\\HttpFoundation\\Session\\SessionInterface::getFlashBag\(\).#'
-      - '#Trying to mock an undefined method [a-zA-Z0-9\\_]#'
       #- '#provideTestArgument\(\) return type has no value type specified in iterable type (iterable|array).#'
       #- '#provideTestOption\(\) return type has no value type specified in iterable type (iterable|array).#'
       #- '#getHandledMessages\(\) return type has no value type specified in iterable type (iterable|array).#'
       #- '#Test::getDefaultConfiguration\(\) return type has no value type specified in iterable type array.#'
       #- '#Test::getConfiguration\(\) return type has no value type specified in iterable type array.#'
       #- '#Test::provide[a-zA-Z0-9]*\(\) return type has no value type specified in iterable type (iterable|array).#'
-      #- '#Method [a-zA-Z0-9\\]*::getForEmails\(\) return type has no value type specified in iterable type (iterable|array).#'
+      #- '#Method [a-zA-Z0-9\\]*::getForEmails\(\) return type has no value type specified in iterable type (iterable|array).#'

phpstan.neon

@@ -13,11 +13,10 @@ parameters:
   	- packages/fixer/Tests/fixtures/*
   ignoreErrors:
       - '#Call to an undefined method Symfony\\Component\\HttpFoundation\\Session\\SessionInterface::getFlashBag\(\).#'
-      - '#Trying to mock an undefined method [a-zA-Z0-9\\_]#'
       #- '#provideTestArgument\(\) return type has no value type specified in iterable type (iterable|array).#'
       #- '#provideTestOption\(\) return type has no value type specified in iterable type (iterable|array).#'
       #- '#getHandledMessages\(\) return type has no value type specified in iterable type (iterable|array).#'
       #- '#Test::getDefaultConfiguration\(\) return type has no value type specified in iterable type array.#'
       #- '#Test::getConfiguration\(\) return type has no value type specified in iterable type array.#'
       #- '#Test::provide[a-zA-Z0-9]*\(\) return type has no value type specified in iterable type (iterable|array).#'
-      #- '#Method [a-zA-Z0-9\\]*::getForEmails\(\) return type has no value type specified in iterable type (iterable|array).#'
+      #- '#Method [a-zA-Z0-9\\]*::getForEmails\(\) return type has no value type specified in iterable type (iterable|array).#'