Merge branch 'main' of https://github.com/cachethq/core into 106-webh…

…ooks
cachethq · Jan 9, 2025 · 909fb2d · 909fb2d
2 parents e99e3a2 + b385770
commit 909fb2d
Show file tree

Hide file tree

Showing 84 changed files with 712 additions and 441 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -98,7 +98,7 @@ jobs:
           DB_USERNAME: cachet
           DB_PASSWORD: password
 
-  postgres:
+  postgres13:
     runs-on: ubuntu-latest
 
     services:
@@ -155,6 +155,120 @@ jobs:
           DB_USERNAME: cachet
           DB_PASSWORD: password
 
+  postgres14:
+    runs-on: ubuntu-latest
+
+    services:
+      postgres:
+        image: postgres:14
+        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 14
+
+    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
+
+  postgres15:
+    runs-on: ubuntu-latest
+
+    services:
+      postgres:
+        image: postgres:15
+        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 15
+
+    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:
@@ -199,7 +313,9 @@ jobs:
     needs:
       - static-analysis
       - mysql
-      - postgres
+      - postgres13
+      - postgres14
+      - postgres15
       - sqlite
     runs-on: ubuntu-latest
 

diff --git a/composer.json b/composer.json
@@ -1,23 +1,23 @@
 {
     "name": "cachethq/core",
     "description": "Cachet core package.",
+    "license": "proprietary",
     "keywords": [
         "cachet",
         "status page",
         "laravel"
     ],
-    "homepage": "https://cachethq.io",
-    "license": "proprietary",
-    "support": {
-        "issues": "https://github.com/cachethq/core/issues",
-        "source": "https://github.com/cachethq/core"
-    },
     "authors": [
         {
             "name": "James Brooks",
             "email": "[email protected]"
         }
     ],
+    "homepage": "https://cachethq.io",
+    "support": {
+        "issues": "https://github.com/cachethq/core/issues",
+        "source": "https://github.com/cachethq/core"
+    },
     "require": {
         "php": "^8.2",
         "doctrine/dbal": "^3.6",
@@ -45,6 +45,8 @@
         "pestphp/pest-plugin-laravel": "^3.0",
         "pestphp/pest-plugin-livewire": "*"
     },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "autoload": {
         "psr-4": {
             "Cachet\\": "src",
@@ -54,38 +56,18 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Cachet\\Tests\\": "tests",
             "Cachet\\Database\\Factories\\": "database/factories",
+            "Cachet\\Tests\\": "tests",
             "Workbench\\App\\": "workbench/app/",
             "Workbench\\Database\\Factories\\": "workbench/database/factories/",
             "Workbench\\Database\\Seeders\\": "workbench/database/seeders/"
         }
     },
-    "scripts": {
-        "post-autoload-dump": "@prepare",
-        "test": "vendor/bin/pest",
-        "canvas": "@php vendor/bin/canvas",
-        "clear": "@php vendor/bin/testbench package:purge-skeleton --ansi",
-        "prepare": "@php vendor/bin/testbench package:discover --ansi",
-        "build": [
-            "@prepare",
-            "@clear",
-            "@php vendor/bin/testbench workbench:build"
-        ],
-        "dev": [
-            "@build",
-            "Composer\\Config::disableProcessTimeout",
-            "npx concurrently -c \"#93c5fd,#c4b5fd,#fb7185,#fdba74\" \"php vendor/bin/testbench serve\" \"php vendor/bin/testbench queue:listen --tries=1\" \"php vendor/bin/testbench pail\" \"npm run dev\" --names=server,queue,logs,vite"
-        ],
-        "start": [
-            "@dev"
-        ]
-    },
     "config": {
-        "sort-packages": true,
         "allow-plugins": {
             "pestphp/pest-plugin": true
-        }
+        },
+        "sort-packages": true
     },
     "extra": {
         "branch-alias": {
@@ -98,6 +80,24 @@
             ]
         }
     },
