ACP2E-3920: fix static errors

alzota · alzota · commit 0d9355c0f30a · 2025-05-19T15:34:57.000+03:00
diff --git a/ReCaptchaAdminUi/view/adminhtml/web/css/source/_module.less b/ReCaptchaAdminUi/view/adminhtml/web/css/source/_module.less
@@ -2,7 +2,9 @@
  * Copyright 2020 Adobe
  * All Rights Reserved.
  */
-
+/*
+ * @codingStandardsIgnoreFile
+ */
 .recaptcha_backend_type_for_recaptcha_backend_info_heading_notice,
 .recaptcha_frontend_type_for_recaptcha_frontend_info_heading_notice {
     strong {
diff --git a/ReCaptchaCheckout/view/frontend/web/template/payment-recaptcha-container.html b/ReCaptchaCheckout/view/frontend/web/template/payment-recaptcha-container.html
@@ -1,10 +1,8 @@
+<!--
 /**
  * Copyright 2020 Adobe
  * All Rights Reserved.
  */
-
-<!--
-
  -->
 <div>
     <each args="data: getRegion('place-order-recaptcha'), as: 'recaptcha'" render=""></each>
diff --git a/ReCaptchaCheckout/view/frontend/web/template/reCaptcha.html b/ReCaptchaCheckout/view/frontend/web/template/reCaptcha.html
@@ -1,10 +1,8 @@
+<!--
 /**
  * Copyright 2022 Adobe
  * All Rights Reserved.
  */
-
-<!--
-
  -->
 <!-- ko if: (isCheckoutReCaptchaRequiredFor($parents[1]))-->
 <div class="recaptcha-checkout-place-order" data-bind="{
diff --git a/ReCaptchaContact/Observer/ContactFormObserver.php b/ReCaptchaContact/Observer/ContactFormObserver.php
@@ -16,9 +16,6 @@
 use Magento\ReCaptchaUi\Model\IsCaptchaEnabledInterface;
 use Magento\ReCaptchaUi\Model\RequestHandlerInterface;
 
-/**
- * ContactFormObserver
- */
 class ContactFormObserver implements ObserverInterface
 {
     /**
@@ -52,6 +49,8 @@ public function __construct(
     }
 
     /**
+     * Checking if captcha is enabled for contact form and if so, validate the captcha
+     *
      * @param Observer $observer
      * @return void
      * @throws LocalizedException
diff --git a/ReCaptchaCustomer/Model/AjaxLogin/CaptchaResponseResolver.php b/ReCaptchaCustomer/Model/AjaxLogin/CaptchaResponseResolver.php
@@ -33,7 +33,7 @@ public function __construct(SerializerInterface $serializer)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @param RequestInterface|PlainTextRequestInterface $request
      * @return string
diff --git a/ReCaptchaCustomer/Observer/CreateCustomerObserver.php b/ReCaptchaCustomer/Observer/CreateCustomerObserver.php
@@ -15,9 +15,6 @@
 use Magento\ReCaptchaUi\Model\IsCaptchaEnabledInterface;
 use Magento\ReCaptchaUi\Model\RequestHandlerInterface;
 
-/**
- * CreateCustomerObserver
- */
 class CreateCustomerObserver implements ObserverInterface
 {
     /**
@@ -51,6 +48,8 @@ public function __construct(
     }
 
     /**
+     * Checking if captcha is enabled for customer create form and if so, validate the captcha
+     *
      * @param Observer $observer
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
diff --git a/ReCaptchaCustomer/Observer/ForgotPasswordObserver.php b/ReCaptchaCustomer/Observer/ForgotPasswordObserver.php
@@ -16,9 +16,6 @@
 use Magento\ReCaptchaUi\Model\IsCaptchaEnabledInterface;
 use Magento\ReCaptchaUi\Model\RequestHandlerInterface;
 
-/**
- * ForgotPasswordObserver
- */
 class ForgotPasswordObserver implements ObserverInterface
 {
     /**
@@ -52,6 +49,8 @@ public function __construct(
     }
 
     /**
+     * Checking if captcha is enabled for customer forgot password form and if so, validate the captcha
+     *
      * @param Observer $observer
      * @return void
      * @throws LocalizedException
diff --git a/ReCaptchaCustomer/Observer/LoginObserver.php b/ReCaptchaCustomer/Observer/LoginObserver.php
@@ -14,12 +14,11 @@
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Session\SessionManagerInterface;
 use Magento\ReCaptchaUi\Model\IsCaptchaEnabledInterface;
 use Magento\ReCaptchaUi\Model\RequestHandlerInterface;
 
 /**
- * LoginObserver
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class LoginObserver implements ObserverInterface
 {
@@ -62,6 +61,8 @@ public function __construct(
     }
 
     /**
+     * Checking if captcha is enabled for customer login form and if so, validate the captcha
+     *
      * @param Observer $observer
      * @return void
      * @throws LocalizedException
diff --git a/ReCaptchaCustomer/Plugin/Block/Account/InjectRecaptchaInAuthenticationPopup.php b/ReCaptchaCustomer/Plugin/Block/Account/InjectRecaptchaInAuthenticationPopup.php
@@ -50,6 +50,8 @@ public function __construct(
     }
 
     /**
+     * Inject reCAPTCHA in authentication popup layout
+     *
      * @param AuthenticationPopup $subject
      * @param string $result
      * @return string
diff --git a/ReCaptchaCustomer/Test/Api/AccountManagementCaptchaTest.php b/ReCaptchaCustomer/Test/Api/AccountManagementCaptchaTest.php
@@ -14,7 +14,6 @@
 use Magento\Framework\Webapi\Rest\Request;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 
-
 /**
  * Test class for Magento\Customer\Api\AccountManagementInterface
  *
@@ -133,5 +132,4 @@ public function testPasswordReset(): void
 
         $this->_webApiCall($serviceInfo, $requestData);
     }
-
 }
diff --git a/ReCaptchaFrontendUi/Plugin/ExcludeFromMinification.php b/ReCaptchaFrontendUi/Plugin/ExcludeFromMinification.php
@@ -16,9 +16,11 @@
 class ExcludeFromMinification
 {
     /**
+     * Exclude external recaptcha from minification
+     *
      * @param Minification $subject
      * @param callable $proceed
-     * @param $contentType
+     * @param string $contentType
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
diff --git a/ReCaptchaFrontendUi/view/frontend/web/css/source/_module.less b/ReCaptchaFrontendUi/view/frontend/web/css/source/_module.less
@@ -3,12 +3,12 @@
  * All Rights Reserved.
  */
 
-.required-captcha.checkbox{
-    position: absolute;
+.required-captcha.checkbox {
     display: block;
-    visibility: visible;
-    overflow: hidden;
+    height: 1px;
+    position: absolute;
     opacity: 0;
+    overflow: hidden;
+    visibility: visible;
     width: 1px;
-    height: 1px;
 }
diff --git a/ReCaptchaFrontendUi/view/frontend/web/template/reCaptcha.html b/ReCaptchaFrontendUi/view/frontend/web/template/reCaptcha.html
@@ -1,10 +1,8 @@
+<!--
 /**
  * Copyright 2020 Adobe
  * All Rights Reserved.
  */
-
-<!--
-
  -->
 
 <div data-bind="{
diff --git a/ReCaptchaMigration/Setup/Patch/Data/MigrateConfigToRecaptchaModules.php b/ReCaptchaMigration/Setup/Patch/Data/MigrateConfigToRecaptchaModules.php
@@ -70,6 +70,8 @@ public function apply()
             $this->copyEnabledRecaptcha($scope);
             $this->disableLegacyRecaptcha($scope);
         }
+
+        return $this;
     }
 
     /**
diff --git a/ReCaptchaNewsletter/Observer/NewsletterObserver.php b/ReCaptchaNewsletter/Observer/NewsletterObserver.php
@@ -16,9 +16,6 @@
 use Magento\ReCaptchaUi\Model\IsCaptchaEnabledInterface;
 use Magento\ReCaptchaUi\Model\RequestHandlerInterface;
 
-/**
- * NewsletterObserver
- */
 class NewsletterObserver implements ObserverInterface
 {
     /**
@@ -52,6 +49,8 @@ public function __construct(
     }
 
     /**
+     * Checking if captcha is enabled for newsletter, validate the captcha
+     *
      * @param Observer $observer
      * @return void
      * @throws LocalizedException
diff --git a/ReCaptchaPaypal/Test/Api/PayflowCaptchaGlaphQLTest.php b/ReCaptchaPaypal/Test/Api/PayflowCaptchaGlaphQLTest.php
@@ -75,5 +75,4 @@ public function testCreatePayflowProToken(): void
 
         $this->graphQlMutation($query);
     }
-
 }
diff --git a/ReCaptchaReview/Observer/ReviewFormObserver.php b/ReCaptchaReview/Observer/ReviewFormObserver.php
@@ -16,9 +16,6 @@
 use Magento\ReCaptchaUi\Model\IsCaptchaEnabledInterface;
 use Magento\ReCaptchaUi\Model\RequestHandlerInterface;
 
-/**
- * ReviewFormObserver
- */
 class ReviewFormObserver implements ObserverInterface
 {
     /**
@@ -52,6 +49,8 @@ public function __construct(
     }
 
     /**
+     * Checking if captcha enabled for product review, validate it
+     *
      * @param Observer $observer
      * @return void
      * @throws LocalizedException
diff --git a/ReCaptchaReview/Test/Integration/ReviewFormTest.php b/ReCaptchaReview/Test/Integration/ReviewFormTest.php
@@ -39,7 +39,7 @@ class ReviewFormTest extends AbstractController
     private $formKey;
 
     /**
-     * @var
+     * @var ReviewResourceModel
      */
     private $reviewResourceModel;
 
diff --git a/ReCaptchaSendFriend/Observer/SendFriendObserver.php b/ReCaptchaSendFriend/Observer/SendFriendObserver.php
@@ -16,9 +16,6 @@
 use Magento\ReCaptchaUi\Model\IsCaptchaEnabledInterface;
 use Magento\ReCaptchaUi\Model\RequestHandlerInterface;
 
-/**
- * SendFriendObserver
- */
 class SendFriendObserver implements ObserverInterface
 {
     /**
@@ -52,6 +49,8 @@ public function __construct(
     }
 
     /**
+     * Checking if captcha enabled for sendfriend, validate it
+     *
      * @param Observer $observer
      * @return void
      * @throws LocalizedException
diff --git a/ReCaptchaUi/Block/ReCaptcha.php b/ReCaptchaUi/Block/ReCaptcha.php
@@ -63,7 +63,7 @@ public function getRecaptchaId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return string
      * @throws InputException
@@ -107,8 +107,9 @@ public function getCaptchaUiConfig(): array
         return $uiConfig;
     }
 
-
     /**
+     * Generate HTML for reCAPTCHA
+     *
      * @return string
      * @throws InputException
      */
diff --git a/ReCaptchaUi/Model/ValidationConfigResolver.php b/ReCaptchaUi/Model/ValidationConfigResolver.php
@@ -45,7 +45,7 @@ public function __construct(
         foreach ($validationConfigProviders as $validationConfigProvider) {
             if (!$validationConfigProvider instanceof ValidationConfigProviderInterface) {
                 throw new InputException(
-                    __('Validation config provider must implement %1.', [ConfigProviderInterface::class])
+                    __('Validation config provider must implement %1.', [ValidationConfigProviderInterface::class])
                 );
             }
         }
diff --git a/ReCaptchaUser/Observer/ForgotPasswordObserver.php b/ReCaptchaUser/Observer/ForgotPasswordObserver.php
@@ -16,9 +16,6 @@
 use Magento\ReCaptchaUi\Model\IsCaptchaEnabledInterface;
 use Magento\ReCaptchaUi\Model\RequestHandlerInterface;
 
-/**
- * ForgotPasswordObserver
- */
 class ForgotPasswordObserver implements ObserverInterface
 {
     /**
@@ -52,6 +49,8 @@ public function __construct(
     }
 
     /**
+     * Checking if captcha is enabled for user forgot password form and if so, validate the captcha
+     *
      * @param Observer $observer
      * @return void
      * @throws LocalizedException
diff --git a/ReCaptchaUser/view/adminhtml/templates/recaptcha.phtml b/ReCaptchaUser/view/adminhtml/templates/recaptcha.phtml
@@ -5,6 +5,7 @@
  */
 
 /** @var $block Magento\ReCaptchaUi\Block\ReCaptcha */
+/** @var $escaper \Magento\Framework\Escaper */
 $config = $block->getCaptchaUiConfig();
 $renderingOptions = $config['rendering'] ?? [];
 $isInvisible = !empty($config['invisible']);
@@ -68,7 +69,7 @@ $isInvisible = !empty($config['invisible']);
 
             widgetId = grecaptcha.render('admin-recaptcha', {
                 <?php foreach ($renderingOptions as $key => $value): ?>
-                    '<?= $block->escapeJs($key) ?>': '<?= $block->escapeJs($value) ?>',
+                    '<?= $escaper->escapeJs($key) ?>': '<?= $escaper->escapeJs($value) ?>',
                 <?php endforeach; ?> 'callback': function (_token) {
                     <?php if ($isInvisible): ?>
                     token = _token;
diff --git a/ReCaptchaUser/view/adminhtml/web/css/recaptcha.less b/ReCaptchaUser/view/adminhtml/web/css/recaptcha.less
@@ -9,8 +9,8 @@
     }
 
     .field-invisible-recaptcha {
-        padding-left: 30px !important;
-        margin-top: -10px;
         margin-bottom: 35px;
+        margin-top: -10px;
+        padding-left: 30px !important;
     }
 }
diff --git a/ReCaptchaValidationApi/Api/Data/ValidationConfigInterface.php b/ReCaptchaValidationApi/Api/Data/ValidationConfigInterface.php
@@ -33,6 +33,7 @@ public function getRemoteIp(): string;
      * Get validation failure message TODO
      *
      * @deprecated use TODO
+     * @see not used anymore
      * @return string
      */
     public function getValidationFailureMessage(): string;
diff --git a/TwoFactorAuth/view/adminhtml/email/app_config_required.html b/TwoFactorAuth/view/adminhtml/email/app_config_required.html
@@ -1,10 +1,8 @@
+<!--
 /**
  * Copyright 2020 Adobe
  * All Rights Reserved.
  */
-
-<!--
-
 -->
 <!--@subject {{trans "2FA configuration required for %name" name=$store_name}} @-->
 <!--@vars {
diff --git a/TwoFactorAuth/view/adminhtml/email/user_config_required.html b/TwoFactorAuth/view/adminhtml/email/user_config_required.html
@@ -1,10 +1,8 @@
+<!--
 /**
  * Copyright 2020 Adobe
  * All Rights Reserved.
  */
-
-<!--
-
 -->
 <!--@subject {{trans "2FA configuration required for %name" name=$username}} @-->
 <!--@vars {
diff --git a/TwoFactorAuth/view/adminhtml/web/template/authy/auth.html b/TwoFactorAuth/view/adminhtml/web/template/authy/auth.html
@@ -1,10 +1,8 @@
+<!--
 /**
  * Copyright 2020 Adobe
  * All Rights Reserved.
  */
-
-<!--
-
 -->
 <form autocomplete="off">
     <fieldset class="admin__fieldset">
diff --git a/TwoFactorAuth/view/adminhtml/web/template/authy/configure.html b/TwoFactorAuth/view/adminhtml/web/template/authy/configure.html
diff --git a/TwoFactorAuth/view/adminhtml/web/template/authy/configure/register.html b/TwoFactorAuth/view/adminhtml/web/template/authy/configure/register.html
diff --git a/TwoFactorAuth/view/adminhtml/web/template/authy/configure/verify.html b/TwoFactorAuth/view/adminhtml/web/template/authy/configure/verify.html
diff --git a/TwoFactorAuth/view/adminhtml/web/template/change_provider.html b/TwoFactorAuth/view/adminhtml/web/template/change_provider.html
diff --git a/TwoFactorAuth/view/adminhtml/web/template/form/element/providers.html b/TwoFactorAuth/view/adminhtml/web/template/form/element/providers.html
diff --git a/TwoFactorAuth/view/adminhtml/web/template/form/element/reset_providers.html b/TwoFactorAuth/view/adminhtml/web/template/form/element/reset_providers.html
diff --git a/TwoFactorAuth/view/adminhtml/web/template/google/auth.html b/TwoFactorAuth/view/adminhtml/web/template/google/auth.html
diff --git a/TwoFactorAuth/view/adminhtml/web/template/google/configure.html b/TwoFactorAuth/view/adminhtml/web/template/google/configure.html
diff --git a/TwoFactorAuth/view/adminhtml/web/template/u2fkey/auth.html b/TwoFactorAuth/view/adminhtml/web/template/u2fkey/auth.html
diff --git a/TwoFactorAuth/view/adminhtml/web/template/u2fkey/configure.html b/TwoFactorAuth/view/adminhtml/web/template/u2fkey/configure.html

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function __construct(SerializerInterface $serializer)`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`/**`
`36`		`- * {@inheritdoc}`
	`36`	`+ * @inheritdoc`
`37`	`37`	`*`
`38`	`38`	`* @param RequestInterface\|PlainTextRequestInterface $request`
`39`	`39`	`* @return string`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,8 @@ public function __construct(`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`/**`
	`53`	`+ * Inject reCAPTCHA in authentication popup layout`
	`54`	`+ *`
`53`	`55`	`* @param AuthenticationPopup $subject`
`54`	`56`	`* @param string $result`
`55`	`57`	`* @return string`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@`
`14`	`14`	`use Magento\Framework\Webapi\Rest\Request;`
`15`	`15`	`use Magento\Integration\Api\CustomerTokenServiceInterface;`
`16`	`16`
`17`		`-`
`18`	`17`	`/**`
`19`	`18`	`* Test class for Magento\Customer\Api\AccountManagementInterface`
`20`	`19`	`*`
`@@ -133,5 +132,4 @@ public function testPasswordReset(): void`
`133`	`132`
`134`	`133`	`$this->_webApiCall($serviceInfo, $requestData);`
`135`	`134`	`}`
`136`		`-`
`137`	`135`	`}`