Merge branch 'main' into feat/pest-v4-upgrade-and-testing-improvements

Author: SlimDeluxe

.github/workflows/linter.yml

@@ -20,14 +20,17 @@ jobs:
     steps:
 
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6.0.2
         with:
-          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+          # Checkout the actual branch, not a specific commit
+          ref: ${{ github.head_ref || github.ref_name }}
+          # Fetch the full history to avoid shallow clone issues
+          fetch-depth: 0
 
       - name: Run Laravel Pint
         uses: aglipanci/laravel-pint-action@latest
 
       - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v5
+        uses: stefanzweifel/git-auto-commit-action@v7.1.0
         with:
           commit_message: "style: fix code style"

.github/workflows/test-runner.yml

@@ -24,7 +24,7 @@ jobs:
       # Fail the whole workflow if one of the jobs fails
       fail-fast: true
       matrix:
-        php: [ 8.3, 8.4 ]
+        php: [ 8.3, 8.4, 8.5 ]
         laravel: [ 11.*, 12.* ]
         dependency-version: [ prefer-stable ]
         shard: [ 1, 2, 3, 4 ]
@@ -43,7 +43,7 @@ jobs:
       #  run: sudo apt-get update && sudo apt-get install -y locales locales-all
 
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6.0.2
         with:
           ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
 
@@ -75,7 +75,7 @@ jobs:
 
       - name: Cache Composer packages
         id: composer-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v5.0.5
         with:
           path: vendor
           key: php-${{ matrix.php }}-laravel-${{ matrix.laravel }}-${{ matrix.dependency-version }}-${{ hashFiles('**/composer.lock') }}
@@ -110,8 +110,9 @@ jobs:
       - name: Upload coverage reports to Codecov
         # Make sure the Codecov action is only executed once
         if: matrix.php == '8.3' && matrix.laravel == '12.*' && matrix.dependency-version == 'prefer-stable' && matrix.shard == 1
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v6.0.0
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:
-          token: ${{ secrets.CODECOV_TOKEN }}
           files: ./coverage.xml
           verbose: true

.lando.dist.yml

@@ -8,14 +8,13 @@ config:
   database: mariadb:10.11
 services:
   appserver:
-    type: php:custom
     xdebug: "debug,develop,coverage"
     environment:
       TZ: "Europe/Ljubljana"
       APP_BASE_PATH: "/app/workbench"
       TESTBENCH_WORKING_PATH: "/app"
     overrides:
-      image: slimdeluxe/php:8.3-v1.3
+      image: slimdeluxe/php:8.3-v1.4
       platform: linux/amd64
     run:
       - composer install --no-interaction --prefer-dist

composer.json

@@ -40,7 +40,7 @@
         }
     },
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
         "bezhansalleh/filament-shield": "^4.0",
         "datalinx/php-utils": "^2.5",
         "eclipsephp/common": "dev-main",
@@ -85,6 +85,7 @@
             "@php vendor/bin/testbench key:generate --ansi",
             "npm install",
             "@php vendor/bin/testbench vendor:publish --tag='filament-shield-config'",
+            "@php vendor/bin/testbench vendor:publish --tag='eclipse-common-config'",
             "@php vendor/bin/testbench filament:assets",
             "@php vendor/bin/testbench package:sync-skeleton"
         ]

config/filament-shield.php

@@ -1,5 +1,8 @@
 <?php
 
+use Eclipse\Core\Models\Site;
+use Eclipse\Core\Models\User;
+
 return [
     'shield_resource' => [
         'slug' => 'shield/roles',
@@ -13,9 +16,9 @@
         ],
     ],
 
-    'tenant_model' => \Eclipse\Core\Models\Site::class,
+    'tenant_model' => Site::class,
 
-    'auth_provider_model' => \Eclipse\Core\Models\User::class,
+    'auth_provider_model' => User::class,
 
     'super_admin' => [
         'enabled' => true,

env/php-8.3/.lando.dist.yml env/php-8.4/.lando.dist.ymlenv/php-8.3/.lando.dist.yml renamed to env/php-8.4/.lando.dist.yml

@@ -1,11 +1,11 @@
-name: eclipse-world-8.3
+name: eclipse-world-8.4
 services:
   appserver:
-    type: php:custom
+    type: php:8.4
     via: cli
     app_mount: delegated
     overrides:
-      image: slimdeluxe/php:8.3-v1.0
+      image: slimdeluxe/php:8.4-v1.4
       volumes:
         # Mount the project root directory to /app
         - "../..:/app"

env/php-8.3/composer.json env/php-8.4/composer.jsonenv/php-8.3/composer.json renamed to env/php-8.4/composer.json

@@ -0,0 +1,30 @@
+name: eclipse-world-8.5
+services:
+  appserver:
+    type: php:8.5
+    via: cli
+    app_mount: delegated
+    overrides:
+      image: slimdeluxe/php:8.5-v1.4
+      volumes:
+        # Mount the project root directory to /app
+        - "../..:/app"
+        # Prevent the source vendor directory to be mounted
+        - /app/vendor
+        # Make available the source composer.json to be used by the merged one
+        - "../../composer.json:/usr/local/src/composer.json"
+        # Use the merged composer.json instead of the source one
+        - "./composer.json:/app/composer.json"
+tooling:
+  php:
+    service: appserver
+  composer:
+    service: appserver
+  test:
+    service: appserver
+    description: Run tests
+    cmd: "composer run-script test"
+  testbench:
+    service: appserver
+    description: Run testbench CLI
+    cmd: "vendor/bin/testbench"

env/php-8.5/.lando.dist.yml

@@ -0,0 +1,41 @@
+{
+    "name": "eclipsephp/world-plugin",
+    "require": {
+        "wikimedia/composer-merge-plugin": "dev-master"
+    },
+    "extra": {
+        "merge-plugin": {
+            "require": [
+                "/usr/local/src/composer.json"
+            ],
+            "merge-scripts": true
+        },
+        "laravel": {
+            "providers": [
+                "Eclipse\\World\\EclipseWorldServiceProvider"
+            ]
+        }
+    },
+    "config": {
+        "lock": false,
+        "allow-plugins": {
+            "wikimedia/composer-merge-plugin": true,
+            "pestphp/pest-plugin": true
+        }
+    },
+    "autoload": {
+        "psr-4": {
+            "Eclipse\\World\\": "src/",
+            "Eclipse\\World\\Factories\\": "database/factories/",
+            "Eclipse\\World\\Seeders\\": "database/seeders/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\": "tests/",
+            "Workbench\\App\\": "workbench/app/",
+            "Workbench\\Database\\Factories\\": "workbench/database/factories/",
+            "Workbench\\Database\\Seeders\\": "workbench/database/seeders/"
+        }
+    }
+}