-    "minimum-stability": "dev",
-    "prefer-stable": true
+    "scripts": {
+        "post-autoload-dump": "@prepare",
+        "build": [
+            "@prepare",
+            "@clear",
+            "@php vendor/bin/testbench workbench:build"
+        ],
+        "canvas": "@php vendor/bin/canvas",
+        "clear": "@php vendor/bin/testbench package:purge-skeleton --ansi",
+        "dev": [
+            "@build",
+            "Composer\\Config::disableProcessTimeout",
+            "npx concurrently -c \"#93c5fd,#c4b5fd,#fb7185,#fdba74\" \"php vendor/bin/testbench serve\" \"php vendor/bin/testbench queue:listen --tries=1\" \"php vendor/bin/testbench pail\" \"npm run dev\" --names=server,queue,logs,vite"
+        ],
+        "prepare": "@php vendor/bin/testbench package:discover --ansi",
+        "start": [
+            "@dev"
+        ],
+        "test": "vendor/bin/pest"
+    }
 }
diff --git a/resources/lang/en/cachet.php b/resources/lang/en/cachet.php
@@ -5,6 +5,7 @@
         'section_heading' => 'Support Cachet',
         'consider_supporting' => 'Please consider supporting Cachet via *GitHub Sponsors*.',
         'keep_up_to_date' => 'Keep up to date with the latest news and releases by following the *Cachet blog*.',
+        'work_in_progress_text' => 'Cachet is under active development. Things are still subject to change.',
     ],
     'powered_by' => 'Powered by',
     'open_source_status_page' => 'The open-source status page.',

diff --git a/resources/lang/en/navigation.php b/resources/lang/en/navigation.php
@@ -22,6 +22,8 @@
         'items' => [
             'status_page' => 'Status Page',
             'documentation' => 'Documentation',
+            'discord' => 'Join Discord',
+            'sponsor' => 'Sponsor Cachet',
         ],
     ],
 ];
diff --git a/resources/svg/discord.svg b/resources/svg/discord.svg
diff --git a/resources/views/components/component-group.blade.php b/resources/views/components/component-group.blade.php
@@ -16,7 +16,7 @@
 
         @if(($incidentCount = $componentGroup->components->sum('incidents_count')) > 0)
         <span class="rounded border border-zinc-800 px-2 py-1 text-xs font-semibold text-zinc-800 dark:border-zinc-600 dark:text-zinc-400">
-            {{ trans_choice('cachet::componet_group.incident_count', $incidentCount) }}
+            {{ trans_choice('cachet::component_group.incident_count', $incidentCount) }}
         </span>
         @endif
     </div>

diff --git a/resources/views/components/footer.blade.php b/resources/views/components/footer.blade.php
@@ -3,7 +3,7 @@
     @if($showSupport)
     <div class="flex items-center justify-center gap-2">
         {{ __('cachet::cachet.powered_by') }}
-        <a href="https://cachethq.io" title="{{ __('cachet::cachet.open_source_stats_page') }}" rel="noopener" class="inline-flex items-center font-semibold transition hover:opacity-80">
+        <a href="https://cachethq.io" title="{{ __('cachet::cachet.open_source_status_page') }}" rel="noopener" class="inline-flex items-center font-semibold transition hover:opacity-80">
             <x-cachet::logo class="hidden h-5 w-auto sm:block" />
             <x-cachet::logomark class="h-5 w-auto sm:hidden" />
             <span class="ml-2">{{ $cachetVersion }}</span>

diff --git a/resources/views/components/incident.blade.php b/resources/views/components/incident.blade.php
@@ -69,7 +69,7 @@
         </div>
     </div>
     @empty
-        <div class="bg-white border divide-y rounded-lg ml-9 dark:divide-zinc-700 dark:border-zinc-700 dark:bg-white/5">
+        <div class="bg-white border divide-y rounded-lg dark:divide-zinc-700 dark:border-zinc-700 dark:bg-white/5">
             <div class="flex flex-col p-4 divide-y dark:divide-zinc-700">
                 <div class="prose-sm md:prose prose-zinc dark:prose-invert prose-a:text-accent-content prose-a:underline prose-p:leading-normal">
                     {{ __('cachet::incident.no_incidents_reported') }}

