Merge branch 'NativePHP:main' into main

Author: shanerbaner82

CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to `nativephp-laravel` will be documented in this file.
 
+## 0.3.0 - 2023-07-31
+
+### What's Changed
+
+- Add native:db:seed command by @phuclh in https://github.com/NativePHP/laravel/pull/82
+- Option to show/hide menu on Windows / Linux by @ShaneShipston in https://github.com/NativePHP/laravel/pull/84
+- Add tests for `MenuBar` by @milwad-dev in https://github.com/NativePHP/laravel/pull/31
+
+### New Contributors
+
+- @phuclh made their first contribution in https://github.com/NativePHP/laravel/pull/82
+- @ShaneShipston made their first contribution in https://github.com/NativePHP/laravel/pull/84
+
+**Full Changelog**: https://github.com/NativePHP/laravel/compare/0.2.0...0.3.0
+
 ## 0.2.0 - 2023-07-28
 
 ### What's changed

resources/stubs/NativeAppServiceProvider.php.stub

@@ -2,57 +2,26 @@
 
 namespace App\Providers;
 
-use Native\Laravel\Facades\ContextMenu;
-use Native\Laravel\Facades\Dock;
 use Native\Laravel\Facades\Window;
-use Native\Laravel\Facades\GlobalShortcut;
-use Native\Laravel\Menu\Menu;
+use Native\Laravel\Contracts\ProvidesPhpIni;
 
-class NativeAppServiceProvider
+class NativeAppServiceProvider implements ProvidesPhpIni
 {
     /**
      * Executed once the native application has been booted.
      * Use this method to open windows, register global shortcuts, etc.
      */
     public function boot(): void
     {
-        Menu::new()
-            ->appMenu()
-            ->submenu('About', Menu::new()
-                ->link('https://beyondco.de', 'Beyond Code')
-                ->link('https://simonhamp.me', 'Simon Hamp')
-            )
-            ->submenu('View', Menu::new()
-                ->toggleFullscreen()
-                ->separator()
-                ->link('https://laravel.com', 'Learn More', 'CmdOrCtrl+L')
-            )
-            ->register();
-
-        Window::open()
-            ->width(800)
-            ->height(800);
-
-        /**
-            Dock::menu(
-                Menu::new()
-                    ->event(DockItemClicked::class, 'Settings')
-                    ->submenu('Help',
-                        Menu::new()
-                            ->event(DockItemClicked::class, 'About')
-                            ->event(DockItemClicked::class, 'Learn More…')
-                    )
-            );
-
-            ContextMenu::register(
-                Menu::new()
-                    ->event(ContextMenuClicked::class, 'Do something')
-            );
+        Window::open();
+    }
 
-            GlobalShortcut::new()
-                ->key('CmdOrCtrl+Shift+I')
-                ->event(ShortcutPressed::class)
-                ->register();
-        */
+    /**
+     * Return an array of php.ini directives to be set.
+     */
+    public function phpIni(): array
+    {
+        return [
+        ];
     }
 }

src/Commands/LoadPHPConfigurationCommand.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Native\Laravel\Commands;
+
+use Illuminate\Console\Command;
+use Native\Laravel\Contracts\ProvidesPhpIni;
+
+class LoadPHPConfigurationCommand extends Command
+{
+    protected $signature = 'native:php-ini';
+
+    public function handle()
+    {
+        /** @var ProvidesPhpIni $provider */
+        $provider = app(config('nativephp.provider'));
+        $phpIni = [];
+        if (method_exists($provider, 'phpIni')) {
+            $phpIni = $provider->phpIni();
+        }
+        echo json_encode($phpIni);
+    }
+}

src/Commands/SeedDatabaseCommand.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Native\Laravel\Commands;
+
+use Illuminate\Database\Console\Seeds\SeedCommand as BaseSeedCommand;
+use Native\Laravel\NativeServiceProvider;
+
+class SeedDatabaseCommand extends BaseSeedCommand
+{
+    protected $name = 'native:db:seed';
+
+    protected $description = 'Run the database seeders in the NativePHP development environment';
+
+    public function handle()
+    {
+        (new NativeServiceProvider($this->laravel))->rewriteDatabase();
+
+        parent::handle();
+    }
+}

src/Contracts/ProvidesPhpIni.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Native\Laravel\Contracts;
+
+interface ProvidesPhpIni
+{
+    public function phpIni(): array;
+}

src/DataObjects/Printer.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Native\Laravel\DataObjects;
+
+class Printer
+{
+    public function __construct(
+        public string $name,
+        public string $displayName,
+        public string $description,
+        public int $status,
+        public bool $isDefault,
+        public array $options
+    ) {
+
+    }
+}

src/NativeServiceProvider.php

@@ -3,6 +3,7 @@
 namespace Native\Laravel;
 
 use Illuminate\Support\Arr;
+use Native\Laravel\Commands\LoadPHPConfigurationCommand;
 use Native\Laravel\Commands\LoadStartupConfigurationCommand;
 use Native\Laravel\Commands\MigrateCommand;
 use Native\Laravel\Commands\MinifyApplicationCommand;
@@ -20,6 +21,7 @@ public function configurePackage(Package $package): void
                 MigrateCommand::class,
                 MinifyApplicationCommand::class,
                 LoadStartupConfigurationCommand::class,
+                LoadPHPConfigurationCommand::class,
             ])
             ->hasConfigFile()
             ->hasRoute('api')
