Merge branch 'main' into render-hooks

* main: (86 commits) Update feature list Revert "Changing cachet media color dark to light" (#149) Changing cachet media color dark to light (#148) Adjust header padding for improved responsiveness (#146) Add comment Update development docs Update README.md Seed the default accents Compile Assets Accent Colors (#143) Remove unused `spatie/laravel-ray` dependency Configure run-tests on and schedule Run tests across MySQL, Postgres and SQLite (#142) Fix code styling Fix fetching of incident and schedule updateables Fix code styling Change integer types for status columns Compile Assets Update API endpoint descriptions Compile Assets ...
cachethq · Dec 22, 2024 · 5f9ebfb · 5f9ebfb
2 parents 21c1b89 + de91bbb
commit 5f9ebfb
Show file tree

Hide file tree

Showing 216 changed files with 4,184 additions and 1,883 deletions.
diff --git a/.github/DEPENDABOT.yml b/.github/DEPENDABOT.yml
@@ -3,8 +3,8 @@ updates:
   - package-ecosystem: composer
     directory: "/"
     schedule:
-      interval: weekly
-      day: monday
+      interval: daily
+      time: "07:00"
     groups:
       php-dependencies:
         update-types:

diff --git a/.github/workflows/compile-assets.yml b/.github/workflows/compile-assets.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php }}
+          php-version: 8.3
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
           coverage: none
 
@@ -27,7 +27,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
 
       - name: Install NPM dependencies
         run: npm ci

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -1,19 +1,25 @@
 name: run-tests
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+      - '*.x'
+  pull_request:
+  schedule:
+    - cron: '0 0 * * *'
 
 jobs:
-  test:
-    runs-on: ${{ matrix.os }}
+  static-analysis:
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
         php: [8.3, 8.2]
         laravel: [11.x]
         stability: [prefer-lowest, prefer-stable]
 
-    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
+    name: Static Analysis - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }}
 
     steps:
       - name: Checkout code
@@ -26,10 +32,48 @@ jobs:
           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
+      - name: Install dependencies
         run: |
-          echo "::add-matcher::${{ runner.tool_cache }}/php.json"
-          echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+          composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
+          composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+
+      - name: Run PHPStan
+        run: vendor/bin/phpstan --error-format=github
+
+  mysql:
+    runs-on: ubuntu-latest
+
+    services:
+      mysql:
+        image: mysql:8.0
+        env:
+          MYSQL_ROOT_PASSWORD: root
+          MYSQL_DATABASE: cachet
+          MYSQL_USER: cachet
+          MYSQL_PASSWORD: password
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [8.3, 8.2]
+        laravel: [11.x]
+        stability: [prefer-lowest, prefer-stable]
+
+    name: Tests - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - MySQL 8.0
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - 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: Install dependencies
         run: |
@@ -47,3 +91,120 @@ jobs:
 
       - name: Execute tests
         run: composer test
