Merge pull request #133 from /issues/132

naydav · web-flow · commit 73be58953fc5 · 2020-03-22T14:56:38.000-05:00
security-package/issues/132:  $validationErrors is undefined in \Magento\ReCaptchaValidation\Model\Validator
diff --git a/ReCaptchaValidation/Model/Validator.php b/ReCaptchaValidation/Model/Validator.php
@@ -60,14 +60,13 @@ public function isValid(
         }
         $result = $reCaptcha->verify($reCaptchaResponse, $validationConfig->getRemoteIp());
 
-        if ($result->isSuccess()) {
-            $validationResult = $this->validationResultFactory->create(['errors' => []]);
-        } else {
+        $validationErrors = [];
+        if (!$result->isSuccess()) {
             foreach ($result->getErrorCodes() as $errorCode) {
                 $validationErrors[] = $this->errorMessages->getErrorMessage($errorCode);
             }
-            $validationResult = $this->validationResultFactory->create(['errors' => $validationErrors]);
         }
-        return $validationResult;
+
+        return $this->validationResultFactory->create(['errors' => $validationErrors]);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -60,14 +60,13 @@ public function isValid(`
`60`	`60`	`}`
`61`	`61`	`$result = $reCaptcha->verify($reCaptchaResponse, $validationConfig->getRemoteIp());`
`62`	`62`
`63`		`- if ($result->isSuccess()) {`
`64`		`- $validationResult = $this->validationResultFactory->create(['errors' => []]);`
`65`		`- } else {`
	`63`	`+ $validationErrors = [];`
	`64`	`+ if (!$result->isSuccess()) {`
`66`	`65`	`foreach ($result->getErrorCodes() as $errorCode) {`
`67`	`66`	`$validationErrors[] = $this->errorMessages->getErrorMessage($errorCode);`
`68`	`67`	`}`
`69`		`- $validationResult = $this->validationResultFactory->create(['errors' => $validationErrors]);`
`70`	`68`	`}`
`71`		`- return $validationResult;`
	`69`	`+`
	`70`	`+ return $this->validationResultFactory->create(['errors' => $validationErrors]);`
`72`	`71`	`}`
`73`	`72`	`}`