Merge pull request #237 from Novactive/feat-captcha-type-parameter

feat: add a `captchetat_types_by_language` sf parameter

Author: erdnaxelaweb

components/CaptchEtatBundle/src/bundle/Resources/config/default_settings.yaml

@@ -12,3 +12,7 @@ parameters:
     captchetat_oauth_client_secret: '%env(string:CAPTCHETAT_OAUTH_CLIENT_SECRET)%'
     captchetat_api_url: '%env(string:CAPTCHETAT_API_URL)%'
     captchetat_timeout: '%env(float:CAPTCHETAT_TIMEOUT)%'
+
+    captchetat_types_by_language:
+        fr: 'numerique6_7CaptchaFR'
+        en: 'numerique6_7CaptchaEN'

components/CaptchEtatBundle/src/bundle/Resources/config/services.yaml

@@ -1,3 +1,4 @@
+
 services:
     AlmaviaCX\Bundle\CaptchEtat\Logger\CaptchEtatLogger:
         arguments:
@@ -46,6 +47,7 @@ services:
         arguments:
             $configResolver: '@Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface'
             $localeConverter: '@Ibexa\Core\MVC\Symfony\Locale\LocaleConverterInterface'
+            $typesByLanguage: '%captchetat_types_by_language%'
         tags:
             - { name: twig.extension }
 

components/CaptchEtatBundle/src/lib/Twig/CaptchEtatExtension.php

@@ -13,13 +13,16 @@ class CaptchEtatExtension extends AbstractExtension
 {
     protected ConfigResolverInterface $configResolver;
     protected LocaleConverterInterface $localeConverter;
+    protected array $typesByLanguage = [];
 
     public function __construct(
         ConfigResolverInterface $configResolver,
         LocaleConverterInterface $localeConverter,
+        array $typesByLanguage = []
     ) {
         $this->localeConverter = $localeConverter;
         $this->configResolver = $configResolver;
+        $this->typesByLanguage = $typesByLanguage;
     }
 
     public function getFunctions()
@@ -49,8 +52,6 @@ public function getType(string $lang): string
             $type = 'numerique6_7CaptchaEN';
         }
 
-        $type = empty($this->captchetatType) ? $type : $this->captchetatType;
-
-        return $type;
+        return $this->typesByLanguage[$lang] ?? $type;
     }
 }