From c26ee8870ad81569046198722da7c280d4927674 Mon Sep 17 00:00:00 2001 From: Akash Singh Date: Thu, 19 Oct 2023 19:56:18 +0530 Subject: [PATCH 01/10] add space between cross-env and node --- resources/js/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/js/package.json b/resources/js/package.json index 7442a988..c77a9fc2 100644 --- a/resources/js/package.json +++ b/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" From 1aa0903fe73c3e427922adac9376827ea9d52b5d Mon Sep 17 00:00:00 2001 From: LunashaGit Date: Tue, 6 Feb 2024 19:46:17 +0100 Subject: [PATCH 02/10] Fix undefined class Process in ExampleTest.php --- tests/ExampleTest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/ExampleTest.php b/tests/ExampleTest.php index b6be2e1b..722d9413 100644 --- a/tests/ExampleTest.php +++ b/tests/ExampleTest.php @@ -1,6 +1,7 @@ tty() ->start($php.' artisan native:serve', function ($type, $line) { echo $line; From 8fc584af74cddaed55cc646c208c085676e67eaa Mon Sep 17 00:00:00 2001 From: LunashaGit Date: Tue, 6 Feb 2024 20:41:59 +0100 Subject: [PATCH 03/10] Add the return types for each methods --- src/Commands/BuildCommand.php | 4 ++-- src/Commands/DevelopCommand.php | 4 ++-- src/Commands/PublishCommand.php | 4 ++-- src/Commands/QueueWorkerCommand.php | 4 ++-- src/ElectronServiceProvider.php | 2 +- src/Facades/Updater.php | 2 +- src/Traits/Installer.php | 2 +- tests/TestCase.php | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Commands/BuildCommand.php b/src/Commands/BuildCommand.php index 9c079633..6f45525e 100644 --- a/src/Commands/BuildCommand.php +++ b/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( [ diff --git a/src/Commands/DevelopCommand.php b/src/Commands/DevelopCommand.php index 43bc0872..15ed7d45 100644 --- a/src/Commands/DevelopCommand.php +++ b/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…'); @@ -44,7 +44,7 @@ public function handle() * * @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'); diff --git a/src/Commands/PublishCommand.php b/src/Commands/PublishCommand.php index 4ec83d1b..68a4061a 100644 --- a/src/Commands/PublishCommand.php +++ b/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( [ diff --git a/src/Commands/QueueWorkerCommand.php b/src/Commands/QueueWorkerCommand.php index 38b814f6..df753ecd 100644 --- a/src/Commands/QueueWorkerCommand.php +++ b/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…'); diff --git a/src/ElectronServiceProvider.php b/src/ElectronServiceProvider.php index a96bd61e..6e4d193c 100644 --- a/src/ElectronServiceProvider.php +++ b/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); diff --git a/src/Facades/Updater.php b/src/Facades/Updater.php index bc984491..9ab655dd 100644 --- a/src/Facades/Updater.php +++ b/src/Facades/Updater.php @@ -6,7 +6,7 @@ class Updater extends Facade { - protected static function getFacadeAccessor() + protected static function getFacadeAccessor(): string { return 'nativephp.updater'; } diff --git a/src/Traits/Installer.php b/src/Traits/Installer.php index 65c1ce34..87cc47b5 100644 --- a/src/Traits/Installer.php +++ b/src/Traits/Installer.php @@ -43,7 +43,7 @@ protected function getInstallerAndCommand(?string $installer, $type = 'install') return [$installer, $commands[$installer]]; } - protected function getInstaller(string $installer) + protected function getInstaller(string $installer): int|string { if (! array_key_exists($installer, $this->getCommandArrays())) { error("Invalid installer ** {$installer} ** provided."); diff --git a/tests/TestCase.php b/tests/TestCase.php index a24440f5..d7726c24 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -15,14 +15,14 @@ protected function setUp(): void Artisan::call('native:install', ['--force' => true]); } - protected function getPackageProviders($app) + protected function getPackageProviders($app): array { return [ ElectronServiceProvider::class, ]; } - public function getEnvironmentSetUp($app) + public function getEnvironmentSetUp($app): void { config()->set('database.default', 'testing'); } From ce2805defbc71d305b324bfd4f5db99cec0fcf50 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 11:01:41 +0000 Subject: [PATCH 04/10] Bump ramsey/composer-install from 2 to 3 Bumps [ramsey/composer-install](https://github.com/ramsey/composer-install) from 2 to 3. - [Release notes](https://github.com/ramsey/composer-install/releases) - [Commits](https://github.com/ramsey/composer-install/compare/v2...v3) --- updated-dependencies: - dependency-name: ramsey/composer-install dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/phpstan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index ccfa9d9f..3855a084 100644 --- a/.github/workflows/phpstan.yml +++ b/.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 From 610e4773249d9a8bf15dee596b93ca758c272415 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 10:58:23 +0000 Subject: [PATCH 05/10] Bump dependabot/fetch-metadata from 1.6.0 to 2.0.0 Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata) from 1.6.0 to 2.0.0. - [Release notes](https://github.com/dependabot/fetch-metadata/releases) - [Commits](https://github.com/dependabot/fetch-metadata/compare/v1.6.0...v2.0.0) --- updated-dependencies: - dependency-name: dependabot/fetch-metadata dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/dependabot-auto-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index ca2197dc..67e66c6a 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.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 }}" From cadae76559ec61e11fcbae5cda078bb7379d657b Mon Sep 17 00:00:00 2001 From: mel Date: Tue, 26 Mar 2024 06:25:34 +0000 Subject: [PATCH 06/10] Fix Laravel 11 update --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d7cd39c8..fd742e8a 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": "^8.1", - "illuminate/contracts": "^10.0", + "illuminate/contracts": "^11.0", "laravel/prompts": "^0.1.1", "nativephp/laravel": "*", "nativephp/php-bin": "*", From c6c5e08c4b19601fbb95a8ba3942452e2f2f272f Mon Sep 17 00:00:00 2001 From: Simon Hamp Date: Mon, 1 Apr 2024 17:24:57 +0100 Subject: [PATCH 07/10] Fix for L10 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index fd742e8a..933ee09b 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": "^8.1", - "illuminate/contracts": "^11.0", + "illuminate/contracts": "^10.0|^11.0", "laravel/prompts": "^0.1.1", "nativephp/laravel": "*", "nativephp/php-bin": "*", From c89076ce4457ee42afe9490327160000922d7859 Mon Sep 17 00:00:00 2001 From: simonhamp Date: Mon, 1 Apr 2024 16:37:53 +0000 Subject: [PATCH 08/10] Update CHANGELOG --- CHANGELOG.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd66a91f..0f4696af 100644 --- a/CHANGELOG.md +++ b/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 From 54c005c5f88cebc8bfcf20e2a48d4d7f610a2d5b Mon Sep 17 00:00:00 2001 From: simonhamp Date: Tue, 2 Apr 2024 14:46:57 +0000 Subject: [PATCH 09/10] Fix styling --- tests/ExampleTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ExampleTest.php b/tests/ExampleTest.php index 722d9413..2ccd211c 100644 --- a/tests/ExampleTest.php +++ b/tests/ExampleTest.php @@ -1,7 +1,7 @@ Date: Tue, 2 Apr 2024 15:00:55 +0000 Subject: [PATCH 10/10] Fix styling --- src/Commands/DevelopCommand.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Commands/DevelopCommand.php b/src/Commands/DevelopCommand.php index 15ed7d45..457bd7df 100644 --- a/src/Commands/DevelopCommand.php +++ b/src/Commands/DevelopCommand.php @@ -41,8 +41,6 @@ public function handle(): void /** * Patch Electron's Info.plist to show the correct app name * during development. - * - * @return void */ protected function patchPlist(): void {