Merge branch 'main' into chore/php-support-drop

# Conflicts:
#	.github/workflows/run-feature-tests.yml

Author: SRWieZ

.github/workflows/run-feature-tests.yml

@@ -1,80 +0,0 @@
-# Run only Features tests
-# TODO: Currently failing on ubuntu-latest and prefer-lowest
-# TODO: Find a way to output electron logs to the console
-name: run-feature-tests
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  test:
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [
-          windows-latest,
-          macos-latest
-          # ubuntu-latest,
-        ]
-        php: [ 8.4, 8.3 ]
-        laravel: [ '10.*', '11.*', '12.*' ]
-        stability: [
-#          prefer-lowest,
-          prefer-stable
-        ]
-        exclude:
-          - laravel: 10.*
-            php: 8.4
-
-    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Use Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20.x
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
-          coverage: none
-
-      - name: Setup problem matchers
-        run: |
-          echo "::add-matcher::${{ runner.tool_cache }}/php.json"
-          echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
-
-      - name: Install dependencies
-        run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
-          composer update --${{ matrix.stability }} --no-interaction
-
-      - name: List Installed Dependencies
-        run: composer show
-
-      - name: Show pest version
-        run: vendor/bin/pest --version
-
-      - name: Execute tests on Linux
-        if: "matrix.os == 'ubuntu-latest'"
-        run: |
-          xvfb-run -a vendor/bin/pest --group=feature
-        env:
-          DISPLAY: ":99"
-
-      - name: Execute tests on Windows or Mac
-        if: "matrix.os == 'windows-latest' || matrix.os == 'macos-latest'"
-        run: vendor/bin/pest --group=feature

.github/workflows/run-tests.yml

@@ -59,4 +59,4 @@ jobs:
         run: vendor/bin/pest --version
 
       - name: Execute tests
-        run: vendor/bin/pest --exclude-group=feature
+        run: vendor/bin/pest

resources/js/electron-plugin/dist/server/api/menuBar.js

@@ -8,24 +8,28 @@ import { fileURLToPath } from 'url';
 import { enable } from "@electron/remote/main/index.js";
 const router = express.Router();
 router.post("/label", (req, res) => {
+    var _a;
     res.sendStatus(200);
     const { label } = req.body;
-    state.tray.setTitle(label);
+    (_a = state.tray) === null || _a === void 0 ? void 0 : _a.setTitle(label);
 });
 router.post("/tooltip", (req, res) => {
+    var _a;
     res.sendStatus(200);
     const { tooltip } = req.body;
-    state.tray.setToolTip(tooltip);
+    (_a = state.tray) === null || _a === void 0 ? void 0 : _a.setToolTip(tooltip);
 });
 router.post("/icon", (req, res) => {
+    var _a;
     res.sendStatus(200);
     const { icon } = req.body;
-    state.tray.setImage(icon);
+    (_a = state.tray) === null || _a === void 0 ? void 0 : _a.setImage(icon);
 });
 router.post("/context-menu", (req, res) => {
+    var _a;
     res.sendStatus(200);
     const { contextMenu } = req.body;
-    state.tray.setContextMenu(buildMenu(contextMenu));
+    (_a = state.tray) === null || _a === void 0 ? void 0 : _a.setContextMenu(buildMenu(contextMenu));
 });
 router.post("/show", (req, res) => {
     res.sendStatus(200);

resources/js/electron-plugin/src/server/api/menuBar.ts

@@ -14,31 +14,31 @@ router.post("/label", (req, res) => {
 
     const { label } = req.body;
 
-    state.tray.setTitle(label);
+    state.tray?.setTitle(label);
 });
 
 router.post("/tooltip", (req, res) => {
     res.sendStatus(200);
 
     const { tooltip } = req.body;
 
-    state.tray.setToolTip(tooltip);
+    state.tray?.setToolTip(tooltip);
 });
 
 router.post("/icon", (req, res) => {
     res.sendStatus(200);
 
     const { icon } = req.body;
 
-    state.tray.setImage(icon);
+    state.tray?.setImage(icon);
 });
 
 router.post("/context-menu", (req, res) => {
     res.sendStatus(200);
 
     const { contextMenu } = req.body;
 
-    state.tray.setContextMenu(buildMenu(contextMenu));
+    state.tray?.setContextMenu(buildMenu(contextMenu));
 });
 
 router.post("/show", (req, res) => {

src/Traits/CopiesToBuildDirectory.php

@@ -111,7 +111,7 @@ public function copyToBuildDirectory(): bool
             } catch (Throwable $e) {
                 warning('[WARNING] '.$e->getMessage());
             }
-            
+
             if (PHP_OS_FAMILY !== 'Windows') {
                 $perms = fileperms($item->getPathname());
                 if ($perms !== false) {