OXDEV-10037 Fix static issues

Author: TitaKoleva

src/Authentication/OAuth2/Controller/OAuthController.php

@@ -16,7 +16,7 @@
 class OAuthController extends FrontendController
 {
     public function __construct(
-        private readonly AuthenticationServiceInterface $authenticationService,
+        private readonly AuthenticationServiceInterface $authService,
         private readonly OAuthRequestInterface $oauthRequest,
         private readonly InternalRedirectServiceInterface $redirectService,
         private readonly Utils $utils,
@@ -26,7 +26,7 @@ public function __construct(
 
     public function login(): void
     {
-        $authorizationUrl = $this->authenticationService->getAuthorizationUrl(
+        $authorizationUrl = $this->authService->getAuthorizationUrl(
             $this->oauthRequest->getProvider()
         );
 
@@ -40,7 +40,7 @@ public function redirect(): void
             return;
         }
 
-        $this->authenticationService->handleCallback(
+        $this->authService->handleCallback(
             $this->oauthRequest->getProvider(),
             $this->oauthRequest->getCode()
         );

src/Authentication/TwoFactorAuth/Service/AuthorizeService.php

@@ -92,5 +92,4 @@ public function getRemainingAttempts(): int
 
         return $verificator->getRemainingAttempts($userId);
     }
-
 }

src/Authentication/TwoFactorAuth/Service/Verificator/OTP/Validator/OTPValidator.php

@@ -18,8 +18,10 @@
 {
     private const MAX_ATTEMPTS = 5;
 
-    public function validateCode(#[\SensitiveParameter] ?string $userCode, #[\SensitiveParameter] string $inputCode): void
-    {
+    public function validateCode(
+        #[\SensitiveParameter] ?string $userCode,
+        #[\SensitiveParameter] string $inputCode
+    ): void {
         if (!$userCode || empty($inputCode)) {
             throw new InvalidCodeException();
         }

src/Authentication/TwoFactorAuth/Service/Verificator/OTP/Validator/OTPValidatorInterface.php

@@ -15,7 +15,10 @@ interface OTPValidatorInterface
     /**
      * @throws InvalidCodeException
      */
-    public function validateCode(#[\SensitiveParameter] ?string $userCode, #[\SensitiveParameter] string $inputCode): void;
+    public function validateCode(
+        #[\SensitiveParameter] ?string $userCode,
+        #[\SensitiveParameter] string $inputCode
+    ): void;
 
     public function checkLoginAttempts(int $attempts): void;
 

src/Authentication/TwoFactorAuth/Transput/JsonResponse.php

@@ -29,6 +29,8 @@ public function send(array $data): void
     {
         $this->utils->setHeader('HTTP/1.1 ' . $this->statusCode);
         $this->utils->setHeader('Content-Type: application/json');
-        $this->utils->showMessageAndExit(json_encode($data));
+
+        $response = (string) json_encode($data);
+        $this->utils->showMessageAndExit($response);
     }
 }

src/Shared/Model/User.php

@@ -29,8 +29,13 @@
  */
 class User extends User_parent
 {
-    public function checkValues($sLogin, #[\SensitiveParameter] $sPassword, #[\SensitiveParameter] $sPassword2, $aInvAddress, $aDelAddress): void
-    {
+    public function checkValues(
+        $sLogin,
+        #[\SensitiveParameter] $sPassword,
+        #[\SensitiveParameter] $sPassword2,
+        $aInvAddress,
+        $aDelAddress
+    ): void {
         if ($this->isCaptchaEnabled() && $this->shouldValidateCaptcha()) {
             /** @var InputValidator $oInputValidator */
             $oInputValidator = Registry::getInputValidator();

tests/Unit/Authentication/OAuth2/Controller/OAuthControllerTest.php

@@ -114,7 +114,7 @@ private function getSut(
         Utils $utils = null,
     ): OAuthController {
         return new OAuthController(
-            authenticationService: $authenticationService ?? $this->createStub(AuthenticationServiceInterface::class),
+            authService: $authenticationService ?? $this->createStub(AuthenticationServiceInterface::class),
             oauthRequest: $oauthRequest ?? $this->createStub(OAuthRequestInterface::class),
             redirectService: $redirectService ?? $this->createStub(InternalRedirectServiceInterface::class),
             utils: $utils ?? $this->createStub(Utils::class),