Allow Symfony 7

.github/workflows/code_checks.yaml

@@ -14,42 +14,41 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ['7.1', '7.2', '7.4', '8.0', '8.1', '8.2']
-        symfony: ['^3.4', '^4.0', '^5.0']
-        exclude:
-          - symfony: ^5.0
-            php: 7.1
+        php: ['7.1', '7.2', '7.4', '8.0', '8.1', '8.2', '8.3']
+        symfony: ['^3.4', '^4.0', '^5.0', '^6.0', '^7.0']
+#        exclude:
+#          - symfony: ^5.0
+#            php: 7.1
         include:
           - symfony: ^6.0
             php: 8.0
           - symfony: ^6.0
             php: 8.1
           - symfony: ^6.0
             php: 8.2
+          - symfony: ^7.0
+            php: 8.2
+          - symfony: ^7.0
+            php: 8.3
       fail-fast: false
     name: PHPUnit (PHP ${{ matrix.php }}) (Symfony ${{ matrix.symfony }})
     steps:
 
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
           coverage: none # disable xdebug, pcov
 
-      - name: Get Composer cache directory
-        id: composer-cache
-        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: Cache Composer
-        uses: actions/cache@v3
+      - name: Install PHP dependencies
+        uses: ramsey/composer-install@v2
+        env:
+          SYMFONY_REQUIRE: ${{ matrix.symfony }}
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.json **/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-php-${{ matrix.php }}-composer-
+          tools: flex
 
       - name: Restrict Symfony version
         if: matrix.symfony != ''
@@ -59,9 +58,9 @@ jobs:
           composer config extra.symfony.require "${{ matrix.symfony }}"
 
       # remove this after support for symfony 3 is dropped
-      - name: Remove PhpUnit 10 support for old Symfony Versions
-        if: matrix.symfony == '^3.4' || matrix.symfony == '^4.0'
-        run: composer require --no-update "phpunit/phpunit:^7|^8|^9"
+#      - name: Remove PhpUnit 10 support for old Symfony Versions
+#        if: matrix.symfony == '^3.4' || matrix.symfony == '^4.0'
+#        run: composer require --no-update "phpunit/phpunit:^7|^8|^9"
 
       - name: Install PHP dependencies
         run: composer install --no-interaction
@@ -77,28 +76,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: 8.3
           coverage: xdebug
 
-      - name: Get Composer cache directory
-        id: composer-cache
-        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: Cache Composer
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.json **/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-php-${{ matrix.php }}-composer-
-
       - name: Install PHP dependencies
-        run: composer install --no-interaction
+        uses: ramsey/composer-install@v2
 
       - name: Run code coverage
         run: vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover

Tests/Validator/Constraints/Recaptcha3ValidatorTest.php

@@ -8,6 +8,7 @@
 use Karser\Recaptcha3Bundle\Validator\Constraints\Recaptcha3Validator;
 use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidatorInterface;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
@@ -24,7 +25,7 @@ public function setUp(): void
         parent::setUp();
     }
 
-    protected function createValidator()
+    protected function createValidator(): ConstraintValidatorInterface
     {
         $this->recaptcha = new RecaptchaMock();
         return new Recaptcha3Validator($this->recaptcha, $enabled = true, $this->resolver);

Tests/fixtures/config/symfony6.yml

@@ -1,3 +1,4 @@
 framework:
+    http_method_override: false
     session:
         storage_factory_id: session.storage.factory.mock_file

Validator/Constraints/Recaptcha3.php

@@ -13,10 +13,12 @@ final class Recaptcha3 extends Constraint
 {
     const INVALID_FORMAT_ERROR = '7147ffdb-0af4-4f7a-bd5e-e9dcfa6d7a2d';
 
-    protected static $errorNames = [
+    protected const ERROR_NAMES = [
         self::INVALID_FORMAT_ERROR => 'INVALID_FORMAT_ERROR',
     ];
 
+    protected static $errorNames = self::ERROR_NAMES;
+
     public $message = 'Your computer or network may be sending automated queries';
     public $messageMissingValue = 'The captcha value is missing';
 

composer.json

@@ -37,17 +37,17 @@
   "require": {
     "php": ">=7.1",
     "google/recaptcha": "^1.2",
-    "symfony/form": "^3.4|^4.0|^5.0|^6.0",
-    "symfony/framework-bundle": "^3.4.26|^4.2.7|^5.0|^6.0",
-    "symfony/expression-language": "^3.4|^4.0|^5.0|^6.0",
-    "symfony/yaml": "^3.4|^4.0|^5.0|^6.0",
-    "symfony/validator": "^3.4|^4.0|^5.0|^6.0",
-    "symfony/twig-bundle": "^3.4|^4.0|^5.0|^6.0",
+    "symfony/form": "^3.4|^4.0|^5.0|^6.0|^7.0",
+    "symfony/framework-bundle": "^3.4.26|^4.2.7|^5.0|^6.0|^7.0",
+    "symfony/expression-language": "^3.4|^4.0|^5.0|^6.0|^7.0",
+    "symfony/yaml": "^3.4|^4.0|^5.0|^6.0|^7.0",
+    "symfony/validator": "^3.4|^4.0|^5.0|^6.0|^7.0",
+    "symfony/twig-bundle": "^3.4|^4.0|^5.0|^6.0|^7.0",
     "twig/twig": "^2.9|^3.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^7|^8|^9|^10",
-    "symfony/http-client": "^4.3|^5.0|^6.0"
+    "symfony/http-client": "^4.3|^5.0|^6.0|^7.0"
   },
   "autoload": {
     "psr-4": {