Skip to content

Commit ea1101b

Browse files
committed
Merge branch 'main' into fix-191-timezone-issue
* main: (73 commits) Bump dependencies Add option to show metrics even when empty (cachethq#297) Compile Assets Build assets Bump vite from 5.4.19 to 5.4.20 (cachethq#296) Compile Assets Fix ManageLocalization form method signature compatibility with SettingsPage (cachethq#294) Add Manage Localization Page (cachethq#285) Compile Assets Fix accent color theme swatch Revert composer.json name change Compile Assets Add "Under maintenance" status to components and systems (cachethq#287) Filament v4 (cachethq#292) Compile Assets Fix Incident and Updates message size (cachethq#290) Bump some dependencies Updated language files (German & Dutch) (cachethq#281) Add demo server fix; Missing webhook events in WebhookListener list (cachethq#283) ...
2 parents d7c50ce + 4483d7e commit ea1101b

File tree

251 files changed

+4533
-2823
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

251 files changed

+4533
-2823
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ jobs:
3030
run: |
3131
composer config repositories.scramble-pro '{"type": "composer", "url": "https://satis.dedoc.co"}'
3232
composer config http-basic.satis.dedoc.co ${{ secrets.SCRAMBLE_USERNAME }} ${{ secrets.SCRAMBLE_KEY }}
33-
composer require dedoc/scramble-pro:0.7.0-alpha.1 --dev
33+
composer require dedoc/scramble-pro:^0.7.9 --dev
34+
35+
- name: Build the environment
36+
run: composer build
3437

3538
- name: Checkout documentation repository
3639
uses: actions/checkout@v4

.github/workflows/run-tests.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
with:
3131
php-version: ${{ matrix.php }}
3232
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
33-
coverage: none
33+
coverage: xdebug
3434

3535
- name: Install dependencies
3636
run: |
@@ -73,7 +73,7 @@ jobs:
7373
with:
7474
php-version: ${{ matrix.php }}
7575
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
76-
coverage: none
76+
coverage: xdebug
7777

7878
- name: Install dependencies
7979
run: |
@@ -130,7 +130,7 @@ jobs:
130130
with:
131131
php-version: ${{ matrix.php }}
132132
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
133-
coverage: none
133+
coverage: xdebug
134134

135135
- name: Install dependencies
136136
run: |
@@ -187,7 +187,7 @@ jobs:
187187
with:
188188
php-version: ${{ matrix.php }}
189189
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
190-
coverage: none
190+
coverage: xdebug
191191

192192
- name: Install dependencies
193193
run: |
@@ -244,7 +244,7 @@ jobs:
244244
with:
245245
php-version: ${{ matrix.php }}
246246
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
247-
coverage: none
247+
coverage: xdebug
248248

249249
- name: Install dependencies
250250
run: |
@@ -289,7 +289,7 @@ jobs:
289289
with:
290290
php-version: ${{ matrix.php }}
291291
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
292-
coverage: none
292+
coverage: xdebug
293293

294294
- name: Install dependencies
295295
run: |

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ Cachet 3.x is currently in development and is not yet completely ready for produ
3333
- [x] Scheduled Maintenance
3434
- [x] Scheduled Maintenance Updates
3535
- [x] Components
36-
- [ ] Metrics
37-
- API and dashboard are working.
38-
- Frontend is in progress.
36+
- [x] Metrics
3937
- [ ] Subscribers
4038
- [x] API
4139
- Complete but may need some tweaks as we progress.
@@ -75,6 +73,7 @@ Login to the account at `/dashboard` and use credentials:
7573
<a href="https://dreamtilt.com.au"><img width="100px" src="https://github.com/dreamtilt.png" alt="Dreamtilt"></a>
7674
<a href="https://xyphen-it.nl"><img width="100px" src="https://github.com/xyphen-it.png" alt="Xyphen-IT"></a>
7775
<a href="https://coderabbit.ai/"><img width="100px" src="https://github.com/coderabbitai.png" alt="Code Rabbit"></a>
76+
<a href="https://scramble.dedoc.co/"><img width="100px" src="https://github.com/dedoc.png" alt="de:doc"></a>
7877
</p>
7978

8079
## Security Vulnerabilities

composer.json

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,17 @@
2020
},
2121
"require": {
2222
"php": "^8.2",
23+
"ext-simplexml": "*",
2324
"doctrine/dbal": "^3.6",
24-
"filament/filament": "^3.2.57",
25-
"filament/spatie-laravel-settings-plugin": "^3.2",
25+
"filament/filament": "^4.0",
26+
"filament/spatie-laravel-settings-plugin": "^4.0",
2627
"guzzlehttp/guzzle": "^7.8",
27-
"illuminate/console": "^11.23.0",
28-
"illuminate/database": "^11.23.0",
29-
"illuminate/events": "^11.23.0",
30-
"illuminate/queue": "^11.23.0",
31-
"illuminate/support": "^11.23.0",
28+
"illuminate/cache": "^11.35.0",
29+
"illuminate/console": "^11.35.0",
30+
"illuminate/database": "^11.35.0",
31+
"illuminate/events": "^11.35.0",
32+
"illuminate/queue": "^11.35.0",
33+
"illuminate/support": "^11.35.0",
3234
"laravel/sanctum": "^4.0",
3335
"nesbot/carbon": "^2.70",
3436
"spatie/laravel-data": "^4.11",
@@ -39,13 +41,15 @@
3941
"twig/twig": "^3.0"
4042
},
4143
"require-dev": {
42-
"dedoc/scramble": "0.12.0-alpha.1",
43-
"larastan/larastan": "^3.0",
44+
"dedoc/scramble": "^0.12",
45+
"larastan/larastan": "^3.4",
4446
"laravel/pail": "^1.1",
45-
"orchestra/testbench": "^9.5.1",
46-
"pestphp/pest": "^3.2",
47+
"laravel/pint": "^1.24",
48+
"orchestra/testbench": "^9.15.1",
49+
"pestphp/pest": "^3.8",
4750
"pestphp/pest-plugin-laravel": "^3.0",
48-
"pestphp/pest-plugin-livewire": "*"
51+
"pestphp/pest-plugin-livewire": "*",
52+
"pestphp/pest-plugin-type-coverage": "^3.3"
4953
},
5054
"minimum-stability": "dev",
5155
"prefer-stable": true,
@@ -100,6 +104,12 @@
100104
"start": [
101105
"@dev"
102106
],
103-
"test": "vendor/bin/pest"
107+
"test:lint": [
108+
"pint --test"
109+
],
110+
"test:unit": "pest --parallel --processes=10 --ci --coverage --compact",
111+
"test": [
112+
"@test:unit"
113+
]
104114
}
105115
}

