MC-37783: Introduce ReCaptcha coverage for checkout

Author: ogorkun

ReCaptchaCheckout/Block/LayoutProcessor/Checkout/Onepage.php

@@ -40,11 +40,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
-     *
-     * @param array $jsLayout
-     * @return array
-     * @throws InputException
+     * @inheritDoc
      */
     public function process($jsLayout)
     {

ReCaptchaCheckout/Model/WebapiConfigProvider.php

@@ -45,6 +45,7 @@ public function __construct(IsCaptchaEnabledInterface $isEnabled, ValidationConf
      */
     public function getConfigFor(EndpointInterface $endpoint): ?ValidationConfigInterface
     {
+        //phpcs:disable Magento2.PHP.LiteralNamespaces
         if ($endpoint->getServiceMethod() === 'savePaymentInformationAndPlaceOrder'
             || $endpoint->getServiceClass() === 'Magento\QuoteGraphQl\Model\Resolver\SetPaymentAndPlaceOrder'
             || $endpoint->getServiceClass() === 'Magento\QuoteGraphQl\Model\Resolver\PlaceOrder'
@@ -53,6 +54,7 @@ public function getConfigFor(EndpointInterface $endpoint): ?ValidationConfigInte
                 return $this->configResolver->get(self::CAPTCHA_ID);
             }
         }
+        //phpcs:enable Magento2.PHP.LiteralNamespaces
 
         return null;
     }

ReCaptchaWebapiApi/Model/CompositeWebapiValidationConfigProvider.php

@@ -46,4 +46,4 @@ public function getConfigFor(EndpointInterface $endpoint): ?ValidationConfigInte
 
         return null;
     }
-}
+}

ReCaptchaWebapiGraphQl/Plugin/GraphQlValidator.php

@@ -66,6 +66,8 @@ public function __construct(
      * @param ConfigElementInterface $configElement
      * @throws GraphQlInputException
      * @return void
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function beforeFormat(
         Fields $subject,

ReCaptchaWebapiGraphQl/Plugin/ValidationOverrider.php

@@ -38,6 +38,8 @@ public function __construct(UserContextInterface $userContext)
      * @param string $value
      * @param ValidationConfigInterface $config
      * @return ValidationResult
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function aroundIsValid(
         ValidatorInterface $subject,
@@ -51,4 +53,4 @@ public function aroundIsValid(
 
         return $proceed($value, $config);
     }
-}
+}

ReCaptchaWebapiGraphQl/Test/Unit/Plugin/GraphQlValidatorTest.php

@@ -96,7 +96,8 @@ public function testPlugin(bool $isMutation, bool $configFound, bool $isValid, b
             ->willReturn($this->createMock(Endpoint::class));
         //Emulating config found
         $this->configProviderMock->method('getConfigFor')
-            ->willReturnOnConsecutiveCalls(null,
+            ->willReturnOnConsecutiveCalls(
+                null,
                 $configFound ? $this->getMockForAbstractClass(ValidationConfigInterface::class) : null
             );
         //Emulating validation result

ReCaptchaWebapiGraphQl/Test/Unit/Plugin/ValidationOverriderTest.php

@@ -62,7 +62,6 @@ public function testForUsers(int $type, ?int $id, bool $executed): void
             ->willReturn($id);
 
         $this->assertEquals($executed, $this->runModel());
-
     }
 
     /**

ReCaptchaWebapiGraphQl/composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "magento/module-re-captcha-webapi-graphql",
+    "name": "magento/module-re-captcha-webapi-graph-ql",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
         "php": "~7.3.0||~7.4.0",

ReCaptchaWebapiRest/Plugin/SoapValidationPlugin.php

@@ -73,6 +73,8 @@ public function __construct(
      * @param Handler $subject
      * @param string $operation
      * @throws WebapiException
+     *
+     * @phpcs:disable PSR1.Methods.CamelCapsMethodName
      */
     public function before__call(Handler $subject, string $operation): void
     {

ReCaptchaWebapiRest/Plugin/ValidationOverrider.php

@@ -38,6 +38,8 @@ public function __construct(UserContextInterface $userContext)
      * @param string $value
      * @param ValidationConfigInterface $config
      * @return ValidationResult
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function aroundIsValid(
         ValidatorInterface $subject,
@@ -51,4 +53,4 @@ public function aroundIsValid(
 
         return $proceed($value, $config);
     }
-}
+}

ReCaptchaWebapiRest/Test/Unit/Plugin/ValidationOverriderTest.php

@@ -62,7 +62,6 @@ public function testForUsers(int $type, ?int $id, bool $executed): void
             ->willReturn($id);
 
         $this->assertEquals($executed, $this->runModel());
-
     }
 
     /**

_metapackage/composer.json

@@ -22,7 +22,7 @@
         "magento/module-re-captcha-version-3-invisible": "*",
         "magento/module-re-captcha-webapi-api": "*",
         "magento/module-re-captcha-webapi-rest": "*",
-        "magento/module-re-captcha-webapi-graphql": "*",
+        "magento/module-re-captcha-webapi-graph-ql": "*",
         "magento/module-re-captcha-webapi-ui": "*",
         "magento/module-securitytxt": "*",
         "magento/module-two-factor-auth": "*",