From ee0599d522234c1a89959c9596f0551560df7b0b Mon Sep 17 00:00:00 2001 From: Oussama Date: Fri, 24 Nov 2023 12:02:02 +0100 Subject: [PATCH 01/36] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7ba9e64..8bd9664 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@
-![Login Screen screenshot](./art/thumbnail.png) +![Login Screen screenshot](https://github.com/coderflexx/filament-turnstile/raw/2.x/art/thumbnail.png)
From 5324028b3e607935de38fe8012f819400c15b208 Mon Sep 17 00:00:00 2001 From: ousid Date: Mon, 8 Apr 2024 16:46:41 +0100 Subject: [PATCH 02/36] add `Laravel 11.x` support --- .github/workflows/run-tests.yml | 9 +++++++-- composer.json | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 480a667..f342797 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -13,13 +13,18 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest, windows-latest] - php: [8.2, 8.1] - laravel: [10.*] + php: [8.1, 8.2, 8.3] + laravel: [10.*, 11.*] stability: [prefer-stable] include: - laravel: 10.* testbench: 8.* carbon: ^2.63 + - laravel: 11.* + testbench: 9.* + exclude: + - laravel: 11.* + php: 8.1 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} diff --git a/composer.json b/composer.json index fe087f4..88c3fa0 100644 --- a/composer.json +++ b/composer.json @@ -21,16 +21,16 @@ ], "require": { "php": "^8.1", - "coderflex/laravel-turnstile": "^1.0", + "coderflex/laravel-turnstile": "^1.0|^2.0", "illuminate/contracts": "^10.0", "spatie/laravel-package-tools": "^1.14.0" }, "require-dev": { "filament/filament": "^3.0", "laravel/pint": "^1.0", - "nunomaduro/collision": "^7.9", + "nunomaduro/collision": "^7.9|^8.1", "nunomaduro/larastan": "^2.0.1", - "orchestra/testbench": "^8.0", + "orchestra/testbench": "^8.0|^9.0", "pestphp/pest": "^2.0", "pestphp/pest-plugin-arch": "^2.0", "pestphp/pest-plugin-laravel": "^2.0", From 649e6c1a1ad0adbb1c55dae665c7b82d72d28033 Mon Sep 17 00:00:00 2001 From: ousid Date: Mon, 8 Apr 2024 16:49:26 +0100 Subject: [PATCH 03/36] update `run-tests.yml` --- .github/workflows/run-tests.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index f342797..fa68bdc 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -15,13 +15,14 @@ jobs: os: [ubuntu-latest, windows-latest] php: [8.1, 8.2, 8.3] laravel: [10.*, 11.*] - stability: [prefer-stable] + stability: [prefer-lowest, prefer-stable] include: - laravel: 10.* testbench: 8.* carbon: ^2.63 - laravel: 11.* testbench: 9.* + carbon: '*' exclude: - laravel: 11.* php: 8.1 @@ -53,4 +54,4 @@ jobs: run: composer show -D - name: Execute tests - run: vendor/bin/pest --ci + run: vendor/bin/pest --ci \ No newline at end of file From dc5e3cbf1d980196bc133d203f5a8f530e6d4268 Mon Sep 17 00:00:00 2001 From: ousid Date: Mon, 8 Apr 2024 16:53:49 +0100 Subject: [PATCH 04/36] update `composer.json` --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 88c3fa0..af23a97 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "require": { "php": "^8.1", "coderflex/laravel-turnstile": "^1.0|^2.0", - "illuminate/contracts": "^10.0", + "illuminate/contracts": "^10.0|^11.0", "spatie/laravel-package-tools": "^1.14.0" }, "require-dev": { From 5647d52ba89c2304fdff726d2013d1c44e4a1a55 Mon Sep 17 00:00:00 2001 From: ousid Date: Mon, 8 Apr 2024 16:55:10 +0100 Subject: [PATCH 05/36] update `run-tests.yml` --- .github/workflows/run-tests.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index fa68bdc..f1950f7 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -2,9 +2,15 @@ name: run-tests on: push: - branches: [main] + branches: + - main + - 1.x + - 2.x pull_request: - branches: [main] + branches: + - main + - 1.x + - 2.x jobs: test: From a7860280552e1675b770814c290c8da20e393ac7 Mon Sep 17 00:00:00 2001 From: ousid Date: Mon, 8 Apr 2024 17:14:07 +0100 Subject: [PATCH 06/36] update `composer.json` --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index af23a97..5b9e68a 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "filament/filament": "^3.0", "laravel/pint": "^1.0", "nunomaduro/collision": "^7.9|^8.1", - "nunomaduro/larastan": "^2.0.1", + "larastan/larastan": "^2.0.1", "orchestra/testbench": "^8.0|^9.0", "pestphp/pest": "^2.0", "pestphp/pest-plugin-arch": "^2.0", From 4a3404747898c2d91a98f6add2a548ad83b6223d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 22:16:22 +0000 Subject: [PATCH 07/36] Bump aglipanci/laravel-pint-action from 2.3.1 to 2.4 Bumps [aglipanci/laravel-pint-action](https://github.com/aglipanci/laravel-pint-action) from 2.3.1 to 2.4. - [Release notes](https://github.com/aglipanci/laravel-pint-action/releases) - [Commits](https://github.com/aglipanci/laravel-pint-action/compare/2.3.1...2.4) --- updated-dependencies: - dependency-name: aglipanci/laravel-pint-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/fix-php-code-style-issues.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fix-php-code-style-issues.yml b/.github/workflows/fix-php-code-style-issues.yml index c958238..78fc54a 100644 --- a/.github/workflows/fix-php-code-style-issues.yml +++ b/.github/workflows/fix-php-code-style-issues.yml @@ -19,7 +19,7 @@ jobs: ref: ${{ github.head_ref }} - name: Fix PHP code style issues - uses: aglipanci/laravel-pint-action@2.3.1 + uses: aglipanci/laravel-pint-action@2.4 - name: Commit changes uses: stefanzweifel/git-auto-commit-action@v4 From 583b155b3458c51274593c743545f54081eeeff6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 22:17:58 +0000 Subject: [PATCH 08/36] Bump dependabot/fetch-metadata from 2.0.0 to 2.1.0 Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata) from 2.0.0 to 2.1.0. - [Release notes](https://github.com/dependabot/fetch-metadata/releases) - [Commits](https://github.com/dependabot/fetch-metadata/compare/v2.0.0...v2.1.0) --- updated-dependencies: - dependency-name: dependabot/fetch-metadata dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dependabot-auto-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 67e66c6..611344a 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -13,7 +13,7 @@ jobs: - name: Dependabot metadata id: metadata - uses: dependabot/fetch-metadata@v2.0.0 + uses: dependabot/fetch-metadata@v2.1.0 with: github-token: "${{ secrets.GITHUB_TOKEN }}" From 3d73046bd2712f8663a3227f8e164f2b20e5c114 Mon Sep 17 00:00:00 2001 From: Oussama Date: Sat, 4 May 2024 17:19:36 +0400 Subject: [PATCH 09/36] Update run-tests.yml --- .github/workflows/run-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index f1950f7..9c20318 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -21,7 +21,7 @@ jobs: os: [ubuntu-latest, windows-latest] php: [8.1, 8.2, 8.3] laravel: [10.*, 11.*] - stability: [prefer-lowest, prefer-stable] + stability: [prefer-stable] include: - laravel: 10.* testbench: 8.* @@ -60,4 +60,4 @@ jobs: run: composer show -D - name: Execute tests - run: vendor/bin/pest --ci \ No newline at end of file + run: vendor/bin/pest --ci From 9ac756fe96363f5496e4c17609a291a13d939aa7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 22:09:44 +0000 Subject: [PATCH 10/36] Bump dependabot/fetch-metadata from 2.1.0 to 2.2.0 Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata) from 2.1.0 to 2.2.0. - [Release notes](https://github.com/dependabot/fetch-metadata/releases) - [Commits](https://github.com/dependabot/fetch-metadata/compare/v2.1.0...v2.2.0) --- updated-dependencies: - dependency-name: dependabot/fetch-metadata dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dependabot-auto-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 611344a..eb537d8 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -13,7 +13,7 @@ jobs: - name: Dependabot metadata id: metadata - uses: dependabot/fetch-metadata@v2.1.0 + uses: dependabot/fetch-metadata@v2.2.0 with: github-token: "${{ secrets.GITHUB_TOKEN }}" From 002163a91e18b29b3e260b465d60f67bd368b941 Mon Sep 17 00:00:00 2001 From: Davide Bellini Date: Fri, 9 Aug 2024 14:45:58 +0200 Subject: [PATCH 11/36] Fixed wrong default language format --- src/Forms/Components/Turnstile.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Forms/Components/Turnstile.php b/src/Forms/Components/Turnstile.php index bd27458..21370c1 100644 --- a/src/Forms/Components/Turnstile.php +++ b/src/Forms/Components/Turnstile.php @@ -15,7 +15,7 @@ class Turnstile extends Field protected string $size = 'normal'; - protected string $language = 'en-US'; + protected string $language = 'en-us'; protected function setUp(): void { From bde233270549873c57dbdd3a468e7ddcf6fba766 Mon Sep 17 00:00:00 2001 From: ousid Date: Thu, 29 Aug 2024 06:50:43 +0000 Subject: [PATCH 12/36] Fix styling --- src/Forms/Components/Turnstile.php | 2 +- tests/Database/Migrations/create_contacts_table.php | 2 +- tests/Database/Migrations/create_users_table.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Forms/Components/Turnstile.php b/src/Forms/Components/Turnstile.php index 21370c1..299cdb4 100644 --- a/src/Forms/Components/Turnstile.php +++ b/src/Forms/Components/Turnstile.php @@ -25,7 +25,7 @@ protected function setUp(): void $this->required(); - $this->rule(new TurnstileCheck()); + $this->rule(new TurnstileCheck); $this->dehydrated(false); } diff --git a/tests/Database/Migrations/create_contacts_table.php b/tests/Database/Migrations/create_contacts_table.php index 21824c9..a1f248e 100644 --- a/tests/Database/Migrations/create_contacts_table.php +++ b/tests/Database/Migrations/create_contacts_table.php @@ -4,7 +4,7 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -return new class() extends Migration +return new class extends Migration { public function up() { diff --git a/tests/Database/Migrations/create_users_table.php b/tests/Database/Migrations/create_users_table.php index 57f0097..d52f72d 100644 --- a/tests/Database/Migrations/create_users_table.php +++ b/tests/Database/Migrations/create_users_table.php @@ -4,7 +4,7 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -return new class() extends Migration +return new class extends Migration { public function up() { From 592a91e3fa6380397bb94bf83392345c76df3af0 Mon Sep 17 00:00:00 2001 From: TinaH Date: Mon, 13 Jan 2025 15:32:16 +0100 Subject: [PATCH 13/36] lazy load assets and avoid push scripts --- .../views/components/turnstile.blade.php | 33 +++++++------------ 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/resources/views/components/turnstile.blade.php b/resources/views/components/turnstile.blade.php index 9f1319c..04a1423 100644 --- a/resources/views/components/turnstile.blade.php +++ b/resources/views/components/turnstile.blade.php @@ -10,10 +10,11 @@
+ data-theme="{{ $theme }}" + data-language="{{ $language }}" + data-size="{{ $size }}" + x-ref="turnstile" + >
- - - - @push('scripts') - - @endpush - \ No newline at end of file + From ad8d478da6409177ed91ebfaafefa152776d23b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Jan 2025 22:35:46 +0000 Subject: [PATCH 14/36] Bump dependabot/fetch-metadata from 2.2.0 to 2.3.0 Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata) from 2.2.0 to 2.3.0. - [Release notes](https://github.com/dependabot/fetch-metadata/releases) - [Commits](https://github.com/dependabot/fetch-metadata/compare/v2.2.0...v2.3.0) --- updated-dependencies: - dependency-name: dependabot/fetch-metadata dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dependabot-auto-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index eb537d8..2cb1d5e 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -13,7 +13,7 @@ jobs: - name: Dependabot metadata id: metadata - uses: dependabot/fetch-metadata@v2.2.0 + uses: dependabot/fetch-metadata@v2.3.0 with: github-token: "${{ secrets.GITHUB_TOKEN }}" From 311ff296231f34eeda5f2113590eb9eb6e93e9d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 22:28:36 +0000 Subject: [PATCH 15/36] Bump aglipanci/laravel-pint-action from 2.4 to 2.5 Bumps [aglipanci/laravel-pint-action](https://github.com/aglipanci/laravel-pint-action) from 2.4 to 2.5. - [Release notes](https://github.com/aglipanci/laravel-pint-action/releases) - [Commits](https://github.com/aglipanci/laravel-pint-action/compare/2.4...2.5) --- updated-dependencies: - dependency-name: aglipanci/laravel-pint-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/fix-php-code-style-issues.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fix-php-code-style-issues.yml b/.github/workflows/fix-php-code-style-issues.yml index 78fc54a..fad7e50 100644 --- a/.github/workflows/fix-php-code-style-issues.yml +++ b/.github/workflows/fix-php-code-style-issues.yml @@ -19,7 +19,7 @@ jobs: ref: ${{ github.head_ref }} - name: Fix PHP code style issues - uses: aglipanci/laravel-pint-action@2.4 + uses: aglipanci/laravel-pint-action@2.5 - name: Commit changes uses: stefanzweifel/git-auto-commit-action@v4 From c30a354e2831e348f847bcd8c4b31e92eac083be Mon Sep 17 00:00:00 2001 From: Lance Pioch Date: Fri, 28 Feb 2025 16:10:54 -0500 Subject: [PATCH 16/36] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5b9e68a..9c0cc75 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "require": { "php": "^8.1", "coderflex/laravel-turnstile": "^1.0|^2.0", - "illuminate/contracts": "^10.0|^11.0", + "illuminate/contracts": "^10.0|^11.0|^12.0", "spatie/laravel-package-tools": "^1.14.0" }, "require-dev": { From 066e994d04ea04c1a83e56b667d04c28d574d212 Mon Sep 17 00:00:00 2001 From: ousid Date: Sat, 1 Mar 2025 17:32:00 +0400 Subject: [PATCH 17/36] update yml test file --- .github/workflows/run-tests.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 9c20318..70cebd4 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -19,19 +19,16 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest, windows-latest] - php: [8.1, 8.2, 8.3] - laravel: [10.*, 11.*] + php: [8.2, 8.3] + laravel: [11.*, 12.*] stability: [prefer-stable] include: - - laravel: 10.* - testbench: 8.* - carbon: ^2.63 - laravel: 11.* testbench: 9.* carbon: '*' - exclude: - - laravel: 11.* - php: 8.1 + - laravel: 12.* + testbench: 10.* + carbon: '*' name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} From ad4bfd4097341e104d8406f1500233554e33d287 Mon Sep 17 00:00:00 2001 From: ousid Date: Sat, 1 Mar 2025 17:37:11 +0400 Subject: [PATCH 18/36] update composer.json --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 9c0cc75..078be58 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ } ], "require": { - "php": "^8.1", + "php": "^8.2|^8.3", "coderflex/laravel-turnstile": "^1.0|^2.0", "illuminate/contracts": "^10.0|^11.0|^12.0", "spatie/laravel-package-tools": "^1.14.0" @@ -29,9 +29,9 @@ "filament/filament": "^3.0", "laravel/pint": "^1.0", "nunomaduro/collision": "^7.9|^8.1", - "larastan/larastan": "^2.0.1", - "orchestra/testbench": "^8.0|^9.0", - "pestphp/pest": "^2.0", + "larastan/larastan": "^2.8", + "orchestra/testbench": "^8.0|^9.0|^10.0", + "pestphp/pest": "^2.0|^3.0", "pestphp/pest-plugin-arch": "^2.0", "pestphp/pest-plugin-laravel": "^2.0", "pestphp/pest-plugin-livewire": "^2.0", From 2fdf9668276f762eb66a13bf777451321159d039 Mon Sep 17 00:00:00 2001 From: ousid Date: Sat, 1 Mar 2025 17:38:00 +0400 Subject: [PATCH 19/36] update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 078be58..a7f9ed1 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "filament/filament": "^3.0", "laravel/pint": "^1.0", "nunomaduro/collision": "^7.9|^8.1", - "larastan/larastan": "^2.8", + "larastan/larastan": "^2.8|^3.0", "orchestra/testbench": "^8.0|^9.0|^10.0", "pestphp/pest": "^2.0|^3.0", "pestphp/pest-plugin-arch": "^2.0", From 2fcca9a876f13531e0a6d5e97e7e906e5a7a8a04 Mon Sep 17 00:00:00 2001 From: ousid Date: Sat, 1 Mar 2025 19:45:36 +0400 Subject: [PATCH 20/36] wip --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a7f9ed1..785859e 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ "orchestra/testbench": "^8.0|^9.0|^10.0", "pestphp/pest": "^2.0|^3.0", "pestphp/pest-plugin-arch": "^2.0", - "pestphp/pest-plugin-laravel": "^2.0", + "pestphp/pest-plugin-laravel": "^3.0", "pestphp/pest-plugin-livewire": "^2.0", "phpstan/extension-installer": "^1.1", "phpstan/phpstan-deprecation-rules": "^1.0", From 02be101aca59732098d52f83c1f2b5af1570e994 Mon Sep 17 00:00:00 2001 From: ousid Date: Sat, 1 Mar 2025 19:47:54 +0400 Subject: [PATCH 21/36] wip --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 785859e..941c407 100644 --- a/composer.json +++ b/composer.json @@ -32,9 +32,9 @@ "larastan/larastan": "^2.8|^3.0", "orchestra/testbench": "^8.0|^9.0|^10.0", "pestphp/pest": "^2.0|^3.0", - "pestphp/pest-plugin-arch": "^2.0", - "pestphp/pest-plugin-laravel": "^3.0", - "pestphp/pest-plugin-livewire": "^2.0", + "pestphp/pest-plugin-arch": "^2.0|^3.0", + "pestphp/pest-plugin-laravel": "^2.0|^3.0", + "pestphp/pest-plugin-livewire": "^2.0|^3.0", "phpstan/extension-installer": "^1.1", "phpstan/phpstan-deprecation-rules": "^1.0", "phpstan/phpstan-phpunit": "^1.0" From 1a6949040cc0ea730f36ce207d7d0c8a609e819d Mon Sep 17 00:00:00 2001 From: ousid Date: Sat, 1 Mar 2025 19:53:24 +0400 Subject: [PATCH 22/36] update composer.json --- composer.json | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 941c407..3f1859c 100644 --- a/composer.json +++ b/composer.json @@ -28,16 +28,15 @@ "require-dev": { "filament/filament": "^3.0", "laravel/pint": "^1.0", - "nunomaduro/collision": "^7.9|^8.1", "larastan/larastan": "^2.8|^3.0", + "nunomaduro/collision": "^7.0|^8.0", + "nunomaduro/larastan": "^2.8.0|^3.1.0", "orchestra/testbench": "^8.0|^9.0|^10.0", - "pestphp/pest": "^2.0|^3.0", + "pestphp/pest": "^2.0|^3.7", "pestphp/pest-plugin-arch": "^2.0|^3.0", - "pestphp/pest-plugin-laravel": "^2.0|^3.0", - "pestphp/pest-plugin-livewire": "^2.0|^3.0", "phpstan/extension-installer": "^1.1", - "phpstan/phpstan-deprecation-rules": "^1.0", - "phpstan/phpstan-phpunit": "^1.0" + "phpstan/phpstan-deprecation-rules": "^1.0|^2.0", + "phpstan/phpstan-phpunit": "^1.0|^2.0" }, "autoload": { "psr-4": { From ef24e83f4fc10054f5b7198bcbeccf90c295ccaa Mon Sep 17 00:00:00 2001 From: ousid Date: Sat, 1 Mar 2025 19:57:10 +0400 Subject: [PATCH 23/36] add composer.json --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3f1859c..a846bad 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,8 @@ "pestphp/pest-plugin-arch": "^2.0|^3.0", "phpstan/extension-installer": "^1.1", "phpstan/phpstan-deprecation-rules": "^1.0|^2.0", - "phpstan/phpstan-phpunit": "^1.0|^2.0" + "phpstan/phpstan-phpunit": "^1.0|^2.0", + "pestphp/pest-plugin-livewire": "^2.0|^3.0" }, "autoload": { "psr-4": { From 7433ce4542ac89cc4752d7178ecbc6da9fa51d67 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 May 2025 22:42:40 +0000 Subject: [PATCH 24/36] Bump dependabot/fetch-metadata from 2.3.0 to 2.4.0 Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata) from 2.3.0 to 2.4.0. - [Release notes](https://github.com/dependabot/fetch-metadata/releases) - [Commits](https://github.com/dependabot/fetch-metadata/compare/v2.3.0...v2.4.0) --- updated-dependencies: - dependency-name: dependabot/fetch-metadata dependency-version: 2.4.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dependabot-auto-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 2cb1d5e..1a13177 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -13,7 +13,7 @@ jobs: - name: Dependabot metadata id: metadata - uses: dependabot/fetch-metadata@v2.3.0 + uses: dependabot/fetch-metadata@v2.4.0 with: github-token: "${{ secrets.GITHUB_TOKEN }}" From ac99fd3f8a3da71ef84a2bde661fecddc7c476e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Jun 2025 23:58:26 +0000 Subject: [PATCH 25/36] Bump stefanzweifel/git-auto-commit-action from 4 to 6 Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from 4 to 6. - [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases) - [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4...v6) --- updated-dependencies: - dependency-name: stefanzweifel/git-auto-commit-action dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/fix-php-code-style-issues.yml | 2 +- .github/workflows/update-changelog.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/fix-php-code-style-issues.yml b/.github/workflows/fix-php-code-style-issues.yml index fad7e50..be70520 100644 --- a/.github/workflows/fix-php-code-style-issues.yml +++ b/.github/workflows/fix-php-code-style-issues.yml @@ -22,6 +22,6 @@ jobs: uses: aglipanci/laravel-pint-action@2.5 - name: Commit changes - uses: stefanzweifel/git-auto-commit-action@v4 + uses: stefanzweifel/git-auto-commit-action@v6 with: commit_message: Fix styling diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml index 8c12ba9..e2df759 100644 --- a/.github/workflows/update-changelog.yml +++ b/.github/workflows/update-changelog.yml @@ -24,7 +24,7 @@ jobs: release-notes: ${{ github.event.release.body }} - name: Commit updated CHANGELOG - uses: stefanzweifel/git-auto-commit-action@v4 + uses: stefanzweifel/git-auto-commit-action@v6 with: branch: main commit_message: Update CHANGELOG From bad49caa65b409c5a3e3246344460f6248dd8329 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Aug 2025 05:20:53 +0000 Subject: [PATCH 26/36] Bump aglipanci/laravel-pint-action from 2.5 to 2.6 Bumps [aglipanci/laravel-pint-action](https://github.com/aglipanci/laravel-pint-action) from 2.5 to 2.6. - [Release notes](https://github.com/aglipanci/laravel-pint-action/releases) - [Commits](https://github.com/aglipanci/laravel-pint-action/compare/2.5...2.6) --- updated-dependencies: - dependency-name: aglipanci/laravel-pint-action dependency-version: '2.6' dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/fix-php-code-style-issues.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fix-php-code-style-issues.yml b/.github/workflows/fix-php-code-style-issues.yml index fad7e50..e8153b8 100644 --- a/.github/workflows/fix-php-code-style-issues.yml +++ b/.github/workflows/fix-php-code-style-issues.yml @@ -19,7 +19,7 @@ jobs: ref: ${{ github.head_ref }} - name: Fix PHP code style issues - uses: aglipanci/laravel-pint-action@2.5 + uses: aglipanci/laravel-pint-action@2.6 - name: Commit changes uses: stefanzweifel/git-auto-commit-action@v4 From a63ca21c7810f4c1e5ff356595f3fb2260217f9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Aug 2025 07:17:51 +0000 Subject: [PATCH 27/36] Bump actions/checkout from 3 to 5 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/fix-php-code-style-issues.yml | 2 +- .github/workflows/phpstan.yml | 2 +- .github/workflows/run-tests.yml | 2 +- .github/workflows/update-changelog.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/fix-php-code-style-issues.yml b/.github/workflows/fix-php-code-style-issues.yml index e8153b8..6fb91c5 100644 --- a/.github/workflows/fix-php-code-style-issues.yml +++ b/.github/workflows/fix-php-code-style-issues.yml @@ -14,7 +14,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v5 with: ref: ${{ github.head_ref }} diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 6ee75f8..29ca128 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -11,7 +11,7 @@ jobs: name: phpstan runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v5 - name: Setup PHP uses: shivammathur/setup-php@v2 diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 70cebd4..9425d6a 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -34,7 +34,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v5 - name: Setup PHP uses: shivammathur/setup-php@v2 diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml index 8c12ba9..6d9f592 100644 --- a/.github/workflows/update-changelog.yml +++ b/.github/workflows/update-changelog.yml @@ -13,7 +13,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v5 with: ref: main From 089b25be16be88ca9b6a67f32a38053b5474f6ca Mon Sep 17 00:00:00 2001 From: TinaH Date: Tue, 26 Aug 2025 13:36:50 +0200 Subject: [PATCH 28/36] Fix destroyed when element visibility changes Problem: When the Turnstile field becomes hidden and then visible again (e.g., switching tabs, collapsing panels, or dynamic content changes), the Cloudflare Turnstile widget is destroyed and doesn't re-initialize, leaving users unable to complete the captcha. Solution: Added an IntersectionObserver to detect when the Turnstile container enters the viewport and automatically re-renders the widget if it's missing. Includes a safety check to ensure the Turnstile API is loaded before attempting to render. Changes: - Added IntersectionObserver in the Alpine.js x-init to monitor element visibility - Added window.turnstile check to prevent rendering before API loads - Added element existence check before observing Testing: - Place Turnstile field in collapsible content or tabs - Hide and show the container multiple times - Verify captcha re-appears and functions correctly --- resources/views/components/turnstile.blade.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/resources/views/components/turnstile.blade.php b/resources/views/components/turnstile.blade.php index 04a1423..351d3e8 100644 --- a/resources/views/components/turnstile.blade.php +++ b/resources/views/components/turnstile.blade.php @@ -34,6 +34,20 @@ } $wire.on('reset-captcha', () => resetCaptcha()) + + const observer = new IntersectionObserver((entries) => { + entries.forEach(entry => { + if (entry.isIntersecting && + window.turnstile && + !$refs.turnstile.querySelector('.cf-turnstile')) { + turnstile.render($refs.turnstile, options); + } + }); + }, { threshold: 0.1 }) + + if ($refs.turnstile) { + observer.observe($refs.turnstile); + } })()" >
Date: Mon, 13 Oct 2025 22:04:25 +0000 Subject: [PATCH 29/36] Bump stefanzweifel/git-auto-commit-action from 6 to 7 Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from 6 to 7. - [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases) - [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/v6...v7) --- updated-dependencies: - dependency-name: stefanzweifel/git-auto-commit-action dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/fix-php-code-style-issues.yml | 2 +- .github/workflows/update-changelog.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/fix-php-code-style-issues.yml b/.github/workflows/fix-php-code-style-issues.yml index aa8ae04..2484fbe 100644 --- a/.github/workflows/fix-php-code-style-issues.yml +++ b/.github/workflows/fix-php-code-style-issues.yml @@ -22,6 +22,6 @@ jobs: uses: aglipanci/laravel-pint-action@2.6 - name: Commit changes - uses: stefanzweifel/git-auto-commit-action@v6 + uses: stefanzweifel/git-auto-commit-action@v7 with: commit_message: Fix styling diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml index 700d480..0ae452d 100644 --- a/.github/workflows/update-changelog.yml +++ b/.github/workflows/update-changelog.yml @@ -24,7 +24,7 @@ jobs: release-notes: ${{ github.event.release.body }} - name: Commit updated CHANGELOG - uses: stefanzweifel/git-auto-commit-action@v6 + uses: stefanzweifel/git-auto-commit-action@v7 with: branch: main commit_message: Update CHANGELOG From add373d472fed8c4e0c8e2d60abe1e437c4b1e59 Mon Sep 17 00:00:00 2001 From: TinaH Date: Sun, 19 Oct 2025 16:47:46 +0200 Subject: [PATCH 30/36] Fix multiple instances --- .../views/components/turnstile.blade.php | 61 +++++++++++-------- 1 file changed, 37 insertions(+), 24 deletions(-) diff --git a/resources/views/components/turnstile.blade.php b/resources/views/components/turnstile.blade.php index 351d3e8..78016fa 100644 --- a/resources/views/components/turnstile.blade.php +++ b/resources/views/components/turnstile.blade.php @@ -9,44 +9,57 @@ -
From 7822770c20b649a969836069e1487e5ca40a7fc7 Mon Sep 17 00:00:00 2001 From: TinaH Date: Wed, 22 Oct 2025 08:08:44 +0200 Subject: [PATCH 31/36] remove obsolete data attr. --- resources/views/components/turnstile.blade.php | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/resources/views/components/turnstile.blade.php b/resources/views/components/turnstile.blade.php index 78016fa..7d7c809 100644 --- a/resources/views/components/turnstile.blade.php +++ b/resources/views/components/turnstile.blade.php @@ -10,11 +10,11 @@
-
-
+
From 7f3be8c2398d2a7ac6513bf7efab27525bba5ce4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Nov 2025 22:15:28 +0000 Subject: [PATCH 32/36] Bump actions/checkout from 5 to 6 Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/fix-php-code-style-issues.yml | 2 +- .github/workflows/phpstan.yml | 2 +- .github/workflows/run-tests.yml | 2 +- .github/workflows/update-changelog.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/fix-php-code-style-issues.yml b/.github/workflows/fix-php-code-style-issues.yml index 2484fbe..82c33c7 100644 --- a/.github/workflows/fix-php-code-style-issues.yml +++ b/.github/workflows/fix-php-code-style-issues.yml @@ -14,7 +14,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: ref: ${{ github.head_ref }} diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 29ca128..e99ae44 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -11,7 +11,7 @@ jobs: name: phpstan runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - name: Setup PHP uses: shivammathur/setup-php@v2 diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 9425d6a..0002d85 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -34,7 +34,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: Setup PHP uses: shivammathur/setup-php@v2 diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml index 0ae452d..e687dad 100644 --- a/.github/workflows/update-changelog.yml +++ b/.github/workflows/update-changelog.yml @@ -13,7 +13,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: ref: main From 972ea5e3025c945e7f3b222a4058336580e09135 Mon Sep 17 00:00:00 2001 From: Sabit Ahmad Umid Date: Tue, 6 Jan 2026 04:04:52 +0600 Subject: [PATCH 33/36] feat: Upgrade Filament to v4, refactor forms to use Schema, and update testing infrastructure for PHP 8.4. --- .github/workflows/run-tests.yml | 10 ++-- composer.json | 8 +-- tests/Fixtures/ContactUs.php | 55 +++++++++---------- tests/TestCase.php | 8 ++- .../views/fixtures/contact-us.blade.php | 4 +- 5 files changed, 43 insertions(+), 42 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 0002d85..5a4d717 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -19,16 +19,16 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest, windows-latest] - php: [8.2, 8.3] + php: [8.2, 8.3, 8.4] laravel: [11.*, 12.*] stability: [prefer-stable] include: - - laravel: 11.* - testbench: 9.* - carbon: '*' - laravel: 12.* testbench: 10.* - carbon: '*' + carbon: ^3.0 + - laravel: 11.* + testbench: 9.* + carbon: ^3.0 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} diff --git a/composer.json b/composer.json index a846bad..1e7d086 100644 --- a/composer.json +++ b/composer.json @@ -26,18 +26,18 @@ "spatie/laravel-package-tools": "^1.14.0" }, "require-dev": { - "filament/filament": "^3.0", - "laravel/pint": "^1.0", + "filament/filament": "^4.0", "larastan/larastan": "^2.8|^3.0", + "laravel/pint": "^1.0", "nunomaduro/collision": "^7.0|^8.0", "nunomaduro/larastan": "^2.8.0|^3.1.0", "orchestra/testbench": "^8.0|^9.0|^10.0", "pestphp/pest": "^2.0|^3.7", "pestphp/pest-plugin-arch": "^2.0|^3.0", + "pestphp/pest-plugin-livewire": "^2.0|^3.0", "phpstan/extension-installer": "^1.1", "phpstan/phpstan-deprecation-rules": "^1.0|^2.0", - "phpstan/phpstan-phpunit": "^1.0|^2.0", - "pestphp/pest-plugin-livewire": "^2.0|^3.0" + "phpstan/phpstan-phpunit": "^1.0|^2.0" }, "autoload": { "psr-4": { diff --git a/tests/Fixtures/ContactUs.php b/tests/Fixtures/ContactUs.php index 065f74f..61ab758 100644 --- a/tests/Fixtures/ContactUs.php +++ b/tests/Fixtures/ContactUs.php @@ -4,13 +4,17 @@ use Coderflex\FilamentTurnstile\Forms\Components\Turnstile; use Coderflex\FilamentTurnstile\Tests\Models\Contact; -use Filament\Forms; -use Filament\Forms\Form; -use Filament\Forms\FormsComponent; +use Filament\Forms\Components\TextInput; +use Filament\Forms\Concerns\InteractsWithForms; +use Filament\Forms\Contracts\HasForms; +use Filament\Schemas\Schema; use Illuminate\Validation\ValidationException; +use Livewire\Component; -class ContactUs extends FormsComponent +class ContactUs extends Component implements HasForms { + use InteractsWithForms; + public ?array $data = []; public function mount(): void @@ -18,33 +22,24 @@ public function mount(): void $this->form->fill(); } - public function form(Form $form): Form - { - return $form; - } - - protected function getForms(): array + public function form(Schema $schema): Schema { - return [ - 'form' => $this->form( - $this->makeForm() - ->schema([ - Forms\Components\TextInput::make('name') - ->label('Name') - ->required(), - Forms\Components\TextInput::make('email') - ->label('Email') - ->required(), - Forms\Components\TextInput::make('content') - ->label('Content') - ->required(), - Turnstile::make('cf-captcha') - ->theme('auto'), - ]) - ) - ->statePath('data') - ->model(Contact::class), - ]; + return $schema + ->components([ + TextInput::make('name') + ->label('Name') + ->required(), + TextInput::make('email') + ->label('Email') + ->required(), + TextInput::make('content') + ->label('Content') + ->required(), + Turnstile::make('cf-captcha') + ->theme('auto'), + ]) + ->statePath('data') + ->model(Contact::class); } public function send() diff --git a/tests/TestCase.php b/tests/TestCase.php index 0686c58..a70fc4f 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -34,19 +34,25 @@ protected function setUp(): void config()->set('app.key', '6rE9Nz59bGRbeMATftriyQjrpF7DcOQm'); $this->setCurrentFilamentPanel(); + + // Ensure DataStore is fresh for each test + // The issue was that Livewire's DataStore singleton (which holds component state) was not being correctly reset between tests in this environment, causing state persistence failures. + $this->app->forgetInstance(\Livewire\Mechanisms\DataStore::class); + $this->app->singleton(\Livewire\Mechanisms\DataStore::class); } protected function getPackageProviders($app) { return [ + LivewireServiceProvider::class, ActionsServiceProvider::class, BladeCaptureDirectiveServiceProvider::class, BladeHeroiconsServiceProvider::class, BladeIconsServiceProvider::class, FilamentServiceProvider::class, FormsServiceProvider::class, + \Filament\Schemas\SchemasServiceProvider::class, InfolistsServiceProvider::class, - LivewireServiceProvider::class, NotificationsServiceProvider::class, SupportServiceProvider::class, TablesServiceProvider::class, diff --git a/tests/resources/views/fixtures/contact-us.blade.php b/tests/resources/views/fixtures/contact-us.blade.php index fccf563..49089be 100644 --- a/tests/resources/views/fixtures/contact-us.blade.php +++ b/tests/resources/views/fixtures/contact-us.blade.php @@ -1,7 +1,7 @@
- +
{{ $this->form }} - +
\ No newline at end of file From 5cb0a3c0bfc9edb8988a03e4d8f2cadd9e5067fa Mon Sep 17 00:00:00 2001 From: Sabit Ahmad Umid Date: Tue, 6 Jan 2026 04:07:50 +0600 Subject: [PATCH 34/36] fix: Add branch 3.x to workflow triggers for push and pull requests --- .github/workflows/run-tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 5a4d717..8609341 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -6,11 +6,13 @@ on: - main - 1.x - 2.x + - 3.x pull_request: branches: - main - 1.x - 2.x + - 3.x jobs: test: From 5dba79b41d942249eedc2d14ab0d91c85e1c4a98 Mon Sep 17 00:00:00 2001 From: Sabit Ahmad Umid Date: Fri, 9 Jan 2026 23:21:32 +0600 Subject: [PATCH 35/36] feat: Update PHP version to 8.2 in workflow, allow PHP 8.4 in composer, and simplify Turnstile component methods --- .github/workflows/phpstan.yml | 2 +- composer.json | 3 +-- phpstan.neon.dist | 1 - src/Forms/Components/Turnstile.php | 15 +++------------ 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index e99ae44..1b1bfc0 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -16,7 +16,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.1' + php-version: '8.2' coverage: none - name: Install composer dependencies diff --git a/composer.json b/composer.json index 1e7d086..aaabfdb 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ } ], "require": { - "php": "^8.2|^8.3", + "php": "^8.2|^8.3|^8.4", "coderflex/laravel-turnstile": "^1.0|^2.0", "illuminate/contracts": "^10.0|^11.0|^12.0", "spatie/laravel-package-tools": "^1.14.0" @@ -30,7 +30,6 @@ "larastan/larastan": "^2.8|^3.0", "laravel/pint": "^1.0", "nunomaduro/collision": "^7.0|^8.0", - "nunomaduro/larastan": "^2.8.0|^3.1.0", "orchestra/testbench": "^8.0|^9.0|^10.0", "pestphp/pest": "^2.0|^3.7", "pestphp/pest-plugin-arch": "^2.0|^3.0", diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 9914a5e..a89f28c 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -8,5 +8,4 @@ parameters: tmpDir: build/phpstan checkOctaneCompatibility: true checkModelProperties: true - checkMissingIterableValueType: false diff --git a/src/Forms/Components/Turnstile.php b/src/Forms/Components/Turnstile.php index 299cdb4..399e761 100644 --- a/src/Forms/Components/Turnstile.php +++ b/src/Forms/Components/Turnstile.php @@ -51,26 +51,17 @@ public function language(string $language): static return $this; } - /** - * @return string - */ - public function getTheme() + public function getTheme(): string { return $this->evaluate($this->theme); } - /** - * @return string - */ - public function getSize() + public function getSize(): string { return $this->evaluate($this->size); } - /** - * @return string - */ - public function getLanguage() + public function getLanguage(): string { return $this->evaluate($this->language); } From 65278ad61a1b394c090d883489a62b8580d15fdb Mon Sep 17 00:00:00 2001 From: Sabit Ahmad Umid Date: Fri, 9 Jan 2026 23:30:36 +0600 Subject: [PATCH 36/36] fix: Update carbon version constraints to allow any version in test matrix --- .github/workflows/run-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 8609341..88bbd36 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -27,10 +27,10 @@ jobs: include: - laravel: 12.* testbench: 10.* - carbon: ^3.0 + carbon: '*' - laravel: 11.* testbench: 9.* - carbon: ^3.0 + carbon: '*' name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}