diff --git a/resources/views/filament/widgets/support.blade.php b/resources/views/filament/widgets/support.blade.php
@@ -6,6 +6,9 @@
         <p class="text-sm leading-6 text-gray-500 dark:text-gray-400">
             {!! $keepUpToDate !!}
         </p>
+        <p class="text-sm leading-6 text-gray-500 dark:text-gray-400 font-semibold">
+            {{ __('cachet::cachet.support.work_in_progress_text') }}
+        </p>
     </x-filament::section>
 </x-filament-widgets::widget>
 
diff --git a/src/Actions/Component/CreateComponent.php b/src/Actions/Component/CreateComponent.php
@@ -2,15 +2,15 @@
 
 namespace Cachet\Actions\Component;
 
-use Cachet\Data\Component\CreateComponentData;
+use Cachet\Data\Requests\Component\CreateComponentRequestData;
 use Cachet\Models\Component;
 
 class CreateComponent
 {
     /**
      * Handle the action.
      */
-    public function handle(CreateComponentData $component): Component
+    public function handle(CreateComponentRequestData $component): Component
     {
         return Component::create($component->toArray());
     }

diff --git a/src/Actions/Component/UpdateComponent.php b/src/Actions/Component/UpdateComponent.php
@@ -2,7 +2,7 @@
 
 namespace Cachet\Actions\Component;
 
-use Cachet\Data\Component\UpdateComponentData;
+use Cachet\Data\Requests\Component\UpdateComponentRequestData;
 use Cachet\Events\Components\ComponentStatusWasChanged;
 use Cachet\Models\Component;
 
@@ -11,7 +11,7 @@ class UpdateComponent
     /**
      * Handle the action.
      */
-    public function handle(Component $component, UpdateComponentData $data): Component
+    public function handle(Component $component, UpdateComponentRequestData $data): Component
     {
         $oldStatus = $component->status;
 

diff --git a/src/Actions/ComponentGroup/CreateComponentGroup.php b/src/Actions/ComponentGroup/CreateComponentGroup.php
@@ -2,7 +2,7 @@
 
 namespace Cachet\Actions\ComponentGroup;
 
-use Cachet\Data\ComponentGroup\CreateComponentGroupData;
+use Cachet\Data\Requests\ComponentGroup\CreateComponentGroupRequestData;
 use Cachet\Models\Component;
 use Cachet\Models\ComponentGroup;
 
@@ -14,7 +14,7 @@ class CreateComponentGroup
     /**
      * Handle the action.
      */
-    public function handle(CreateComponentGroupData $data): ComponentGroup
+    public function handle(CreateComponentGroupRequestData $data): ComponentGroup
     {
         return tap(ComponentGroup::create(
             $data->except('components')->toArray(),

diff --git a/src/Actions/ComponentGroup/UpdateComponentGroup.php b/src/Actions/ComponentGroup/UpdateComponentGroup.php
@@ -2,7 +2,7 @@
 
 namespace Cachet\Actions\ComponentGroup;
 
-use Cachet\Data\ComponentGroup\UpdateComponentGroupData;
+use Cachet\Data\Requests\ComponentGroup\UpdateComponentGroupRequestData;
 use Cachet\Models\Component;
 use Cachet\Models\ComponentGroup;
 
@@ -11,7 +11,7 @@ class UpdateComponentGroup
     /**
      * Handle the action.
      */
-    public function handle(ComponentGroup $componentGroup, UpdateComponentGroupData $data): ComponentGroup
+    public function handle(ComponentGroup $componentGroup, UpdateComponentGroupRequestData $data): ComponentGroup
     {
         $componentGroup->update($data->except('components')->toArray());