Fix the static test failures and improve code readability

Author: engcom-Hotel

app/code/Magento/Captcha/Plugin/CheckCaptchaOnStorefront.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -17,34 +17,19 @@
  */
 class CheckCaptchaOnStorefront
 {
-    /**
-     * @var HelperCaptcha
-     */
-    private $helper;
-
-    /**
-     * Customer session
-     *
-     * @var HttpContext
-     */
-    private $httpContext;
-
     /**
      * CheckCaptchaOnStorefront constructor
      *
      * @param HelperCaptcha $helper
      * @param HttpContext $httpContext
      */
     public function __construct(
-        HelperCaptcha $helper,
-        HttpContext $httpContext
-    ) {
-        $this->helper = $helper;
-        $this->httpContext = $httpContext;
-    }
+        private readonly HelperCaptcha $helper,
+        private readonly HttpContext   $httpContext
+    ) {}
 
     /**
-     * Remove template when loggin or disable captcha storefront
+     * Remove template when login or disable captcha storefront
      *
      * @param AuthenticationPopup $subject
      * @param string $result
@@ -54,8 +39,8 @@ public function __construct(
      */
     public function afterGetTemplate(
         AuthenticationPopup $subject,
-        $result
-    ) {
+        string $result
+    ): string {
         if ($this->isLoggedIn() || !$this->helper->getConfig('enable')) {
             return '';
         }
@@ -68,7 +53,7 @@ public function afterGetTemplate(
      *
      * @return bool
      */
-    private function isLoggedIn()
+    private function isLoggedIn(): bool
     {
         return $this->httpContext->getValue(Context::CONTEXT_AUTH);
     }

app/code/Magento/Captcha/etc/frontend/di.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">