@@ -49,6 +51,8 @@ protected function configureApp()
 
         $this->rewriteDatabase();
 
+        $this->configureDisks();
+
         config(['session.driver' => 'file']);
         config(['queue.default' => 'database']);
     }
@@ -96,4 +100,32 @@ public function rewriteDatabase()
 
         config(['database.default' => 'nativephp']);
     }
+
+    protected function configureDisks(): void
+    {
+        $disks = [
+            'NATIVEPHP_USER_HOME_PATH' => 'user_home',
+            'NATIVEPHP_APP_DATA_PATH' => 'app_data',
+            'NATIVEPHP_USER_DATA_PATH' => 'user_data',
+            'NATIVEPHP_DESKTOP_PATH' => 'desktop',
+            'NATIVEPHP_DOCUMENTS_PATH' => 'documents',
+            'NATIVEPHP_DOWNLOADS_PATH' => 'downloads',
+            'NATIVEPHP_MUSIC_PATH' => 'music',
+            'NATIVEPHP_PICTURES_PATH' => 'pictures',
+            'NATIVEPHP_VIDEOS_PATH' => 'videos',
+            'NATIVEPHP_RECENT_PATH' => 'recent',
+        ];
+
+        foreach ($disks as $env => $disk) {
+            if (! env($env)) {
+                continue;
+            }
+
+            config(['filesystems.disks.'.$disk => [
+                'driver' => 'local',
+                'root' => env($env, ''),
+                'throw' => false,
+            ]]);
+        }
+    }
 }

src/System.php

@@ -3,6 +3,7 @@
 namespace Native\Laravel;
 
 use Native\Laravel\Client\Client;
+use Native\Laravel\DataObjects\Printer;
 
 class System
 {
@@ -21,4 +22,31 @@ public function promptTouchID(string $reason): bool
             'reason' => $reason,
         ])->successful();
     }
+
+    /**
+     * @return array<\Native\Laravel\DataObjects\Printer>
+     */
+    public function printers(): array
+    {
+        $printers = $this->client->get('system/printers')->json('printers');
+
+        return collect($printers)->map(function ($printer) {
+            return new Printer(
+                data_get($printer, 'name'),
+                data_get($printer, 'displayName'),
+                data_get($printer, 'description'),
+                data_get($printer, 'status'),
+                data_get($printer, 'isDefault'),
+                data_get($printer, 'options'),
+            );
+        })->toArray();
+    }
+
+    public function print(string $html, Printer $printer = null): void
+    {
+        $this->client->post('system/print', [
+            'html' => $html,
+            'printer' => $printer->name ?? '',
+        ]);
+    }
 }

src/Windows/Window.php

@@ -13,6 +13,8 @@ class Window
     use HasDimensions;
     use HasUrl;
 
+    protected bool $autoHideMenuBar = false;
+
     protected bool $fullscreen = false;
 
     protected bool $kiosk = false;
@@ -184,6 +186,13 @@ public function invisibleFrameless(): self
             ->hasShadow(false);
     }
 
+    public function hideMenu($autoHideMenuBar = true): static
+    {
+        $this->autoHideMenuBar = $autoHideMenuBar;
+
+        return $this;
+    }
+
     public function fullscreen($fullscreen = false): static
     {
         $this->fullscreen = $fullscreen;
@@ -229,6 +238,7 @@ public function toArray()
             'title' => $this->title,
             'fullscreen' => $this->fullscreen,
             'kiosk' => $this->kiosk,
+            'autoHideMenuBar' => $this->autoHideMenuBar,
         ];
     }
 }

tests/MenuBar/MenuBarTest.php

@@ -0,0 +1,26 @@
+<?php
+
+use Native\Laravel\Facades\MenuBar;
+use Native\Laravel\Menu\Menu;
+
+it('menubar with create', function () {
+    config()->set('nativephp-internal.api_url', 'https://jsonplaceholder.typicode.com/todos/1');
+
+    $menuBar = MenuBar::create()
+        ->showDockIcon()
+        ->alwaysOnTop()
+        ->label('milwad')
+        ->icon('nativephp.png')
+        ->url('https://github.com/milwad-dev')
+        ->withContextMenu(
+            Menu::new()->label('My Application')->quit(),
+        );
+    $menuBarArray = $menuBar->toArray();
+
+    $this->assertTrue($menuBarArray['showDockIcon']);
+    $this->assertTrue($menuBarArray['alwaysOnTop']);
+    $this->assertEquals('milwad', $menuBarArray['label']);
+    $this->assertEquals('https://github.com/milwad-dev', $menuBarArray['url']);
+    $this->assertEquals('nativephp.png', $menuBarArray['icon']);
+    $this->assertIsArray($menuBarArray['contextMenu']);
+});