Merge remote-tracking branch 'origin/main' into feat/regions

Author: KilianTrunk

.github/workflows/test-runner.yml

@@ -19,23 +19,28 @@ permissions:
 jobs:
   test:
 
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
 
-    # Define the matrix of different PHP and dependency versions
+    # Define the matrix of different PHP, Laravel, and testbench versions
     strategy:
       # Fail the whole workflow if one of the jobs fails
       fail-fast: true
       matrix:
-        os: [ ubuntu-latest ]
         php: [ 8.2, 8.3, 8.4 ]
-        dependency-version: [ prefer-lowest, prefer-stable ]
-
-    name: ${{ matrix.os }} / PHP ${{ matrix.php }} / ${{ matrix.dependency-version }}
+        laravel: [ 11.*, 12.* ]
+        dependency-version: [ prefer-stable ]
+        include:
+          # Laravel 12 uses Orchestra Testbench 10
+          - laravel: 12.*
+            testbench: 10.*
+          # Laravel 11 uses Orchestra Testbench 9
+          - laravel: 11.*
+            testbench: 9.*
+    name: PHP ${{ matrix.php }} / L${{ matrix.laravel }} / ${{ matrix.dependency-version }}
 
     steps:
 
       #- name: Configure operating system
-      #  if: matrix.os == 'ubuntu-latest'
       #  run: sudo apt-get update && sudo apt-get install -y locales locales-all
 
       - name: Checkout code
@@ -51,7 +56,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: vendor
-          key: ${{ runner.os }}-php-${{ matrix.php }}-${{ matrix.dependency-version }}-${{ hashFiles('**/composer.lock') }}
+          key: php-${{ matrix.php }}-laravel-${{ matrix.laravel }}-${{ matrix.dependency-version }}-${{ hashFiles('**/composer.lock') }}
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -61,14 +66,16 @@ jobs:
           # extensions: mbstring, gd, intl
 
       - name: Install dependencies
-        run: composer update --prefer-dist --no-progress --${{ matrix.dependency-version }}
+        run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "filament/support" --no-interaction --no-update
+          composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress --no-interaction
 
       - name: Run test suite
         run: composer test -- --coverage-clover ./coverage.xml
 
       - name: Upload coverage reports to Codecov
         # Make sure the Codecov action is only executed once
-        if: matrix.os == 'ubuntu-latest' && matrix.php == '8.2' && matrix.dependency-version == 'prefer-stable'
+        if: matrix.php == '8.2' && matrix.laravel == '12.*' && matrix.dependency-version == 'prefer-stable'
         uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

composer.json

@@ -45,12 +45,12 @@
         "datalinx/php-utils": "^2.5",
         "eclipsephp/common": "dev-main",
         "filament/filament": "^3.3",
-        "laravel/framework": "^11.0",
+        "laravel/framework": "^11.0|^12.0",
         "spatie/laravel-package-tools": "^1.19"
     },
     "require-dev": {
         "laravel/pint": "^1.21",
-        "orchestra/testbench": "^9.9",
+        "orchestra/testbench": "^9.9|^10.0",
         "pestphp/pest": "^3.7",
         "pestphp/pest-plugin-livewire": "^3.0"
     },

src/Filament/Clusters/World.php

@@ -8,8 +8,6 @@ class World extends Cluster
 {
     protected static ?string $navigationIcon = 'heroicon-s-map';
 
-    protected static ?string $navigationGroup = 'Configuration';
-
     public static function getNavigationLabel(): string
     {
         return __('eclipse-world::cluster.label');
@@ -19,4 +17,9 @@ public static function getClusterBreadcrumb(): ?string
     {
         return self::getNavigationLabel();
     }
+
+    public static function getNavigationGroup(): ?string
+    {
+        return __('eclipse-common::nav.configuration');
+    }
 }