From 46e9fa145cd789957584f0c142bad4c703bf10fe Mon Sep 17 00:00:00 2001
From: snipershady <snipershady@gmail.com>
Date: Fri, 29 Dec 2023 17:38:36 +0000
Subject: [PATCH 01/11] Update support to Symfony7

---
 .github/workflows/build.yml                   | 10 ++++++++--
 .gitignore                                    |  1 +
 composer.json                                 | 10 +++++-----
 nbproject/project.properties                  |  7 +++++++
 nbproject/project.xml                         |  9 +++++++++
 src/DependencyInjection/Configuration.php     |  4 ++--
 .../EWZRecaptchaExtension.php                 |  7 ++++++-
 .../ReCaptcha/RequestMethod/Post.php          | 14 ++++++-------
 .../ReCaptcha/RequestMethod/ProxyPost.php     | 16 +++++++--------
 .../EWZRecaptchaV2FormBuilderFactory.php      | 12 +++++------
 .../EWZRecaptchaV3FormBuilderFactory.php      | 13 ++++++------
 src/Form/Type/AbstractEWZRecaptchaType.php    |  8 ++++----
 src/Form/Type/EWZRecaptchaType.php            | 11 +++++-----
 src/Form/Type/EWZRecaptchaV3Type.php          |  5 +++--
 src/Locale/LocaleResolver.php                 |  6 +++---
 .../views/Form/ewz_recaptcha_widget.html.php  |  8 ++++----
 .../views/Form/ewz_recaptcha_widget.html.twig |  8 ++++----
 src/Validator/Constraints/IsTrue.php          |  2 +-
 src/Validator/Constraints/IsTrueValidator.php | 15 +++++++-------
 .../Constraints/IsTrueValidatorV3.php         | 20 ++++++++++---------
 20 files changed, 110 insertions(+), 76 deletions(-)
 create mode 100644 nbproject/project.properties
 create mode 100644 nbproject/project.xml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f954f79..bd0c451 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,13 +14,19 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.1, 7.2, 7.3, 7.4, 8.0, 8.1]
-        symfony: [2.8, 3.4, 4.4, 5.2, 6.0]
+        php: [7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2]
+        symfony: [2.8, 3.4, 4.4, 5.2, 6.0, 7.0]
         exclude:
           - php: 7.1
             symfony: 5.2
           - php: 8.0
             symfony: 3.4
+          - php: 8.1
+            symfony: 3.4
+          - php: 8.2
+            symfony: 3.4  
+          - php: 8.3
+            symfony: 3.4  
           - php: 7.1
             symfony: 6.0
           - php: 7.2
diff --git a/.gitignore b/.gitignore
index f57301d..f248fec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 phpunit.xml
 vendor/
 composer.lock
+/nbproject/private/
diff --git a/composer.json b/composer.json
index a45a77e..e946dc4 100644
--- a/composer.json
+++ b/composer.json
@@ -17,11 +17,11 @@
   "require": {
     "php": "^7.1 || ^8.0",
     "google/recaptcha": "^1.1",
-    "symfony/form": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0",
-    "symfony/framework-bundle": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0",
-    "symfony/security-bundle": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0",
-    "symfony/validator": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0",
-    "symfony/yaml": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0",
+    "symfony/form": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
+    "symfony/framework-bundle": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
+    "symfony/security-bundle": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
+    "symfony/validator": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
+    "symfony/yaml": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
     "twig/twig": "^1.40 || ^2.9 || ^3.0"
   },
   "require-dev": {
diff --git a/nbproject/project.properties b/nbproject/project.properties
new file mode 100644
index 0000000..cc0417d
--- /dev/null
+++ b/nbproject/project.properties
@@ -0,0 +1,7 @@
+include.path=${php.global.include.path}
+php.version=PHP_82
+source.encoding=UTF-8
+src.dir=.
+tags.asp=false
+tags.short=false
+web.root=.
diff --git a/nbproject/project.xml b/nbproject/project.xml
new file mode 100644
index 0000000..41bc723
--- /dev/null
+++ b/nbproject/project.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.php.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/php-project/1">
+            <name>EWZRecaptchaBundle</name>
+        </data>
+    </configuration>
+</project>
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index f5ecb03..e43b592 100755
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -51,7 +51,7 @@ public function getConfigTreeBuilder(): TreeBuilder
         return $treeBuilder;
     }
 
-    private function addHttpClientConfiguration(ArrayNodeDefinition $node)
+    private function addHttpClientConfiguration(ArrayNodeDefinition $node): void
     {
         $node
             ->children()
@@ -67,7 +67,7 @@ private function addHttpClientConfiguration(ArrayNodeDefinition $node)
         ;
     }
 
-    private function addServiceDefinitionConfiguration(ArrayNodeDefinition $node)
+    private function addServiceDefinitionConfiguration(ArrayNodeDefinition $node): void
     {
         $node
             ->children()
diff --git a/src/DependencyInjection/EWZRecaptchaExtension.php b/src/DependencyInjection/EWZRecaptchaExtension.php
index c1489ba..1c661ed 100755
--- a/src/DependencyInjection/EWZRecaptchaExtension.php
+++ b/src/DependencyInjection/EWZRecaptchaExtension.php
@@ -89,7 +89,12 @@ protected function registerWidget(ContainerBuilder $container, int $version = 2)
         }
     }
 