config/cachet.php

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@
7777
'api',
7878
],
7979

80+
'trusted_proxies' => env('CACHET_TRUSTED_PROXIES', ''),
81+
8082
/*
8183
|--------------------------------------------------------------------------
8284
| Cachet API Rate Limit (attempts per minute)
@@ -142,11 +144,13 @@
142144
'de_CH' => 'Deutsch (CH)',
143145
'en' => 'English',
144146
'en_GB' => 'English (UK)',
147+
'es_ES' => 'Spanish (ES)',
148+
'ko' => '한국어',
145149
'nl' => 'Nederlands',
150+
'ph' => 'Filipino',
146151
'pt_BR' => 'Português (BR)',
147152
'zh_CN' => '简体中文',
148153
'zh_TW' => '繁體中文',
149-
'ph' => 'Filipino',
150154
],
151155

152156
/*
@@ -160,4 +164,19 @@
160164
*/
161165
'demo_mode' => env('CACHET_DEMO_MODE', false),
162166

167+
/*
168+
|--------------------------------------------------------------------------
169+
| Cachet Blog Feed
170+
|--------------------------------------------------------------------------
171+
|
172+
| This is the URI to the Cachet blog feed. This is used to display
173+
| the latest blog posts on the status page. By default, this is
174+
| set to the public Cachet blog feed.
175+
|
176+
*/
177+
'feed' => [
178+
'uri' => env('CACHET_FEED_URI', 'https://blog.cachethq.io/rss'),
179+
'cache' => env('CACHET_FEED_CACHE', 3600),
180+
],
181+
163182
];

database/factories/ComponentFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use Illuminate\Database\Eloquent\Factories\Factory;
88

99
/**
10-
* @extends \Illuminate\Database\Eloquent\Factories\Factory<\Cachet\Models\Component>
10+
* @extends Factory<Component>
1111
*/
1212
class ComponentFactory extends Factory
1313
{

database/factories/ComponentGroupFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use Illuminate\Database\Eloquent\Factories\Factory;
88

99
/**
10-
* @extends \Illuminate\Database\Eloquent\Factories\Factory<\Cachet\Models\ComponentGroup>
10+
* @extends Factory<ComponentGroup>
1111
*/
1212
class ComponentGroupFactory extends Factory
1313
{

database/factories/IncidentComponentFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use Illuminate\Database\Eloquent\Factories\Factory;
1010

1111
/**
12-
* @extends \Illuminate\Database\Eloquent\Factories\Factory<\Cachet\Models\IncidentComponent>
12+
* @extends Factory<IncidentComponent>
1313
*/
1414
class IncidentComponentFactory extends Factory
1515
{

database/factories/IncidentFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use Illuminate\Database\Eloquent\Factories\Factory;
88

99
/**
10-
* @extends \Illuminate\Database\Eloquent\Factories\Factory<\Cachet\Models\Incident>
10+
* @extends Factory<Incident>
1111
*/
1212
class IncidentFactory extends Factory
1313
{

database/factories/IncidentTemplateFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use Illuminate\Support\Str;
99

1010
/**
11-
* @extends \Illuminate\Database\Eloquent\Factories\Factory<\Cachet\Models\IncidentTemplate>
11+
* @extends Factory<IncidentTemplate>
1212
*/
1313
class IncidentTemplateFactory extends Factory
1414
{

0 commit comments

Comments
 (0)