Merge branch 'main' into workbench

Author: crynobone

.github/workflows/dependabot-auto-merge.yml

@@ -13,7 +13,7 @@ jobs:
 
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.6.0
+        uses: dependabot/fetch-metadata@v2.0.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 

.github/workflows/phpstan.yml

@@ -20,7 +20,7 @@ jobs:
           coverage: none
 
       - name: Install composer dependencies
-        uses: ramsey/composer-install@v2
+        uses: ramsey/composer-install@v3
 
       - name: Run PHPStan
         run: ./vendor/bin/phpstan --error-format=github

CHANGELOG.md

@@ -2,6 +2,29 @@
 
 All notable changes to `nativephp-laravel` will be documented in this file.
 
+## 0.5.0 - 2024-04-01
+
+### What's Changed
+
+* Laravel 11 support by @meliani in https://github.com/NativePHP/electron/pull/89
+* Allow compiling packages in a CI environment by @danjohnson95 in https://github.com/NativePHP/electron/pull/74
+* Upload to GitHub Releases by @danjohnson95 in https://github.com/NativePHP/electron/pull/75
+* Windows flag for electron builder. by @A3Brothers in https://github.com/NativePHP/electron/pull/77
+* Automate platform detection by @kpanuragh in https://github.com/NativePHP/electron/pull/52
+* Fix broken links in README by @danjohnson95 in https://github.com/NativePHP/electron/pull/73
+* Bump actions/checkout from 3 to 4 by @dependabot in https://github.com/NativePHP/electron/pull/78
+* Bump stefanzweifel/git-auto-commit-action from 4 to 5 by @dependabot in https://github.com/NativePHP/electron/pull/80
+* Bump aglipanci/laravel-pint-action from 2.3.0 to 2.3.1 by @dependabot in https://github.com/NativePHP/electron/pull/82
+
+### New Contributors
+
+* @danjohnson95 made their first contribution in https://github.com/NativePHP/electron/pull/75
+* @A3Brothers made their first contribution in https://github.com/NativePHP/electron/pull/77
+* @kpanuragh made their first contribution in https://github.com/NativePHP/electron/pull/52
+* @meliani made their first contribution in https://github.com/NativePHP/electron/pull/89
+
+**Full Changelog**: https://github.com/NativePHP/electron/compare/0.4.0...0.5.0
+
 ## 0.4.0 - 2023-08-09
 
 ### What's Changed

composer.json

@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": "^8.1",
-        "illuminate/contracts": "^10.0",
+        "illuminate/contracts": "^10.0|^11.0",
         "laravel/prompts": "^0.1.1",
         "nativephp/laravel": "*",
         "nativephp/php-bin": "*",

resources/js/package.json

@@ -21,7 +21,7 @@
     "build:all": "cross-env npm run build:mac && cross-env npm run build:win && cross-env npm run build:linux",
     "build:win": "cross-env node php.js --win && cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p never --win --config",
     "build:mac": "cross-env npm run build:mac-arm && cross-env npm run build:mac-x86",
-    "build:mac-arm": "cross-env node php.js --arm64 && cross-env npm run build && cross-envnode ./node_modules/electron-builder/cli.js -p never --mac --config --arm64",
+    "build:mac-arm": "cross-env node php.js --arm64 && cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p never --mac --config --arm64",
     "build:mac-x86": "cross-env node php.js --x64 && cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p never --mac --config --x64",
     "build:linux": "cross-env npm run build:linux-x64",
     "build:linux-x64": "cross-env node php.js --linux && cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p never --linux --config --x64"

src/Commands/BuildCommand.php

@@ -14,7 +14,7 @@ class BuildCommand extends Command
 
     protected $signature = 'native:build {os=all : The operating system to build for (all, linux, mac, windows)}';
 
-    public function handle()
+    public function handle(): void
     {
         $this->info('Build NativePHP app…');
 
@@ -37,7 +37,7 @@ public function handle()
             });
     }
 
-    protected function getEnvironmentVariables()
+    protected function getEnvironmentVariables(): array
     {
         return array_merge(
             [

src/Commands/DevelopCommand.php

@@ -15,7 +15,7 @@ class DevelopCommand extends Command
 
     protected $signature = 'native:serve {--no-queue} {--D|no-dependencies} {--installer=npm}';
 
-    public function handle()
+    public function handle(): void
     {
         intro('Starting NativePHP dev server…');
 
@@ -41,10 +41,8 @@ public function handle()
     /**
      * Patch Electron's Info.plist to show the correct app name
      * during development.
-     *
-     * @return void
      */
-    protected function patchPlist()
+    protected function patchPlist(): void
     {
         $pList = file_get_contents(__DIR__.'/../../resources/js/node_modules/electron/dist/Electron.app/Contents/Info.plist');
 

src/Commands/PublishCommand.php

@@ -14,7 +14,7 @@ class PublishCommand extends Command
 
     protected $signature = 'native:publish {os=mac}';
 
-    public function handle()
+    public function handle(): void
     {
         $this->info('Building and publishing NativePHP app…');
 
@@ -39,7 +39,7 @@ public function handle()
             });
     }
 
-    protected function getEnvironmentVariables()
+    protected function getEnvironmentVariables(): array
     {
         return array_merge(
             [

src/Commands/QueueWorkerCommand.php

@@ -12,7 +12,7 @@ class QueueWorkerCommand extends Command
 {
     protected $signature = 'native:queue {--port=4000}';
 
-    protected function getAppDirectory()
+    protected function getAppDirectory(): string|false
     {
         $appName = Str::slug(config('app.name'));
 
@@ -27,7 +27,7 @@ protected function getAppDirectory()
         return realpath($basePath.'/'.$appName);
     }
 
-    public function handle()
+    public function handle(): void
     {
         intro('Starting NativePHP queue worker…');
 

src/ElectronServiceProvider.php

@@ -27,7 +27,7 @@ public function configurePackage(Package $package): void
             ]);
     }
 
-    public function packageRegistered()
+    public function packageRegistered(): void
     {
         $this->app->singleton('nativephp.updater', function ($app) {
             return new UpdaterManager($app);