From 25f1841ac111a6ce701ffc667e311b7addf273a2 Mon Sep 17 00:00:00 2001
From: Mior Muhammad Zaki <crynobone@gmail.com>
Date: Tue, 25 Nov 2025 19:39:59 +0800
Subject: [PATCH 1/2] [1.x] PHP 8.5 Compatibility

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
---
 .github/workflows/tests.yml                   |  6 +++-
 composer.json                                 | 12 ++++---
 src/VoltServiceProvider.php                   |  3 ++
 ...sts_Feature_resources_view___de_php__.snap | 32 +++++++++++++++++++
 4 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100644 tests/.pest/snapshots/Feature/FunctionalComponentTest/generated_code_with_data_set__dataset__component_with_session_state_blade_php______tests_Feature_resources_view___de_php__.snap

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 4039152..c9e3925 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.1, 8.2, 8.3, 8.4]
+        php: [8.1, 8.2, 8.3, 8.4, 8.5]
         laravel: [10, 11, 12]
         exclude:
           - php: 8.1
@@ -28,6 +28,10 @@ jobs:
             laravel: 12
           - php: 8.4
             laravel: 10
+          - php: 8.5
+            laravel: 10
+          - php: 8.5
+            laravel: 11
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
 
diff --git a/composer.json b/composer.json
index 3a1372f..cca67fc 100644
--- a/composer.json
+++ b/composer.json
@@ -25,9 +25,8 @@
     },
     "require-dev": {
         "laravel/folio": "^1.1",
-        "mockery/mockery": "^1.6",
-        "orchestra/testbench": "^8.15.0|^9.0|^10.0",
-        "pestphp/pest": "^2.9.5|^3.0",
+        "orchestra/testbench": "^8.36|^9.15|^10.8",
+        "pestphp/pest": "^2.9.5|^3.0|^4.0",
         "phpstan/phpstan": "^1.10"
     },
     "autoload": {
@@ -56,10 +55,13 @@
         }
     },
     "config": {
-        "sort-packages": true,
         "allow-plugins": {
             "pestphp/pest-plugin": true
-        }
+        },
+        "audit": {
+            "block-insecure": false
+        },
+        "sort-packages": true
     },
     "scripts": {
         "post-autoload-dump": "@composer run prepare",
diff --git a/src/VoltServiceProvider.php b/src/VoltServiceProvider.php
index 515b743..17cb8f5 100644
--- a/src/VoltServiceProvider.php
+++ b/src/VoltServiceProvider.php
@@ -7,6 +7,7 @@
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Testing\TestResponse;
 use Livewire\Livewire;
+use Livewire\LivewireManager as BaseLivewireManager;
 use Livewire\LivewireServiceProvider;
 use Livewire\Volt\Precompilers\ExtractFragments;
 use Livewire\Volt\Precompilers\ExtractTemplate;
@@ -61,8 +62,10 @@ protected function bindLivewireManager(): void
     {
         $this->app->singleton(LivewireManager::class);
         $this->app->alias(LivewireManager::class, 'livewire');
+        $this->app->alias(LivewireManager::class, BaseLivewireManager::class);
 
         Facade::clearResolvedInstance('livewire');
+        Facade::clearResolvedInstance(BaseLivewireManager::class);
 
         $this->app->get(LivewireManager::class)->setProvider(
             $this->app->getProvider(LivewireServiceProvider::class),
diff --git a/tests/.pest/snapshots/Feature/FunctionalComponentTest/generated_code_with_data_set__dataset__component_with_session_state_blade_php______tests_Feature_resources_view___de_php__.snap b/tests/.pest/snapshots/Feature/FunctionalComponentTest/generated_code_with_data_set__dataset__component_with_session_state_blade_php______tests_Feature_resources_view___de_php__.snap
new file mode 100644
index 0000000..70242f4
--- /dev/null
+++ b/tests/.pest/snapshots/Feature/FunctionalComponentTest/generated_code_with_data_set__dataset__component_with_session_state_blade_php______tests_Feature_resources_view___de_php__.snap
@@ -0,0 +1,32 @@
+<?php
+
+use Livewire\Volt\Actions;
+use Livewire\Volt\CompileContext;
+use Livewire\Volt\Contracts\Compiled;
+use Livewire\Volt\Component;
+
+new class extends Component implements Livewire\Volt\Contracts\FunctionalComponent
+{
+    public static CompileContext $__context;
+
+    use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+
+    #[\Livewire\Attributes\Session()]
+    public $tab;
+
+    public function mount()
+    {
+        (new Actions\InitializeState)->execute(static::$__context, $this, get_defined_vars());
+
+        (new Actions\CallHook('mount'))->execute(static::$__context, $this, get_defined_vars());
+    }
+
+    #[\Livewire\Attributes\Computed()]
+    public function tags()
+    {
+        $arguments = [static::$__context, $this, func_get_args()];
+
+        return (new Actions\CallMethod('tags'))->execute(...$arguments);
+    }
+
+};
\ No newline at end of file

From 22ac91e29cd0a223f0010e8c364b7d9526ecac47 Mon Sep 17 00:00:00 2001
From: Mior Muhammad Zaki <crynobone@gmail.com>
Date: Tue, 25 Nov 2025 19:43:40 +0800
Subject: [PATCH 2/2] wip

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
---
 .github/workflows/tests.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c9e3925..070fee6 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -56,12 +56,12 @@ jobs:
         run: vendor/bin/pest
 
   windows_tests:
-    runs-on: windows-2019
+    runs-on: windows-2022
 
     strategy:
       fail-fast: true
       matrix:
-        php: [8.1, 8.2, 8.3, 8.4]
+        php: [8.1, 8.2, 8.3, 8.4, 8.5]
         laravel: [10, 11, 12]
         exclude:
           - php: 8.1
@@ -70,6 +70,10 @@ jobs:
             laravel: 12
           - php: 8.4
             laravel: 10
+          - php: 8.5
+            laravel: 10
+          - php: 8.5
+            laravel: 11
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} Windows