Merge develop into stable

.dockerignore

@@ -1,27 +1,19 @@
-/.dockerignore
-/.editorconfig
-/.env*
-/public/storage
-/.git*
-/.idea*
-/.phpstorm.meta.php
-/.pre-commit-config.yaml
-/.styleci.yml
-/.travis.yml
-/_ide_helper.php
-/Dockerfile
-/node_modules
-/package-*.json
-/phpunit.xml
-/phpunit.dusk.xml
-/resources/js
-/resources/sass
-/server.php
-/storage/debugbar/*
-/storage/framework/cache/data/*
-/storage/framework/sessions/*
-/storage/framework/testing/*
-/storage/framework/views/*
-/tests/
-/vendor/
-/webpack.mix.js
+.dockerignore
+.editorconfig
+.env*
+.git*
+.idea*
+.pre-commit-config.yaml
+.styleci.yml
+Dockerfile
+node_modules
+phpunit.dusk.xml
+phpunit.xml
+public/hot
+public/storage
+server.php
+README.md
+CONTRIBUTING.md
+storage/*
+tests
+vendor

.editorconfig

@@ -11,5 +11,3 @@ trim_trailing_whitespace = true
 [*.md]
 trim_trailing_whitespace = false
 
-[*.{yml,yaml}]
-indent_size = 4

.github/ISSUE_TEMPLATE/bug_report.md

@@ -13,6 +13,9 @@ assignees: ''
 <!-- Run `docker images zeropingheroes/lanager` and paste the output -->
 <!-- You must be using the LANager Docker image to receive support. -->
 
+**Docker logs**
+<!-- Run `docker logs lanager` and paste the output -->
+
 **Bug description**
 <!-- Describe the issue you are experiencing -->
 

.github/workflows/run-dusk.yml → .github/workflows/browser-tests.yml

@@ -1,4 +1,4 @@
-name: Laravel Dusk
+name: Browser Tests
 
 on:
     push:
@@ -11,7 +11,7 @@ on:
 
 jobs:
     dusk:
-        name: Test with Laravel Dusk
+        name: Run Laravel Dusk
         runs-on: ubuntu-latest
         env:
             APP_NAME: LANager
@@ -48,13 +48,22 @@ jobs:
             -   name: Set up PHP
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: '8.3'
+                    php-version: '8.4'
                     extensions: xmlwriter, zip, pdo, pdo_mysql, tokenizer, simplexml, bcmath, fileinfo
                     ini-values: error_reporting=22527
 
             -   name: Install Composer dependencies
                 run: composer install --optimize-autoloader --no-interaction --no-progress --no-scripts
 
+            -   name: Setup Node
+                uses: actions/setup-node@v6
+
+            -   name: Install Node dependencies
+                run: npm ci
+
+            -   name: Build project
+                run: npm run build
+
             -   name: Link Laravel storage directory
                 run: php artisan storage:link
 
@@ -68,7 +77,7 @@ jobs:
                 run: php artisan dusk:chrome-driver `/opt/google/chrome/chrome --version | cut -d " " -f3 | cut -d "." -f1`
 
             -   name: Start Chrome Driver
-                run: ./vendor/laravel/dusk/bin/chromedriver-linux &
+                run: ./vendor/laravel/dusk/bin/chromedriver-linux --port=9515 &
 
             -   name: Create empty .env file
                 run: touch .env
@@ -86,13 +95,20 @@ jobs:
                     name: browser-screenshots
                     path: storage/logs/dusk/screenshots
 
-            -   name: Upload Console Logs
+            -   name: Upload Browser Console Logs
                 uses: actions/upload-artifact@v4
                 if: failure()
                 with:
                     name: console-logs
                     path: storage/logs/dusk/console
 
+            -   name: Upload Page Source
+                uses: actions/upload-artifact@v4
+                if: failure()
+                with:
+                    name: page-source
+                    path: storage/logs/dusk/source
+
             -   name: Upload Laravel Log
                 uses: actions/upload-artifact@v4
                 with:

.github/workflows/docker-image-dev.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
     build-and-push-docker-image:
-        name: Build Docker image and push to Docker hub
+        name: Build and push
         runs-on: ubuntu-latest
         steps:
             -   name: Set up Docker Buildx

.github/workflows/docker-image.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
     build-and-push-docker-image:
-        name: Build Docker image and push to Docker hub
+        name: Build and push
         runs-on: ubuntu-latest
         steps:
             -   name: Set up Docker Buildx

.github/workflows/php-code-style.yml

@@ -0,0 +1,28 @@
+name: PHP Code Style
+
+on: [push]
+
+jobs:
+    laravel-pint:
+        name: Run Laravel Pint
+        runs-on: ubuntu-latest
+        strategy:
+            fail-fast: true
+            matrix:
+                php: [8.4]
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v5
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ matrix.php }}
+                  tools: pint
+
+            - name: Run Pint
+              run: pint
+
+            - name: Commit linted files
+              uses: stefanzweifel/git-auto-commit-action@v6

.gitignore

@@ -25,3 +25,4 @@ yarn-error.log
 /.php-cs-fixer.cache
 /storage/*.bucket
 /*.tar.gz
+/resources/lang/php_*.json

Dockerfile

@@ -1,4 +1,4 @@
-FROM composer:2.7 AS composer2
+FROM composer:2.9 AS composer2
 
 # Copy in project code
 COPY . /app
@@ -10,35 +10,78 @@ RUN composer install \
   --no-progress \
   --no-scripts
 
-FROM trafex/php-nginx:3.6.0 AS base
+FROM node:22-alpine AS node22
 
-USER root
+WORKDIR /app
+
+# Copy in package manifest
+COPY package.json package-lock.json /app/
+
+# Install
+RUN npm clean-install && npm cache clean --force
+
+# Copy in project code
+COPY . /app/
+
+# Build
+RUN npm run build
+
+FROM dunglas/frankenphp:1-php8.4-alpine AS base
 
 # Install PHP extensions
-RUN apk --no-cache add php83-zip=8.3.10-r0 \
-                       php83-pdo=8.3.10-r0 \
-                       php83-pdo_mysql=8.3.10-r0 \
-                       php83-simplexml=8.3.10-r0 \
-                       php83-bcmath=8.3.10-r0
+RUN install-php-extensions \
+    pcntl \
+    zip \
+    pdo_mysql \
+    simplexml \
+    bcmath \
+    gmp
 
 # Copy in app code and Composer packages from composer2 build stage
-COPY --chown=nginx --from=composer2 /app /var/www/lanager
+COPY --from=composer2 /app /app
+
+# Copy in built assets from node22 build stage
+COPY --from=node22 /app/public/build /app/public/build/
+
+# Copy entry point
+COPY docker/entrypoint.sh /app/docker/entrypoint.sh
+
+# Set a username to use in the image
+ARG APP_USER=lanager
+ARG APP_UID=1000
+ARG APP_GID=1000
+
+# Use PHP configuration for production
+# Remove default FrankenPHP capabilities
+# Create non-root image user and group
+# Give the user write access to caddy and Laravel bootstrap directories
+# Ensure the entrypoint script is present and executable
+RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" \
+    && setcap -r /usr/local/bin/frankenphp \
+    && addgroup -g "${APP_GID}" "${APP_USER}" \
+    && adduser -D -u "${APP_UID}" -G "${APP_USER}" "${APP_USER}" \
+    && chown -R "${APP_USER}":"${APP_USER}" /config/caddy /data/caddy /app/bootstrap/cache \
+    && chmod -R ug+rwX /app/bootstrap/cache \
+    && ln -sfn /app/storage/app/public /app/public/storage \
+    && chmod +x /app/docker/entrypoint.sh
 
-RUN chmod -R 777 /var/www/lanager/storage /var/www/lanager/bootstrap/cache && \
-    ln -s /var/www/lanager/storage/app/public /var/www/lanager/public/storage
+# Switch to non-root user
+USER ${APP_USER}
 
-WORKDIR /var/www/lanager
+HEALTHCHECK --start-period=10s --start-interval=1s --interval=30s --timeout=10s --retries=3 \
+        CMD curl --insecure --silent --location --show-error --fail http://localhost:8000/up || exit 1
 
-# Change to non-privileged user
-USER nobody
+ENTRYPOINT ["/app/docker/entrypoint.sh"]
+CMD ["php", "artisan", "octane:frankenphp"]
 
 FROM base AS dev
 
-# Temporary switch to root
+# Switch to root user
 USER root
 
-# Install xdebug
-RUN apk --no-cache add php83-pecl-xdebug=3.3.2-r0
+# Install xdebug & switch to development PHP configuration
+RUN install-php-extensions xdebug \
+    && mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini"
 
-# Switch back to non-root user
-USER nobody
+# Switch to non-root user
+USER ${APP_USER}