+        env:
+          DB_CONNECTION: mysql
+          DB_HOST: localhost
+          DB_DATABASE: cachet
+          DB_USERNAME: cachet
+          DB_PASSWORD: password
+
+  postgres:
+    runs-on: ubuntu-latest
+
+    services:
+      postgres:
+        image: postgres:13
+        env:
+          POSTGRES_DB: cachet
+          POSTGRES_USER: cachet
+          POSTGRES_PASSWORD: password
+        ports:
+          - 5432:5432
+        options: --health-cmd="pg_isready" --health-interval=10s --health-timeout=5s --health-retries=3
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [ 8.3, 8.2 ]
+        laravel: [ 11.x ]
+        stability: [ prefer-lowest, prefer-stable ]
+
+    name: Tests - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - PostgreSQL 13
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - 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: Install dependencies
+        run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
+          composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+
+      - name: Install frontend dependencies
+        run: npm ci
+
+      - name: Build assets
+        run: npm run build
+
+      - name: Build tests environment
+        run: composer build
+
+      - name: Execute tests
+        run: composer test
+        env:
+          DB_CONNECTION: mysql
+          DB_HOST: localhost
+          DB_DATABASE: cachet
+          DB_USERNAME: cachet
+          DB_PASSWORD: password
+
+  sqlite:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [ 8.3, 8.2 ]
+        laravel: [ 11.x ]
+        stability: [ prefer-lowest, prefer-stable ]
+
+    name: Tests - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - SQLite
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - 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: Install dependencies
+        run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
+          composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+
+      - name: Install frontend dependencies
+        run: npm ci
+
+      - name: Build assets
+        run: npm run build
+
+      - name: Build tests environment
+        run: composer build
+
+      - name: Execute tests
+        run: composer test
+
+  check:
+    if: always()
+    needs:
+      - static-analysis
+      - mysql
+      - postgres
+      - sqlite
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check if all jobs are passing
+        uses: re-actors/alls-green@release/v1
+        with:
+          jobs: ${{ toJSON(needs) }}
diff --git a/README.md b/README.md
@@ -18,9 +18,6 @@
     <a href="https://packagist.org/packages/cachethq/core">
         <img src="https://img.shields.io/packagist/v/cachethq/core" alt="Latest Stable Version">
     </a>
-    <a href="https://packagist.org/packages/cachethq/core">
-        <img src="https://img.shields.io/github/license/cachethq/core" alt="License">
-    </a>
 </p>
 
 ## Introduction
@@ -34,8 +31,7 @@ Cachet 3.x is currently in development and is not yet completely ready for produ
 - [x] Incident Management
 - [x] Incident Updates
 - [x] Scheduled Maintenance
-- [ ] Scheduled Maintenance Updates
-  - WIP - https://github.com/cachethq/core/pull/109
+- [x] Scheduled Maintenance Updates
 - [x] Components
 - [ ] Metrics
   - API and dashboard are working.
@@ -46,7 +42,9 @@ Cachet 3.x is currently in development and is not yet completely ready for produ
 - [ ] Webhooks
 - [x] Dashboard
 - [x] Localization
-- [ ] Status Page Customization
+- [x] Status Page Customization
+- [ ] Meta
+- [ ] Tags
 
 ## Stack
 
@@ -59,17 +57,7 @@ Cachet is built on:
 
 ## Development
 
-1. Clone this repository.
-2. Run the following commands from within the `core` directory:
-    ```shell
-   npm install
-   composer update
-   composer dev
-    ```
-3. Develop Cachet.
-
-> [!NOTE] 
-> HMR is not enabled. Manual refreshes are needed to view changes.
+To get started developing Cachet, please check out the [Development Guide](https://docs.cachethq.io/v3.x/development).
 
 ### Dashboard Credentials
 
@@ -84,7 +72,7 @@ Login to the account at `/dashboard` and use credentials:
 <p align="center">
     <a href="https://jump24.co.uk"><img width="100px" src="https://github.com/jumptwentyfour.png" alt="Jump24"></a>
     <a href="https://dreamtilt.com.au"><img width="100px" src="https://github.com/dreamtilt.png" alt="Dreamtilt"></a>
-    <a href="https://xyhen-it.nl"><img width="100px" src="https://github.com/xyphen-it.png" alt="Xyphen-IT"></a>
+    <a href="https://xyphen-it.nl"><img width="100px" src="https://github.com/xyphen-it.png" alt="Xyphen-IT"></a>
 </p>
 
 ## Security Vulnerabilities

diff --git a/TRADEMARKS.md b/TRADEMARKS.md
@@ -19,7 +19,7 @@ Whenever you use one of our marks, you must always do so in a way that does not
 
 Do not use the Cachet marks in any way that could mistakenly imply that Cachet has reviewed, approved or guaranteed your goods or services. You also cannot use our logo on your website in a way that suggests that your website is an official website or that we endorse your website. You can, though, say you like the Cachet software, that you use Cachet, that the analytics are powered by Cachet or that you participate in the Cachet community.
 
-Do not use the "tl" prefix in a way that could mistakenly imply that your product is related to Cachet. For example, an analytics product that uses Cachet should not use the name "tlanalytics".
+Do not use the "Cachet" prefix in a way that could mistakenly imply that your product is related to Cachet. For example, an analytics product that uses Cachet should not use the name "cachetanalytics".
 
 You may not use or register our marks or variations of them as part of your trademark, business, product, service, app, domain name, social media account or business indicator. You may not use our marks as a part of an advertising campaign. You may not display Cachet trademarks more prominently than your product, service or company name. You may not use Cachet trademarks on merchandise for sale (e.g., selling t-shirts, mugs, etc).
 
@@ -61,6 +61,6 @@ To request the use of the trademarks in a manner or for a purpose not expressly
 
 If you want to report misuse of a Cachet trademark, please email [[email protected]](mailto:[email protected]).
 
-Last updated: October 30 2024
+Last updated: November 25 2024
 
 These guidelines are based on the Model Trademark Guidelines, available at http://www.modeltrademarkguidelines.org., used under a Creative Commons Attribution 3.0 Unported license: https://creativecommons.org/licenses/by/3.0/deed.en_US
diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
         "laravel"
     ],
     "homepage": "https://cachethq.io",
