Add Livewire v4 compatibility (#544)

Author: bee-interactive

composer.json

@@ -30,7 +30,7 @@
   },
   "require": {
     "php": "^8.1",
-    "livewire/livewire": "^3.2.3",
+    "livewire/livewire": "^3.2.3|^4.0",
     "spatie/laravel-package-tools": "^1.9"
   },
   "autoload": {

src/LivewireModalServiceProvider.php

@@ -19,7 +19,9 @@ public function configurePackage(Package $package): void
 
     public function registeringPackage()
     {
-        UpgradeCommand::addThirdPartyUpgradeStep(WireElementsModalUpgrade::class);
+        if (class_exists(\Livewire\Features\SupportConsoleCommands\Commands\UpgradeCommand::class)) {
+            \Livewire\Features\SupportConsoleCommands\Commands\UpgradeCommand::addThirdPartyUpgradeStep(WireElementsModalUpgrade::class);
+        }
     }
 
     public function bootingPackage(): void

src/Modal.php

@@ -27,7 +27,7 @@ public function resetState(): void
     public function openModal($component, $arguments = [], $modalAttributes = []): void
     {
         $requiredInterface = \LivewireUI\Modal\Contracts\ModalComponent::class;
-        $componentClass = app(ComponentRegistry::class)->getClass($component);
+        $componentClass = $this->resolveComponentClass($component);
         $reflect = new ReflectionClass($componentClass);
 
         if ($reflect->implementsInterface($requiredInterface) === false) {
@@ -82,7 +82,7 @@ protected function resolveParameter($attributes, $parameterName, $parameterClass
 
         if(enum_exists($parameterClassName)){
             $enum = $parameterClassName::tryFrom($parameterValue);
-        
+
             if($enum !== null){
                 return $enum;
             }
@@ -111,6 +111,15 @@ public function destroyComponent($id): void
         unset($this->components[$id]);
     }
 
+    protected function resolveComponentClass(string $component): string
+    {
+        if (class_exists(\Livewire\Mechanisms\ComponentRegistry::class)) {
+            return app(\Livewire\Mechanisms\ComponentRegistry::class)->getClass($component);
+        }
+
+        return app('livewire.finder')->resolveClassComponentClassName($component);
+    }
+
     public function getListeners(): array
     {
         return [

tests/LivewireModalComponentTest.php

@@ -8,6 +8,15 @@
 
 class LivewireModalComponentTest extends TestCase
 {
+    protected function getComponentName(string $class): string
+    {
+        if (class_exists(\Livewire\Mechanisms\ComponentRegistry::class)) {
+            return app(\Livewire\Mechanisms\ComponentRegistry::class)->getName($class);
+        }
+
+        return app('livewire.finder')->normalizeName($class);
+    }
+
     public function testCloseModal(): void
     {
         Livewire::test(DemoModal::class)
@@ -50,7 +59,7 @@ public function testModalEventEmitting(): void
             ])
             ->assertDispatched('someEvent');
 
-        $name = app(ComponentRegistry::class)->getName(DemoModal::class);
+        $name = $this->getComponentName(DemoModal::class);
 
         Livewire::test(DemoModal::class)
             ->call('closeModalWithEvents', [