-    private function getTwigFormResources(ContainerBuilder $container)
+    /**
+     * 
+     * @param ContainerBuilder $container
+     * @return array|string|false
+     */
+    private function getTwigFormResources(ContainerBuilder $container): array|string|false
     {
         if (!$container->hasParameter('twig.form.resources')) {
             return [];
diff --git a/src/Extension/ReCaptcha/RequestMethod/Post.php b/src/Extension/ReCaptcha/RequestMethod/Post.php
index dae3aa5..f4caac9 100644
--- a/src/Extension/ReCaptcha/RequestMethod/Post.php
+++ b/src/Extension/ReCaptcha/RequestMethod/Post.php
@@ -15,17 +15,17 @@ class Post implements RequestMethod
      *
      * @var string
      */
-    private $recaptchaVerifyUrl;
+    private string $recaptchaVerifyUrl;
 
     /**
      * The timeout for the reCAPTCHA verification.
      *
      * @var int|null
      */
-    private $timeout;
+    private ?int $timeout;
 
     /** @var array */
-    private $cache;
+    private array $cache;
 
     /**
      * Constructor.
@@ -59,8 +59,8 @@ public function submit(RequestParameters $params): string
          * Using "CN_name" will still work, but it will raise deprecated errors.
          */
         $peer_key = version_compare(PHP_VERSION, '5.6.0', '<') ? 'CN_name' : 'peer_name';
-        $options = array(
-            'http' => array(
+        $options = [
+            'http' => [
                 'header' => "Content-type: application/x-www-form-urlencoded\r\n",
                 'method' => 'POST',
                 'content' => $params->toQueryString(),
@@ -68,8 +68,8 @@ public function submit(RequestParameters $params): string
                 'verify_peer' => true,
                 // Force the peer validation to use www.google.com
                 $peer_key => 'www.google.com',
-            ),
-        );
+                ],
+            ];
         if (null !== $this->timeout) {
             $options['http']['timeout'] = $this->timeout;
         }
diff --git a/src/Extension/ReCaptcha/RequestMethod/ProxyPost.php b/src/Extension/ReCaptcha/RequestMethod/ProxyPost.php
index 2017baa..fb1cae8 100644
--- a/src/Extension/ReCaptcha/RequestMethod/ProxyPost.php
+++ b/src/Extension/ReCaptcha/RequestMethod/ProxyPost.php
@@ -15,24 +15,24 @@ class ProxyPost implements RequestMethod
      *
      * @var array
      */
-    private $httpProxy;
+    private array $httpProxy;
 
     /**
      * The reCAPTCHA verify server URL.
      *
      * @var string
      */
-    private $recaptchaVerifyUrl;
+    private string $recaptchaVerifyUrl;
 
     /**
      * The timeout for the reCAPTCHA verification.
      *
      * @var int|null
      */
-    private $timeout;
+    private ?int $timeout;
 
     /** @var array */
-    private $cache;
+    private array $cache;
 
     /**
      * Constructor.
@@ -72,8 +72,8 @@ public function submit(RequestParameters $params): string
          * Using "CN_name" will still work, but it will raise deprecated errors.
          */
         $peerKey = version_compare(PHP_VERSION, '5.6.0', '<') ? 'CN_name' : 'peer_name';
-        $options = array(
-            'http' => array(
+        $options = [
+            'http' => [
                 'header' => sprintf("Content-type: application/x-www-form-urlencoded\r\n%s", $proxyAuth),
                 'method' => 'POST',
                 'content' => $params->toQueryString(),
@@ -85,8 +85,8 @@ public function submit(RequestParameters $params): string
                 'proxy' => sprintf('tcp://%s:%s', $this->httpProxy['host'], $this->httpProxy['port']),
                 // While this is a non-standard request format, some proxy servers require it.
                 'request_fulluri' => true,
-            ),
-        );
+                ],
+            ];
         if (null !== $this->timeout) {
             $options['http']['timeout'] = $this->timeout;
         }
diff --git a/src/Factory/EWZRecaptchaV2FormBuilderFactory.php b/src/Factory/EWZRecaptchaV2FormBuilderFactory.php
index 1ba210e..5a56a5b 100755
--- a/src/Factory/EWZRecaptchaV2FormBuilderFactory.php
+++ b/src/Factory/EWZRecaptchaV2FormBuilderFactory.php
@@ -8,20 +8,20 @@
 
 class EWZRecaptchaV2FormBuilderFactory
 {
-    private $builder;
+    private FormFactoryInterface $builder;
 
     public function __construct(FormFactoryInterface $builder)
     {
         $this->builder = $builder;
     }
 
-    public function get(array $options = array())
+    public function get(array $options = array()) :FormBuilderInterface
     {
-        $constraint = array(
-            'constraints' => array(
+        $constraint = [
+            'constraints' => [
                 new IsTrue(),
-            ),
-        );
+                ],
+            ];
 
         return $this->builder->createBuilder(EWZRecaptchaType::class, null, array_merge($options, $constraint));
     }
diff --git a/src/Factory/EWZRecaptchaV3FormBuilderFactory.php b/src/Factory/EWZRecaptchaV3FormBuilderFactory.php
index 890de8e..394301b 100755
--- a/src/Factory/EWZRecaptchaV3FormBuilderFactory.php
+++ b/src/Factory/EWZRecaptchaV3FormBuilderFactory.php
@@ -5,23 +5,24 @@
 use EWZ\Bundle\RecaptchaBundle\Form\Type\EWZRecaptchaV3Type;
 use EWZ\Bundle\RecaptchaBundle\Validator\Constraints\IsTrueV3;
 use Symfony\Component\Form\FormFactoryInterface;
+use Symfony\Component\Form\FormBuilderInterface;
 
 class EWZRecaptchaV3FormBuilderFactory
 {
-    private $builder;
+    private FormFactoryInterface $builder;
 
     public function __construct(FormFactoryInterface $builder)
     {
         $this->builder = $builder;
     }
 
-    public function get(array $options = array())
+    public function get(array $options = array()) :FormBuilderInterface
     {
-        $constraint = array(
-            'constraints' => array(
+        $constraint = [
+            'constraints' => [
                 new IsTrueV3(),
-            ),
-        );
+                ],
+            ];
 
         return $this->builder->createBuilder(EWZRecaptchaV3Type::class, null, array_merge($options, $constraint));
     }
diff --git a/src/Form/Type/AbstractEWZRecaptchaType.php b/src/Form/Type/AbstractEWZRecaptchaType.php
index c0ef48e..de47403 100755
--- a/src/Form/Type/AbstractEWZRecaptchaType.php
+++ b/src/Form/Type/AbstractEWZRecaptchaType.php
@@ -13,28 +13,28 @@ abstract class AbstractEWZRecaptchaType extends AbstractType
      *
      * @var string
      */
-    protected $publicKey;
+    protected string $publicKey;
 
     /**
      * Enable recaptcha?
      *
      * @var bool
      */
-    protected $enabled;
+    protected bool $enabled;
 
     /**
      * The API server host name.
      *
      * @var string
      */
-    protected $apiHost;
+    protected string $apiHost;
 
     /**
      * The reCAPTCHA server URL.
      *
      * @var string
      */
-    protected $recaptchaApiServer;
+    protected string $recaptchaApiServer;
 
     /**
      * @param string $publicKey Recaptcha public key
diff --git a/src/Form/Type/EWZRecaptchaType.php b/src/Form/Type/EWZRecaptchaType.php
index b5672d8..90a80fe 100755
--- a/src/Form/Type/EWZRecaptchaType.php
+++ b/src/Form/Type/EWZRecaptchaType.php
@@ -18,10 +18,10 @@ class EWZRecaptchaType extends AbstractEWZRecaptchaType
      *
      * @var bool
      */
-    protected $ajax;
+    protected bool $ajax;
 
     /** @var LocaleResolver */
-    protected $localeResolver;
+    protected LocaleResolver $localeResolver;
 
     /**
      * @param string         $publicKey      Recaptcha public key
@@ -42,7 +42,8 @@ public function __construct(string $publicKey, bool $enabled, bool $ajax, Locale
      */
     public function configureOptions(OptionsResolver $resolver): void
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults(
+            [
             'compound' => false,
             'language' => $this->localeResolver->resolve(),
             'public_key' => null,
@@ -61,7 +62,7 @@ public function configureOptions(OptionsResolver $resolver): void
                     'badge' => null,
                 ),
             ),
-        ));
+    ]);
     }
 
     /**
@@ -79,7 +80,7 @@ public function getParent(): string
      *
      * @return string The javascript source URL
      */