-    "license": "Cachet License",
+    "license": "proprietary",
     "support": {
         "issues": "https://github.com/cachethq/core/issues",
         "source": "https://github.com/cachethq/core"
@@ -21,27 +21,28 @@
     "require": {
         "php": "^8.2",
         "doctrine/dbal": "^3.6",
-        "filament/filament": "^3.2.23",
+        "filament/filament": "^3.2.57",
         "filament/spatie-laravel-settings-plugin": "^3.2",
         "guzzlehttp/guzzle": "^7.8",
-        "illuminate/console": "^11.0",
-        "illuminate/database": "^11.0",
-        "illuminate/events": "^11.0",
-        "illuminate/queue": "^11.0",
-        "illuminate/support": "^11.0",
+        "illuminate/console": "^11.23.0",
+        "illuminate/database": "^11.23.0",
+        "illuminate/events": "^11.23.0",
+        "illuminate/queue": "^11.23.0",
+        "illuminate/support": "^11.23.0",
         "nesbot/carbon": "^2.70",
+        "spatie/laravel-data": "^4.11",
         "spatie/laravel-query-builder": "^5.5",
         "spatie/laravel-settings": "^3.2",
         "timacdonald/json-api": "^v1.0.0-beta.4",
         "twig/twig": "^3.0"
     },
     "require-dev": {
+        "larastan/larastan": "^3.0",
         "laravel/pail": "^1.1",
         "orchestra/testbench": "^9.5.1",
         "pestphp/pest": "^3.2",
         "pestphp/pest-plugin-laravel": "^3.0",
-        "pestphp/pest-plugin-livewire": "*",
-        "spatie/laravel-ray": "^1.32"
+        "pestphp/pest-plugin-livewire": "*"
     },
     "autoload": {
         "psr-4": {
@@ -53,6 +54,7 @@
     "autoload-dev": {
         "psr-4": {
             "Cachet\\Tests\\": "tests",
+            "Cachet\\Database\\Factories\\": "database/factories",
             "Workbench\\App\\": "workbench/app/",
             "Workbench\\Database\\Factories\\": "workbench/database/factories/",
             "Workbench\\Database\\Seeders\\": "workbench/database/seeders/"

diff --git a/config/cachet.php b/config/cachet.php
@@ -33,7 +33,7 @@
      | This is the model that will be used to authenticate users. This model
      | must be an instance of Illuminate\Foundation\Auth\User.
      */
-    'user_model' => App\Models\User::class,
+    'user_model' => \App\Models\User::class,
 
     /*
      |--------------------------------------------------------------------------