~ refactoring of AuthorizeController::getClient() to improve readability and make the code easier to follow and understand

Author: dinamic

Controller/AuthorizeController.php

@@ -249,25 +249,23 @@ protected function getRedirectionUrl(UserInterface $user)
      */
     protected function getClient()
     {
-        if (null === $this->client) {
-            $request = $this->getCurrentRequest();
+        if (null !== $this->client) {
+            return $this->client;
+        }
 
-            $client = null;
-            if (null !== $request) {
-                if (null === $clientId = $request->get('client_id')) {
-                    $form = $this->authorizeForm;
-                    $formData = $request->get($form->getName(), array());
-                    $clientId = isset($formData['client_id']) ? $formData['client_id'] : null;
-                }
+        if (null === $request = $this->getCurrentRequest()) {
+            throw new NotFoundHttpException('Client not found.');
+        }
 
-                $client = $this->clientManager->findClientByPublicId($clientId);
-            }
+        if (null === $clientId = $request->get('client_id')) {
+            $formData = $request->get($this->authorizeForm->getName(), []);
+            $clientId = $formData['client_id'] ?? null;
+        }
 
-            if (null === $client) {
-                throw new NotFoundHttpException('Client not found.');
-            }
+        $this->client = $this->clientManager->findClientByPublicId($clientId);
 
-            $this->client = $client;
+        if (null === $this->client) {
+            throw new NotFoundHttpException('Client not found.');
         }
 
         return $this->client;