-    public function getScriptURL($key)
+    public function getScriptURL(string $key): ?string
     {
         return isset($this->scripts[$key]) ? $this->scripts[$key] : null;
     }
diff --git a/src/Form/Type/EWZRecaptchaV3Type.php b/src/Form/Type/EWZRecaptchaV3Type.php
index 989a728..5e9ac4e 100755
--- a/src/Form/Type/EWZRecaptchaV3Type.php
+++ b/src/Form/Type/EWZRecaptchaV3Type.php
@@ -12,7 +12,7 @@ class EWZRecaptchaV3Type extends AbstractEWZRecaptchaType
     public const DEFAULT_ACTION_NAME = 'form';
 
     /** @var bool */
-    private $hideBadge;
+    private bool $hideBadge;
 
     /**
      * EWZRecaptchaV3Type constructor.
@@ -47,7 +47,8 @@ public function configureOptions(OptionsResolver $resolver): void
     }
 
     /**
-     * {@inheritdoc}
+     * 
+     * @return string
      */
     public function getParent(): string
     {
diff --git a/src/Locale/LocaleResolver.php b/src/Locale/LocaleResolver.php
index ede7097..b717458 100644
--- a/src/Locale/LocaleResolver.php
+++ b/src/Locale/LocaleResolver.php
@@ -10,13 +10,13 @@
 final class LocaleResolver
 {
     /** @var string */
-    private $defaultLocale;
+    private string $defaultLocale;
 
     /** @var bool */
-    private $useLocaleFromRequest;
+    private bool $useLocaleFromRequest;
 
     /** @var RequestStack */
-    private $requestStack;
+    private RequestStack $requestStack;
 
     /**
      * @param string       $defaultLocale
diff --git a/src/Resources/views/Form/ewz_recaptcha_widget.html.php b/src/Resources/views/Form/ewz_recaptcha_widget.html.php
index 6c6eff3..dec5c4a 100644
--- a/src/Resources/views/Form/ewz_recaptcha_widget.html.php
+++ b/src/Resources/views/Form/ewz_recaptcha_widget.html.php
@@ -5,19 +5,19 @@
 
             <script>
                 var onReCaptchaSuccess = function() {
-                    var errorDivs = document.getElementsByClassName('recaptcha-error');
+                    const errorDivs = document.getElementsByClassName('recaptcha-error');
                     if (errorDivs.length) {
                         errorDivs[0].className = '';
                     }
 
-                    var errorMsgs = document.getElementsByClassName('recaptcha-error-message');
+                    const errorMsgs = document.getElementsByClassName('recaptcha-error-message');
                     if (errorMsgs.length) {
                         errorMsgs[0].parentNode.removeChild(errorMsgs[0]);
                     }
 
-                    var forms = document.getElementsByClassName('recaptcha-form');
+                    const forms = document.getElementsByClassName('recaptcha-form');
                     if (forms.length) {
-                        var recaptchaSubmitEvent = document.createEvent('Event');
+                        let recaptchaSubmitEvent = document.createEvent('Event');
                         recaptchaSubmitEvent.initEvent('submit', true, true);
                         forms[0].addEventListener('submit', function (e) {
                             e.target.submit();
diff --git a/src/Resources/views/Form/ewz_recaptcha_widget.html.twig b/src/Resources/views/Form/ewz_recaptcha_widget.html.twig
index b0dbd8d..788eaa0 100644
--- a/src/Resources/views/Form/ewz_recaptcha_widget.html.twig
+++ b/src/Resources/views/Form/ewz_recaptcha_widget.html.twig
@@ -8,19 +8,19 @@
 
         <script>
           var onReCaptchaSuccess = function() {
-            var errorDivs = document.getElementsByClassName('recaptcha-error');
+            const errorDivs = document.getElementsByClassName('recaptcha-error');
             if (errorDivs.length) {
               errorDivs[0].className = '';
             }
 
-            var errorMsgs = document.getElementsByClassName('recaptcha-error-message');
+            const errorMsgs = document.getElementsByClassName('recaptcha-error-message');
             if (errorMsgs.length) {
               errorMsgs[0].parentNode.removeChild(errorMsgs[0]);
             }
 
-            var forms = document.getElementsByClassName('recaptcha-form');
+            const forms = document.getElementsByClassName('recaptcha-form');
             if (forms.length) {
-              var recaptchaSubmitEvent = document.createEvent('Event');
+              let recaptchaSubmitEvent = document.createEvent('Event');
               recaptchaSubmitEvent.initEvent('submit', true, true);
               forms[0].addEventListener('submit', function (e) {
               e.target.submit();
diff --git a/src/Validator/Constraints/IsTrue.php b/src/Validator/Constraints/IsTrue.php
index 1e0d0f4..bf65221 100644
--- a/src/Validator/Constraints/IsTrue.php
+++ b/src/Validator/Constraints/IsTrue.php
@@ -26,7 +26,7 @@ public function __construct(array $options = null, string $message = null, strin
     /**
      * @return string|string[]
      */
-    public function getTargets()
+    public function getTargets(): array|string
     {
         return Constraint::PROPERTY_CONSTRAINT;
     }
diff --git a/src/Validator/Constraints/IsTrueValidator.php b/src/Validator/Constraints/IsTrueValidator.php
index 963329a..fe60ba2 100755
--- a/src/Validator/Constraints/IsTrueValidator.php
+++ b/src/Validator/Constraints/IsTrueValidator.php
@@ -8,6 +8,7 @@
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
+use function is_callable;
 
 class IsTrueValidator extends ConstraintValidator
 {
@@ -16,42 +17,42 @@ class IsTrueValidator extends ConstraintValidator
      *
      * @var bool
      */
-    protected $enabled;
+    protected bool $enabled;
 
     /**
      * Recaptcha.
      *
      * @var ReCaptcha
      */
-    protected $recaptcha;
+    protected ReCaptcha $recaptcha;
 
     /**
      * Request Stack.
      *
      * @var RequestStack
      */
-    protected $requestStack;
+    protected RequestStack $requestStack;
 
     /**
      * Enable serverside host check.
      *
      * @var bool
      */
-    protected $verifyHost;
+    protected bool $verifyHost;
 
     /**
      * Authorization Checker.
      *
      * @var AuthorizationChecker
      */
-    protected $authorizationChecker;
+    protected AuthorizationChecker $authorizationChecker;
 
     /**
      * Trusted Roles.
      *
      * @var array
      */
-    protected $trustedRoles;
+    protected array $trustedRoles;
 
     /**
      * @param bool                               $enabled
@@ -94,7 +95,7 @@ public function validate($value, Constraint $constraint): void
             return;
         }
 
-        if (\is_callable([$this->requestStack, 'getMainRequest'])) {
+        if (is_callable([$this->requestStack, 'getMainRequest'])) {
             $request = $this->requestStack->getMainRequest();   // symfony 5.3+
         } else {
             $request = $this->requestStack->getMasterRequest();
diff --git a/src/Validator/Constraints/IsTrueValidatorV3.php b/src/Validator/Constraints/IsTrueValidatorV3.php
index 64d29c4..bf5bd10 100755
--- a/src/Validator/Constraints/IsTrueValidatorV3.php
+++ b/src/Validator/Constraints/IsTrueValidatorV3.php
@@ -10,33 +10,35 @@
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use Throwable;
+use function is_string;
 
 class IsTrueValidatorV3 extends ConstraintValidator
 {
     /** @var bool */
-    private $enabled;
+    private bool $enabled;
 
     /** @var string */
-    private $secretKey;
+    private string $secretKey;
 
     /** @var float */
-    private $scoreThreshold;
+    private float $scoreThreshold;
     
     /** @var ReCaptcha */
-    private $reCaptcha;
+    private ReCaptcha $reCaptcha;
 
     /** @var RequestStack */
-    private $requestStack;
+    private RequestStack $requestStack;
 
     /** @var LoggerInterface */
-    private $logger;
+    private LoggerInterface $logger;
 
     /**
      * ContainsRecaptchaValidator constructor.
      *
      * @param bool            $enabled
      * @param float           $scoreThreshold
-     * @param ReCaptcha       $scoreThreshold
+     * @param ReCaptcha       $reCaptcha
      * @param RequestStack    $requestStack
      * @param LoggerInterface $logger
      */
@@ -58,7 +60,7 @@ public function __construct(
      * @param mixed      $value
      * @param Constraint $constraint
      */
-    public function validate($value, Constraint $constraint): void
+    public function validate(mixed $value, Constraint $constraint): void
     {
         if (!$this->enabled) {
             return;
@@ -100,7 +102,7 @@ private function isTokenValid(string $token): bool
                 ->verify($token, $remoteIp);
 
             return $response->isSuccess();
-        } catch (\Throwable $exception) {
+        } catch (Throwable $exception) {
             $this->logger->error(
                 'reCAPTCHA validator error: '.$exception->getMessage(),
                 [

From 3c14fc6f00eebdae6c2a266a4b5b0e490c281fa4 Mon Sep 17 00:00:00 2001
From: snipershady <snipershady@gmail.com>
Date: Fri, 29 Dec 2023 17:44:54 +0000
Subject: [PATCH 02/11] Composer file updated

---
 composer.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index e946dc4..ca96694 100644
--- a/composer.json
+++ b/composer.json
@@ -1,17 +1,17 @@
 {
-  "name": "excelwebzone/recaptcha-bundle",
-  "description": "This bundle provides easy reCAPTCHA form field integration",
+  "name": "snipershady/recaptcha-bundle",
+  "description": "This bundle provides easy reCAPTCHA form field integration. This is a fork of excelwebzone/EWZRecaptchaBundle but updated to symfony 7.0 requirementss",
   "keywords": [
     "recaptcha"
   ],
-  "homepage": "https://github.com/excelwebzone/EWZRecaptchaBundle",
+  "homepage": "https://github.com/snipershady/EWZRecaptchaBundle",
   "type": "symfony-bundle",
   "license": "MIT",
   "authors": [
     {
-      "name": "Michael H. Arieli",
-      "email": "excelwebzone@gmail.com",
-      "homepage": "http://excelwebzone.com/"
+      "name": "Stefano Perrini",
+      "email": "snipershady@gmail.com",
+      "homepage": "https://www.spinfo.it"
     }
   ],
   "require": {

From fc471cb827fe85e490ba3e34e1a92aa2256c9a10 Mon Sep 17 00:00:00 2001
From: snipershady <snipershady@gmail.com>
Date: Fri, 29 Dec 2023 18:04:25 +0000
Subject: [PATCH 03/11] Readme

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index f3db8dc..2acb966 100755
--- a/README.md
+++ b/README.md
@@ -4,6 +4,10 @@ EWZRecaptchaBundle
 [![Actions Status](https://github.com/excelwebzone/EWZRecaptchaBundle/workflows/CI/badge.svg)](https://github.com/excelwebzone/EWZRecaptchaBundle/actions)
 
 This bundle provides easy reCAPTCHA form field for Symfony.
+This is a fork of excelwebzone/EWZRecaptchaBundle compliant with Symfony 7.0 requirements.
+
+## Changelog
+29-12-2023: This fork fix some minor bugs of the original bundle.
 
 ## Installation
 

From 7d77548d02ae97af95f461e1463fda82c2030655 Mon Sep 17 00:00:00 2001
From: snipershady <snipershady@gmail.com>
Date: Fri, 29 Dec 2023 18:09:22 +0000
Subject: [PATCH 04/11] Update to Symfony 7.0 requirements

---
 composer.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/composer.json b/composer.json
index ca96694..e0d5cef 100644
--- a/composer.json
+++ b/composer.json
@@ -1,27 +1,27 @@
 {
-  "name": "snipershady/recaptcha-bundle",
-  "description": "This bundle provides easy reCAPTCHA form field integration. This is a fork of excelwebzone/EWZRecaptchaBundle but updated to symfony 7.0 requirementss",
+  "name": "excelwebzone/recaptcha-bundle",
+  "description": "This bundle provides easy reCAPTCHA form field integration",
   "keywords": [
     "recaptcha"
   ],
-  "homepage": "https://github.com/snipershady/EWZRecaptchaBundle",
+  "homepage": "https://github.com/excelwebzone/EWZRecaptchaBundle",
   "type": "symfony-bundle",
   "license": "MIT",
   "authors": [
     {
-      "name": "Stefano Perrini",
-      "email": "snipershady@gmail.com",
-      "homepage": "https://www.spinfo.it"
+      "name": "Michael H. Arieli",
+      "email": "excelwebzone@gmail.com",
+      "homepage": "http://excelwebzone.com/"
     }
   ],
   "require": {
     "php": "^7.1 || ^8.0",
     "google/recaptcha": "^1.1",
-    "symfony/form": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
-    "symfony/framework-bundle": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
-    "symfony/security-bundle": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
-    "symfony/validator": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
-    "symfony/yaml": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
+    "symfony/form": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0",
+    "symfony/framework-bundle": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0",
+    "symfony/security-bundle": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0",
+    "symfony/validator": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0",
+    "symfony/yaml": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0",
     "twig/twig": "^1.40 || ^2.9 || ^3.0"
   },
   "require-dev": {
@@ -42,4 +42,4 @@
       "allow-contrib": "true"
     }
   }
-}
+}
\ No newline at end of file

From 910e3818ccb38899bd9488041870d5526ccd359e Mon Sep 17 00:00:00 2001
From: snipershady <snipershady@gmail.com>
Date: Fri, 29 Dec 2023 18:12:09 +0000
Subject: [PATCH 05/11] Update Ignorelist

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index f248fec..15bdca2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,4 @@
 phpunit.xml
 vendor/
 composer.lock
-/nbproject/private/
+/nbproject/

From b506d332194fc5ed2cdf8e1da731a85e223a7730 Mon Sep 17 00:00:00 2001
From: snipershady <snipershady@gmail.com>
Date: Fri, 29 Dec 2023 18:12:29 +0000
Subject: [PATCH 06/11] Changelog on readme

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2acb966..ecaf60f 100755
--- a/README.md
+++ b/README.md
@@ -7,7 +7,8 @@ This bundle provides easy reCAPTCHA form field for Symfony.
 This is a fork of excelwebzone/EWZRecaptchaBundle compliant with Symfony 7.0 requirements.
 
 ## Changelog
-29-12-2023: This fork fix some minor bugs of the original bundle.
+29-12-2023: updated compatibilty with symfony 7.0
+29-12-2023: fix some minor bugs.
 
 ## Installation
 

From 5e182f327d25fc6dc0cd96301941ac5b0970d75f Mon Sep 17 00:00:00 2001
From: snipershady <snipershady@gmail.com>
Date: Fri, 29 Dec 2023 18:12:57 +0000
Subject: [PATCH 07/11] Fix useless files

---
 nbproject/project.properties | 7 -------
 nbproject/project.xml        | 9 ---------
 2 files changed, 16 deletions(-)
 delete mode 100644 nbproject/project.properties
 delete mode 100644 nbproject/project.xml

diff --git a/nbproject/project.properties b/nbproject/project.properties
deleted file mode 100644
index cc0417d..0000000
--- a/nbproject/project.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-include.path=${php.global.include.path}
-php.version=PHP_82
-source.encoding=UTF-8
-src.dir=.
-tags.asp=false
-tags.short=false
-web.root=.
diff --git a/nbproject/project.xml b/nbproject/project.xml
deleted file mode 100644
index 41bc723..0000000
--- a/nbproject/project.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.php.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/php-project/1">
-            <name>EWZRecaptchaBundle</name>
-        </data>
-    </configuration>
-</project>

From feed3f2bc4a6cd4cb163253ed4c0319d0664c6c8 Mon Sep 17 00:00:00 2001
From: snipershady <snipershady@gmail.com>
Date: Fri, 29 Dec 2023 18:34:25 +0000
Subject: [PATCH 08/11] Fix type

---
 src/Validator/Constraints/IsTrueValidator.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Validator/Constraints/IsTrueValidator.php b/src/Validator/Constraints/IsTrueValidator.php
index fe60ba2..ce06bcf 100755
--- a/src/Validator/Constraints/IsTrueValidator.php
+++ b/src/Validator/Constraints/IsTrueValidator.php
@@ -41,11 +41,10 @@ class IsTrueValidator extends ConstraintValidator
     protected bool $verifyHost;
 
     /**
-     * Authorization Checker.
-     *
-     * @var AuthorizationChecker
+     * 
+     * @var AuthorizationChecker|null
      */
-    protected AuthorizationChecker $authorizationChecker;
+    protected ?AuthorizationCheckerInterface $authorizationChecker;
 
     /**
      * Trusted Roles.

From 957f6c6a5714a8e5dff2abb8bded4ec11eabc22a Mon Sep 17 00:00:00 2001
From: snipershady <snipershady@gmail.com>
Date: Fri, 29 Dec 2023 18:48:06 +0000
Subject: [PATCH 09/11] Removed all class attributes due for legacy
 compatibility

---
 src/Extension/ReCaptcha/RequestMethod/Post.php      |  6 +++---
 src/Extension/ReCaptcha/RequestMethod/ProxyPost.php |  8 ++++----
 src/Form/Type/EWZRecaptchaType.php                  |  7 ++++---
 src/Form/Type/EWZRecaptchaV3Type.php                |  2 +-
 src/Locale/LocaleResolver.php                       |  6 +++---
 src/Validator/Constraints/IsTrue.php                |  3 ++-
 src/Validator/Constraints/IsTrueV3.php              |  4 +++-
 src/Validator/Constraints/IsTrueValidator.php       |  8 ++++----
 src/Validator/Constraints/IsTrueValidatorV3.php     | 12 ++++++------
 9 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/src/Extension/ReCaptcha/RequestMethod/Post.php b/src/Extension/ReCaptcha/RequestMethod/Post.php
index f4caac9..521741b 100644
--- a/src/Extension/ReCaptcha/RequestMethod/Post.php
+++ b/src/Extension/ReCaptcha/RequestMethod/Post.php
@@ -15,17 +15,17 @@ class Post implements RequestMethod
      *
      * @var string
      */
-    private string $recaptchaVerifyUrl;
+    private $recaptchaVerifyUrl;
 
     /**
      * The timeout for the reCAPTCHA verification.
      *
      * @var int|null
      */
-    private ?int $timeout;
+    private $timeout;
 
     /** @var array */
-    private array $cache;
+    private $cache;
 
     /**
      * Constructor.
diff --git a/src/Extension/ReCaptcha/RequestMethod/ProxyPost.php b/src/Extension/ReCaptcha/RequestMethod/ProxyPost.php
index fb1cae8..4afdbf4 100644
--- a/src/Extension/ReCaptcha/RequestMethod/ProxyPost.php
+++ b/src/Extension/ReCaptcha/RequestMethod/ProxyPost.php
@@ -15,24 +15,24 @@ class ProxyPost implements RequestMethod
      *
      * @var array
      */
-    private array $httpProxy;
+    private $httpProxy;
 
     /**
      * The reCAPTCHA verify server URL.
      *
      * @var string
      */
-    private string $recaptchaVerifyUrl;
+    private $recaptchaVerifyUrl;
 
     /**
      * The timeout for the reCAPTCHA verification.
      *
      * @var int|null
      */
-    private ?int $timeout;
+    private $timeout;
 
     /** @var array */
-    private array $cache;
+    private $cache;
 
     /**
      * Constructor.
diff --git a/src/Form/Type/EWZRecaptchaType.php b/src/Form/Type/EWZRecaptchaType.php
index 90a80fe..d997270 100755
--- a/src/Form/Type/EWZRecaptchaType.php
+++ b/src/Form/Type/EWZRecaptchaType.php
@@ -18,10 +18,10 @@ class EWZRecaptchaType extends AbstractEWZRecaptchaType
      *
      * @var bool
      */
-    protected bool $ajax;
+    protected $ajax;
 
     /** @var LocaleResolver */
-    protected LocaleResolver $localeResolver;
+    protected $localeResolver;
 
     /**
      * @param string         $publicKey      Recaptcha public key
@@ -66,7 +66,8 @@ public function configureOptions(OptionsResolver $resolver): void
     }
 
     /**
-     * {@inheritdoc}
+     * 
+     * @return string
      */
     public function getParent(): string
     {
diff --git a/src/Form/Type/EWZRecaptchaV3Type.php b/src/Form/Type/EWZRecaptchaV3Type.php
index 5e9ac4e..fc0107d 100755
--- a/src/Form/Type/EWZRecaptchaV3Type.php
+++ b/src/Form/Type/EWZRecaptchaV3Type.php
@@ -12,7 +12,7 @@ class EWZRecaptchaV3Type extends AbstractEWZRecaptchaType
     public const DEFAULT_ACTION_NAME = 'form';
 
     /** @var bool */
-    private bool $hideBadge;
+    private $hideBadge;
 
     /**
      * EWZRecaptchaV3Type constructor.
diff --git a/src/Locale/LocaleResolver.php b/src/Locale/LocaleResolver.php
index b717458..ede7097 100644
--- a/src/Locale/LocaleResolver.php
+++ b/src/Locale/LocaleResolver.php
@@ -10,13 +10,13 @@
 final class LocaleResolver
 {
     /** @var string */
-    private string $defaultLocale;
+    private $defaultLocale;
 
     /** @var bool */
-    private bool $useLocaleFromRequest;
+    private $useLocaleFromRequest;
 
     /** @var RequestStack */
-    private RequestStack $requestStack;
+    private $requestStack;
 
     /**
      * @param string       $defaultLocale
diff --git a/src/Validator/Constraints/IsTrue.php b/src/Validator/Constraints/IsTrue.php
index bf65221..2a4cb76 100644
--- a/src/Validator/Constraints/IsTrue.php
+++ b/src/Validator/Constraints/IsTrue.php
@@ -2,13 +2,14 @@
 
 namespace EWZ\Bundle\RecaptchaBundle\Validator\Constraints;
 
+use Attribute;
 use Symfony\Component\Validator\Constraint;
 
 /**
  * @Annotation
  * @Target("PROPERTY")
  */
-#[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::IS_REPEATABLE)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::IS_REPEATABLE)]
 class IsTrue extends Constraint
 {
     public $message = 'This value is not a valid captcha.';
diff --git a/src/Validator/Constraints/IsTrueV3.php b/src/Validator/Constraints/IsTrueV3.php
index 5620538..cf17904 100755
--- a/src/Validator/Constraints/IsTrueV3.php
+++ b/src/Validator/Constraints/IsTrueV3.php
@@ -2,11 +2,13 @@
 
 namespace EWZ\Bundle\RecaptchaBundle\Validator\Constraints;
 
+use Attribute;
+
 /**
  * @Annotation
  * @Target("PROPERTY")
  */
-#[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::IS_REPEATABLE)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::IS_REPEATABLE)]
 class IsTrueV3 extends IsTrue
 {
     /**
diff --git a/src/Validator/Constraints/IsTrueValidator.php b/src/Validator/Constraints/IsTrueValidator.php
index ce06bcf..e8b4476 100755
--- a/src/Validator/Constraints/IsTrueValidator.php
+++ b/src/Validator/Constraints/IsTrueValidator.php
@@ -24,14 +24,14 @@ class IsTrueValidator extends ConstraintValidator
      *
      * @var ReCaptcha
      */
-    protected ReCaptcha $recaptcha;
+    protected $recaptcha;
 
     /**
      * Request Stack.
      *
      * @var RequestStack
      */
-    protected RequestStack $requestStack;
+    protected $requestStack;
 
     /**
      * Enable serverside host check.
@@ -44,14 +44,14 @@ class IsTrueValidator extends ConstraintValidator
      * 
      * @var AuthorizationChecker|null
      */
-    protected ?AuthorizationCheckerInterface $authorizationChecker;
+    protected $authorizationChecker;
 
     /**
      * Trusted Roles.
      *
      * @var array
      */
-    protected array $trustedRoles;
+    protected $trustedRoles;
 
     /**
      * @param bool                               $enabled
diff --git a/src/Validator/Constraints/IsTrueValidatorV3.php b/src/Validator/Constraints/IsTrueValidatorV3.php
index bf5bd10..f531fa0 100755
--- a/src/Validator/Constraints/IsTrueValidatorV3.php
+++ b/src/Validator/Constraints/IsTrueValidatorV3.php
@@ -16,22 +16,22 @@
 class IsTrueValidatorV3 extends ConstraintValidator
 {
     /** @var bool */
-    private bool $enabled;
+    private $enabled;
 
     /** @var string */
-    private string $secretKey;
+    private $secretKey;
 
     /** @var float */
-    private float $scoreThreshold;
+    private $scoreThreshold;
     
     /** @var ReCaptcha */
-    private ReCaptcha $reCaptcha;
+    private $reCaptcha;
 
     /** @var RequestStack */
-    private RequestStack $requestStack;
+    private $requestStack;
 
     /** @var LoggerInterface */
-    private LoggerInterface $logger;
+    private $logger;
 
     /**
      * ContainsRecaptchaValidator constructor.

From 59a9b875877a13bc7d9d9edb719cbe43d1a9be6c Mon Sep 17 00:00:00 2001
From: snipershady <snipershady@gmail.com>
Date: Fri, 29 Dec 2023 19:01:20 +0000
Subject: [PATCH 10/11] Updated build for CI

---
 .github/workflows/build.yml | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bd0c451..1229efd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,22 +19,34 @@ jobs:
         exclude:
           - php: 7.1
             symfony: 5.2
-          - php: 8.0
-            symfony: 3.4
-          - php: 8.1
-            symfony: 3.4
-          - php: 8.2
-            symfony: 3.4  
-          - php: 8.3
-            symfony: 3.4  
           - php: 7.1
             symfony: 6.0
+          - php: 7.1
+            symfony: 7.0
           - php: 7.2
             symfony: 6.0
+          - php: 7.2
+            symfony: 7.0
           - php: 7.3
             symfony: 6.0
+          - php: 7.3
+            symfony: 7.0
           - php: 7.4
             symfony: 6.0
+          - php: 7.4
+            symfony: 7.0
+          - php: 8.0
+            symfony: 3.4
+          - php: 8.0
+            symfony: 7.0
+          - php: 8.1
+            symfony: 3.4
+          - php: 8.1
+            symfony: 7.0
+          - php: 8.2
+            symfony: 3.4  
+          - php: 8.3
+            symfony: 3.4    
     steps:
       - name: Checkout
         uses: actions/checkout@v2

From c75f4ce0d6a60c4a7fbd24b98f63eb245679bbda Mon Sep 17 00:00:00 2001
From: snipershady <snipershady@gmail.com>
Date: Sat, 30 Dec 2023 09:40:14 +0000
Subject: [PATCH 11/11] Fix for legacy compatibility

---
 src/DependencyInjection/EWZRecaptchaExtension.php |  2 +-
 src/Factory/EWZRecaptchaV3FormBuilderFactory.php  |  2 +-
 src/Form/Type/EWZRecaptchaType.php                | 12 ++++++------
 src/Validator/Constraints/IsTrueValidator.php     |  2 +-
 src/Validator/Constraints/IsTrueValidatorV3.php   |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/DependencyInjection/EWZRecaptchaExtension.php b/src/DependencyInjection/EWZRecaptchaExtension.php
index 1c661ed..9d5919a 100755
--- a/src/DependencyInjection/EWZRecaptchaExtension.php
+++ b/src/DependencyInjection/EWZRecaptchaExtension.php
@@ -67,7 +67,7 @@ protected function registerWidget(ContainerBuilder $container, int $version = 2)
             ? $container->getParameter('templating.engines')
             : array('twig');
 
-        if (in_array('php', $templatingEngines, true)) {
+        if (is_array($templatingEngines) && in_array('php', $templatingEngines, true)) {
             $formResource = 'EWZRecaptchaBundle:Form';
 
             $container->setParameter('templating.helper.form.resources', array_merge(
diff --git a/src/Factory/EWZRecaptchaV3FormBuilderFactory.php b/src/Factory/EWZRecaptchaV3FormBuilderFactory.php
index 394301b..f5c6d2e 100755
--- a/src/Factory/EWZRecaptchaV3FormBuilderFactory.php
+++ b/src/Factory/EWZRecaptchaV3FormBuilderFactory.php
@@ -16,7 +16,7 @@ public function __construct(FormFactoryInterface $builder)
         $this->builder = $builder;
     }
 
-    public function get(array $options = array()) :FormBuilderInterface
+    public function get(array $options = []) :FormBuilderInterface
     {
         $constraint = [
             'constraints' => [
diff --git a/src/Form/Type/EWZRecaptchaType.php b/src/Form/Type/EWZRecaptchaType.php
index d997270..058a5c1 100755
--- a/src/Form/Type/EWZRecaptchaType.php
+++ b/src/Form/Type/EWZRecaptchaType.php
@@ -91,22 +91,22 @@ public function getScriptURL(string $key): ?string
      */
     protected function addCustomVars(FormView $view, FormInterface $form, array $options): void
     {
-        $view->vars = array_replace($view->vars, array(
+        $view->vars = array_replace($view->vars, [
             'ewz_recaptcha_ajax' => $this->ajax,
-        ));
+    ]);
 
         if (!isset($options['language'])) {
             $options['language'] = $this->localeResolver->resolve();
         }
 
         if (!$this->ajax) {
-            $view->vars = array_replace($view->vars, array(
+            $view->vars = array_replace($view->vars, [
                 'url_challenge' => sprintf('%s?hl=%s', $this->recaptchaApiServer, $options['language']),
-            ));
+        ]);
         } else {
-            $view->vars = array_replace($view->vars, array(
+            $view->vars = array_replace($view->vars, [
                 'url_api' => sprintf('//%s/recaptcha/api/js/recaptcha_ajax.js', $this->apiHost),
-            ));
+        ]);
         }
     }
 }
diff --git a/src/Validator/Constraints/IsTrueValidator.php b/src/Validator/Constraints/IsTrueValidator.php
index e8b4476..c6bdc33 100755
--- a/src/Validator/Constraints/IsTrueValidator.php
+++ b/src/Validator/Constraints/IsTrueValidator.php
@@ -67,7 +67,7 @@ public function __construct(
         RequestStack $requestStack,
         bool $verifyHost,
         ?AuthorizationCheckerInterface $authorizationChecker = null,
-        array $trustedRoles = array())
+        array $trustedRoles = [])
     {
         $this->enabled = $enabled;
         $this->recaptcha = $recaptcha;
diff --git a/src/Validator/Constraints/IsTrueValidatorV3.php b/src/Validator/Constraints/IsTrueValidatorV3.php
index f531fa0..34baed1 100755
--- a/src/Validator/Constraints/IsTrueValidatorV3.php
+++ b/src/Validator/Constraints/IsTrueValidatorV3.php
@@ -60,7 +60,7 @@ public function __construct(
      * @param mixed      $value
      * @param Constraint $constraint
      */
-    public function validate(mixed $value, Constraint $constraint): void
+    public function validate($value, Constraint $constraint): void
     {
         if (!$this->enabled) {
             return;