Fix tests

.github/workflows/run-tests.yml

@@ -13,13 +13,19 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [8.2, 8.1]
-        laravel: [10.*]
+        php: [8.3, 8.2, 8.1]
+        laravel: [11.*, 10.*]
         stability: [prefer-lowest, prefer-stable]
         include:
+          - carbon: ^2.63
           - laravel: 10.*
             testbench: 8.*
-            carbon: ^2.63
+          - laravel: 11.*
+            php: 8.2
+            testbench: 9.*
+          - laravel: 11.*
+            php: 8.3
+            testbench: 9.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

composer.json

@@ -25,7 +25,7 @@
         "guzzlehttp/guzzle": "^7.0",
         "laravel/pint": "^1.0",
         "nunomaduro/collision": "^7.9",
-        "nunomaduro/larastan": "^2.0.1",
+        "larastan/larastan": "^2.0.1",
         "orchestra/testbench": "^8.0",
         "pestphp/pest": "^2.0",
         "pestphp/pest-plugin-arch": "^2.0",

src/Commands/FreshCommand.php

@@ -2,20 +2,22 @@
 
 namespace Native\Laravel\Commands;
 
-use Illuminate\Console\Command;
+use Illuminate\Database\Console\Migrations\FreshCommand as BaseFreshCommand;
 use Native\Laravel\NativeServiceProvider;
 
-class FreshCommand extends Command
+class FreshCommand extends BaseFreshCommand
 {
-    protected $description = 'Run the database migrations in the NativePHP development environment';
+    protected $description = 'Drop all tables and re-run all migrations in the NativePHP development environment';
 
-    protected $signature = 'native:migrate fresh';
+    protected $signature = 'native:migrate:fresh';
 
     public function handle()
     {
-        unlink(config('nativephp-internal.database_path'));
+        $nativeServiceProvider = new NativeServiceProvider($this->laravel);
 
-        (new NativeServiceProvider($this->laravel))->rewriteDatabase();
+        $nativeServiceProvider->removeDatabase();
+
+        $nativeServiceProvider->rewriteDatabase();
 
         $this->call('native:migrate');
     }

src/Dialog.php

@@ -110,7 +110,7 @@ public function properties(array $properties): self
         return $this;
     }
 
-    public function asSheet(string $windowId = null): self
+    public function asSheet(?string $windowId = null): self
     {
         if (is_null($windowId)) {
             $this->windowReference = Window::current()->id;

src/Menu/Menu.php

@@ -66,17 +66,17 @@ public function label(string $label): self
         return $this->add(new Label($label));
     }
 
-    public function checkbox(string $label, bool $checked = false, string $hotkey = null): self
+    public function checkbox(string $label, bool $checked = false, ?string $hotkey = null): self
     {
         return $this->add(new Checkbox($label, $checked, $hotkey));
     }
 
-    public function event(string $event, string $text, string $hotkey = null): self
+    public function event(string $event, string $text, ?string $hotkey = null): self
     {
         return $this->add(new Event($event, $text, $hotkey));
     }
 
-    public function link(string $url, string $text, string $hotkey = null): self
+    public function link(string $url, string $text, ?string $hotkey = null): self
     {
         return $this->add(new Link($url, $text, $hotkey));
     }

src/NativeServiceProvider.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Console\Application as Artisan;
 use Illuminate\Support\Arr;
+use Native\Laravel\Commands\FreshCommand;
 use Native\Laravel\Commands\LoadPHPConfigurationCommand;
 use Native\Laravel\Commands\LoadStartupConfigurationCommand;
 use Native\Laravel\Commands\MigrateCommand;
@@ -21,6 +22,7 @@ public function configurePackage(Package $package): void
             ->name('nativephp')
             ->hasCommands([
                 MigrateCommand::class,
+                FreshCommand::class,
                 SeedDatabaseCommand::class,
                 MinifyApplicationCommand::class,
             ])
@@ -109,6 +111,21 @@ public function rewriteDatabase()
         config(['database.default' => 'nativephp']);
     }
 
+    public function removeDatabase()
+    {
+        $databasePath = config('nativephp-internal.database_path');
+
+        if (config('app.debug')) {
+            $databasePath = database_path('nativephp.sqlite');
+
+            if (! file_exists($databasePath)) {
+                return;
+            }
+        }
+
+        unlink($databasePath);
+    }
+
     protected function configureDisks(): void
     {
         $disks = [

src/System.php

@@ -42,7 +42,7 @@ public function printers(): array
         })->toArray();
     }
 
-    public function print(string $html, Printer $printer = null): void
+    public function print(string $html, ?Printer $printer = null): void
     {
         $this->client->post('system/print', [
             'html' => $html,

tests/Windows/WindowTest.php

@@ -62,8 +62,8 @@
     $window = Window::open()->invisibleFrameless();
     $windowArray = $window->toArray();
 
-    expect($windowArray['frame'])->toBeTrue();
-    expect($windowArray['transparent'])->toBeTrue();
+    expect($windowArray['frame'])->toBeFalse();
+    expect($windowArray['transparency'])->toBeTrue();
     expect($windowArray['focusable'])->toBeFalse();
     expect($windowArray['hasShadow'])->toBeFalse();
 });