Fix tests for Validate Captchas

Author: Crizz0

src/Phpbb/TranslationValidator/Validator/FileValidator.php

@@ -667,10 +667,15 @@ public function validateJsonFile($originFile)
      * Check that the reCaptcha and Turnstile key provided is allowed
      * @param $originFile
      */
-    public function validateCaptchaValues($originFile)
+    public function validateCaptchaValues($originFile, $optParams = 'incorrect')
     {
         $jsonContent = $this->openComposerJson($originFile);
 
+        if (!$optParams == '')
+        {
+            $jsonContent['extra']['recaptcha-lang'] = $optParams;
+            //$jsonContent['extra']['turnstile-lang'] = $optParams;
+        }
         // The key 'RECAPTCHA_LANG' must match the list provided by Google, or be left empty
         // Check for valid recaptcha-lang: en-GB
         if (!in_array($jsonContent['extra']['recaptcha-lang'], $this->reCaptchaLanguages))

tests/FileValidator/ValidateLangTest.php

@@ -41,10 +41,10 @@ public function testValidateLangFile($file, $expected)
 	/**
 	 * Test the reCaptcha checks
 	 */
-	public function testValidateLangReCaptcha()
+	public function testValidateLangCaptchas()
 	{
 		// Failure - as we supply a key that isn't valid
-		$reCaptchaLanguage = ['RECAPTCHA_LANG' => 'incorrect'];
+		$reCaptchaLanguage = 'incorrect';
 		$this->validator->validateCaptchaValues('', $reCaptchaLanguage);
 
 		$output = $this->output->getMessages();
@@ -54,7 +54,7 @@ public function testValidateLangReCaptcha()
 		$this->assertEquals($output[0], $expected);
 
 		// Pass - as 'en' is valid
-		$reCaptchaLanguage['RECAPTCHA_LANG'] = 'en';
+		$reCaptchaLanguage = 'en';
 		$this->validator->validateCaptchaValues('', $reCaptchaLanguage);
 
 		$this->assertEquals($this->output->getMessageCount(Output::ERROR), 1); // Shouldn't change in size as no error added