Fixed JWT Token Manager proxy build in the newer version

igoryok-zp · Oct 26, 2024 · c5e3d75 · c5e3d75
1 parent a9f92ce
commit c5e3d75
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/app/tests/Service/ServiceTestCase.php b/app/tests/Service/ServiceTestCase.php
@@ -18,9 +18,10 @@ class ServiceTestCase extends KernelTestCase
     /**
      * @template T of object
      * @param class-string<T> $class
+     * @param array<string, mixed> $params
      * @return MockObject&T
      */
-    protected function buildProxy(string $class): mixed
+    protected function buildProxy(string $class, $params = []): mixed
     {
         $reflection = new ReflectionClass($class);
         if ($reflection->isInterface()) {
@@ -30,10 +31,10 @@ protected function buildProxy(string $class): mixed
         $constructorArguments = [];
         if ($reflection->getConstructor()) {
             foreach ($reflection->getConstructor()->getParameters() as $param) {
-                $constructorArgument = null;
+                $constructorArgument = $params[$param->name] ?? null;
                 /** @var class-string<object> */
                 $type = (string) $param->getType();
-                if (!empty($type)) {
+                if (empty($constructorArgument) && !empty($type)) {
                     $constructorArgument = $param->isDefaultValueAvailable()
                         ? $this->getServiceOrNull($type)
                         : $this->getService($type);

diff --git a/app/tests/Service/UserServiceTest.php b/app/tests/Service/UserServiceTest.php
@@ -22,7 +22,9 @@ class UserServiceTest extends ServiceTestCase
 
     private function createService(?int $contextUserId = null): UserService
     {
-        $this->tokenManager = $this->buildProxy(JWTTokenManagerInterface::class);
+        $this->tokenManager = $this->buildProxy(JWTTokenManagerInterface::class, [
+            'userIdClaim' => static::getContainer()->getParameter('lexik_jwt_authentication.user_id_claim'),
+        ]);
 
         return new UserService(
             $this->createContext($contextUserId),