Skip to content

Commit 2d98d54

Browse files
committed
Merge branch 'main' into spoyntersmith/main
* main: 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
2 parents c3c4856 + f2beeb0 commit 2d98d54

File tree

132 files changed

+1743
-2643
lines changed

Some content is hidden

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

132 files changed

+1743
-2643
lines changed

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"php": "^8.2",
2323
"ext-simplexml": "*",
2424
"doctrine/dbal": "^3.6",
25-
"filament/filament": "^3.2.57",
26-
"filament/spatie-laravel-settings-plugin": "^3.2",
25+
"filament/filament": "^4.0",
26+
"filament/spatie-laravel-settings-plugin": "^4.0",
2727
"guzzlehttp/guzzle": "^7.8",
2828
"illuminate/cache": "^11.35.0",
2929
"illuminate/console": "^11.35.0",
@@ -41,10 +41,10 @@
4141
"twig/twig": "^3.0"
4242
},
4343
"require-dev": {
44-
"dedoc/scramble": "^0.12.21",
44+
"dedoc/scramble": "^0.12",
4545
"larastan/larastan": "^3.4",
4646
"laravel/pail": "^1.1",
47-
"laravel/pint": "^1.21",
47+
"laravel/pint": "^1.24",
4848
"orchestra/testbench": "^9.5.1",
4949
"pestphp/pest": "^3.2",
5050
"pestphp/pest-plugin-laravel": "^3.0",

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
{

database/factories/MetricFactory.php

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

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

database/factories/MetricPointFactory.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\MetricPoint>
10+
* @extends Factory<MetricPoint>
1111
*/
1212
class MetricPointFactory extends Factory
1313
{

database/factories/ScheduleFactory.php

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

88
/**
9-
* @extends \Illuminate\Database\Eloquent\Factories\Factory<\Cachet\Models\Schedule>
9+
* @extends Factory<Schedule>
1010
*/
1111
class ScheduleFactory extends Factory
1212
{

database/factories/SubscriberFactory.php

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

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

0 commit comments

Comments
 (0)