⬆️ Symfony 7

Bee-Lab · Jun 18, 2023 · 18c86f7 · 18c86f7
1 parent a956c60
commit 18c86f7
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 31 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -6,7 +6,7 @@ on:
 
 jobs:
     phpstan:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         name: PHPStan
         steps:
             - name: Checkout
@@ -18,28 +18,28 @@ jobs:
               with:
                   args: analyse
     cs-fixer:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         name: PHP-CS-Fixer
         steps:
             - name: Checkout
               uses: actions/checkout@v3
             - name: Fix CS
               uses: docker://oskarstark/php-cs-fixer-ga
     tests:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         strategy:
             fail-fast: false
             matrix:
                 include:
-                    - description: 'Symfony 5.4'
-                      php: '8.0'
-                      composer_option: '--prefer-lowest'
-                    - description: 'Symfony 6.1'
-                      php: '8.1'
-                      symfony: 6.1.*
                     - description: 'Symfony 6.2'
+                      php: '8.1'
+                      composer_option: '--prefer-lowest'
+                    - description: 'Symfony 6.3'
+                      php: '8.2'
+                      symfony: 6.3.*
+                    - description: 'Symfony 7.0'
                       php: '8.2'
-                      symfony: 6.2.*
+                      symfony: 7.0.*@dev
         name: PHP ${{ matrix.php }} tests (${{ matrix.description }})
         steps:
             - name: Checkout

diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -10,7 +10,7 @@
     ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,
-        '@PHP71Migration:risky' => true,
+        '@PHP80Migration:risky' => true,
         '@PHPUnit84Migration:risky' => true,
         'declare_strict_types' => false,
         'native_function_invocation' => ['include' => ['@all']],

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "beelab/recaptcha2-bundle",
     "type": "symfony-bundle",
-    "description": "Provide Google Recaptch2 form type",
+    "description": "Provide Google Recaptcha2 form type",
     "keywords": [
         "Symfony",
         "Form",
@@ -16,20 +16,20 @@
         }
     ],
     "require": {
-        "php": "^8.0",
-        "google/recaptcha": "^1.2",
-        "symfony/config": "^5.4 || ^6.0",
-        "symfony/dependency-injection": "^5.4 || ^6.0",
-        "symfony/form": "^5.4 || ^6.0",
-        "symfony/http-kernel": "^5.4 || ^6.0",
-        "symfony/validator": "^5.4 || ^6.0"
+        "php": "^8.1",
+        "google/recaptcha": "^1.3",
+        "symfony/config": "^6.0 || ^7.0",
+        "symfony/dependency-injection": "^6.0 || ^7.0",
+        "symfony/form": "^6.0 || ^7.0",
+        "symfony/http-kernel": "^6.0 || ^7.0",
+        "symfony/validator": "^6.0 || ^7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5",
-        "symfony/phpunit-bridge": "^6.2"
+        "phpunit/phpunit": "^9.6",
+        "symfony/phpunit-bridge": "^6.3"
     },
     "suggest": {
-        "symfony/twig-bundle": "To render widget. Minimum supported Twig version is 1.34, minimum suggested is 2.4"
+        "symfony/twig-bundle": "To render widget. Minimum supported Twig version is 2.4"
     },
     "config": {
         "sort-packages": true

diff --git a/src/DependencyInjection/BeelabRecaptcha2Extension.php b/src/DependencyInjection/BeelabRecaptcha2Extension.php
@@ -11,9 +11,6 @@
 
 final class BeelabRecaptcha2Extension extends Extension
 {
-    /**
-     * @param array<string, mixed> $configs
-     */
     public function load(array $configs, ContainerBuilder $container): void
     {
         $configuration = new Configuration();

diff --git a/src/Form/Type/RecaptchaSubmitType.php b/src/Form/Type/RecaptchaSubmitType.php
@@ -11,7 +11,7 @@
 
 final class RecaptchaSubmitType extends AbstractType
 {
-    public function __construct(private string $siteKey)
+    public function __construct(private readonly string $siteKey)
     {
     }
 

diff --git a/src/Form/Type/RecaptchaType.php b/src/Form/Type/RecaptchaType.php
@@ -11,7 +11,7 @@
 
 class RecaptchaType extends AbstractType
 {
-    public function __construct(protected string $siteKey)
+    public function __construct(protected readonly string $siteKey)
     {
     }
 

diff --git a/src/Recaptcha/RecaptchaVerifier.php b/src/Recaptcha/RecaptchaVerifier.php
@@ -13,9 +13,9 @@ class RecaptchaVerifier
     private const GOOGLE_DEFAULT_INPUT = 'g-recaptcha-response';
 
     public function __construct(
-        private ReCaptcha $reCaptcha,
-        private RequestStack $requestStack,
-        private bool $enabled = true,
+        private readonly ReCaptcha $reCaptcha,
+        private readonly RequestStack $requestStack,
+        private readonly bool $enabled = true,
     ) {
     }
 

diff --git a/src/Validator/Constraints/Recaptcha2Validator.php b/src/Validator/Constraints/Recaptcha2Validator.php
@@ -9,7 +9,7 @@
 
 final class Recaptcha2Validator extends ConstraintValidator
 {
-    public function __construct(private RecaptchaVerifier $verifier)
+    public function __construct(private readonly RecaptchaVerifier $verifier)
     {
     }