Merge remote-tracking branch 'commerce/develop' into platform-health

Author: xmav

ReCaptchaWebapiRest/Plugin/RestValidationPlugin.php

@@ -71,15 +71,17 @@ public function __construct(
      * Validate ReCaptcha if needed.
      *
      * @param RequestValidator $subject
+     * @param callable $proceed
      * @throws WebapiException
      * @return void
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function afterValidate(RequestValidator $subject): void
+    public function aroundValidate(RequestValidator $subject, callable $proceed): void
     {
-        $route = $this->restRouter->match($this->request);
-        /** @var Endpoint $endpoint */
+        $request = clone $this->request;
+        $proceed();
+        $route = $this->restRouter->match($request);
         $endpoint = $this->endpointFactory->create([
             'class' => $route->getServiceClass(),
             'method' => $route->getServiceMethod(),

ReCaptchaWebapiRest/Test/Unit/Plugin/RestValidationPluginTest.php

@@ -120,6 +120,10 @@ public function testPlugin(
             $this->expectException(Exception::class);
         }
 
-        $this->model->afterValidate($this->subject);
+        $proceed = function () : void {
+            //dummy function for callable argument
+        };
+
+        $this->model->aroundValidate($this->subject, $proceed);
     }
 }