Refactor client initialization and add test for null request

Refactored client initialization to allow nullable ClientInterface with a default value. Replaced redundant `isset` checks with null coalescing operator for cleaner code. Added a unit test to verify behavior when no current request is available, ensuring robust error handling.

Author: klapaudius

Controller/AuthorizeController.php

@@ -42,7 +42,7 @@
  */
 class AuthorizeController
 {
-    private ClientInterface $client;
+    private ?ClientInterface $client = null;
 
     /**
      * This controller had been made as a service due to support symfony 4 where all* services are private by default.
@@ -146,7 +146,7 @@ protected function getClient(): ClientInterface
 
         if (null === $clientId = $request->get('client_id')) {
             $formData = $request->get($this->authorizeForm->getName(), []);
-            $clientId = isset($formData['client_id']) ? $formData['client_id'] : null;
+            $clientId = $formData['client_id'] ?? null;
         }
 
         $this->client = $this->clientManager->findClientByPublicId($clientId);

Tests/Controller/AuthorizeControllerTest.php

@@ -23,6 +23,7 @@
 use PHPUnit\Framework\Attributes\Small;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use ReflectionMethod;
 use ReflectionProperty;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\Form;
@@ -168,9 +169,14 @@ public function testAuthorizeActionWillRenderTemplate(): void
             ->with('_fos_oauth_server.ensure_logout')
             ->willReturn(false);
 
-        $propertyReflection = new ReflectionProperty(AuthorizeController::class, 'client');
-        $propertyReflection->setAccessible(true);
-        $propertyReflection->setValue($this->instance, $this->client);
+        $this->requestStack
+            ->expects($this->once())
+            ->method('getCurrentRequest')
+            ->willReturn($this->request);
+
+        $this->clientManager->expects($this->once())
+            ->method('findClientByPublicId')
+            ->willReturn($this->client);
 
         $this->eventDispatcher
             ->expects($this->exactly(1))
@@ -477,4 +483,20 @@ public function prepareAuthorizationData(string $randomScope): array
 
         return $formFields;
     }
+
+    public function testGetCurrentRequestWithNoRequestWillThrowException(): void
+    {
+        $reflectionMethod = new ReflectionMethod(AuthorizeController::class, 'getCurrentRequest');
+        $reflectionMethod->setAccessible(true);
+
+        $this->requestStack
+            ->expects($this->once())
+            ->method('getCurrentRequest')
+            ->willReturn(null);
+
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('No current request.');
+
+        $reflectionMethod->invoke($this->instance);
+    }
 }