Merge branch 'main' into advanced-component-group-ordering

Author: jbrooksuk

.github/workflows/build-api-docs.yml

@@ -30,7 +30,7 @@ jobs:
         run: |
           composer config repositories.scramble-pro '{"type": "composer", "url": "https://satis.dedoc.co"}'
           composer config http-basic.satis.dedoc.co ${{ secrets.SCRAMBLE_USERNAME }} ${{ secrets.SCRAMBLE_KEY }}
-          composer require dedoc/scramble-pro:0.7.0-alpha.1 --dev
+          composer require dedoc/scramble-pro:^0.7.4 --dev
 
       - name: Checkout documentation repository
         uses: actions/checkout@v4

.github/workflows/run-tests.yml

@@ -30,7 +30,7 @@ jobs:
         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
+          coverage: xdebug
 
       - name: Install dependencies
         run: |
@@ -73,7 +73,7 @@ jobs:
         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
+          coverage: xdebug
 
       - name: Install dependencies
         run: |
@@ -130,7 +130,7 @@ jobs:
         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
+          coverage: xdebug
 
       - name: Install dependencies
         run: |
@@ -187,7 +187,7 @@ jobs:
         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
+          coverage: xdebug
 
       - name: Install dependencies
         run: |
@@ -244,7 +244,7 @@ jobs:
         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
+          coverage: xdebug
 
       - name: Install dependencies
         run: |
@@ -289,7 +289,7 @@ jobs:
         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
+          coverage: xdebug
 
       - name: Install dependencies
         run: |

composer.json

@@ -41,13 +41,15 @@
         "twig/twig": "^3.0"
     },
     "require-dev": {
-        "dedoc/scramble": "0.12.0-alpha.1",
-        "larastan/larastan": "^3.0",
+        "dedoc/scramble": "^0.12.11",
+        "larastan/larastan": "^3.4",
         "laravel/pail": "^1.1",
+        "laravel/pint": "^1.21",
         "orchestra/testbench": "^9.5.1",
         "pestphp/pest": "^3.2",
         "pestphp/pest-plugin-laravel": "^3.0",
-        "pestphp/pest-plugin-livewire": "*"
+        "pestphp/pest-plugin-livewire": "*",
+        "pestphp/pest-plugin-type-coverage": "^3.3"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
@@ -102,6 +104,13 @@
         "start": [
             "@dev"
         ],
-        "test": "vendor/bin/pest"
+        "test:lint": [
+            "pint --test"
+        ],
+        "test:unit": "pest --parallel --processes=10 --ci --coverage --compact",
+        "test": [
+            "@test:lint",
+            "@test:unit"
+        ]
     }
 }

config/cachet.php

@@ -77,6 +77,8 @@
         'api',
     ],
 
+    'trusted_proxies' => env('CACHET_TRUSTED_PROXIES', ''),
+
     /*
      |--------------------------------------------------------------------------
      | Cachet API Rate Limit (attempts per minute)
@@ -142,6 +144,7 @@
         'de_CH' => 'Deutsch (CH)',
         'en' => 'English',
         'en_GB' => 'English (UK)',
+        'es_ES' => 'Spanish (ES)',
         'nl' => 'Nederlands',
         'pt_BR' => 'Português (BR)',
         'zh_CN' => '简体中文',
@@ -160,6 +163,16 @@
      */
     'demo_mode' => env('CACHET_DEMO_MODE', false),
 
+    /*
+     |--------------------------------------------------------------------------
+     | Cachet Blog Feed
+     |--------------------------------------------------------------------------
+     |
+     | This is the URI to the Cachet blog feed. This is used to display
+     | the latest blog posts on the status page. By default, this is
+     | set to the public Cachet blog feed.
+     |
+     */
     'feed' => [
         'uri' => env('CACHET_FEED_URI', 'https://blog.cachethq.io/rss'),
         'cache' => env('CACHET_FEED_CACHE', 3600),

database/migrations/2025_03_02_172736_add_default_to_preferred_locale_column_in_users_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('preferred_locale')->nullable()->default('en')->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('preferred_locale')->nullable()->default(null)->change();
+        });
+    }
+};

package-lock.json

@@ -13,5 +13,6 @@
   </source>
   <php>
     <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
+    <env name="NIGHTWATCH_ENABLED" value="false"/>
   </php>
 </phpunit>

phpunit.xml.dist

@@ -1,11 +1,11 @@
 {
   "resources/css/cachet.css": {
-    "file": "assets/cachet-BXLEFZKk.css",
+    "file": "assets/cachet-DLsIp4L3.css",
     "src": "resources/css/cachet.css",
     "isEntry": true
   },
   "resources/css/dashboard/theme.css": {
-    "file": "assets/theme-CYlkUfJB.css",
+    "file": "assets/theme-DIwmyXTE.css",
     "src": "resources/css/dashboard/theme.css",
     "isEntry": true
   },