Skip to content

Commit c345538

Browse files
authored
refactor: migrate to f4 (EC-206)
* feat: migrate to f4 * chore: re-add catalogue plugin * chore: format * chore: remove fork reference * ci: run tests for forks
1 parent f4d3776 commit c345538

8 files changed

Lines changed: 13 additions & 14 deletions

File tree

.github/workflows/test-runner.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
name: Tests
22

33
on:
4-
# Run testing on all push and pull requests for the main branch that have committed changes in PHP files
4+
# Run testing on all push and pull requests that have committed changes in PHP files
55
push:
6-
branches: [ "main" ]
76
paths:
8-
- '**.php'
7+
- '**/*.php'
98
pull_request:
10-
branches: [ "main" ]
119
paths:
12-
- '**.php'
10+
- '**/*.php'
1311
# Make it possible to run the workflow manually
1412
workflow_dispatch:
1513

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@
4040
},
4141
"require": {
4242
"php": "^8.2",
43-
"bezhansalleh/filament-shield": "^3.3",
43+
"bezhansalleh/filament-shield": "^4.0",
4444
"datalinx/php-utils": "^2.5",
45-
"filament/filament": "^3.3",
46-
"filament/spatie-laravel-settings-plugin": "^3.3",
45+
"filament/filament": "^4.0",
46+
"filament/spatie-laravel-settings-plugin": "^4.0",
4747
"laravel/scout": "^10.14",
4848
"spatie/laravel-package-tools": "^1.19"
4949
},

src/Admin/Filament/Clusters/Settings.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
class Settings extends Cluster
88
{
9-
protected static ?string $navigationIcon = 'heroicon-o-cog-6-tooth';
9+
protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-cog-6-tooth';
1010

1111
public static function getNavigationLabel(): string
1212
{

src/CommonPlugin.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
namespace Eclipse\Common;
44

55
use Eclipse\Common\Admin\Filament\Clusters\Settings;
6+
use Eclipse\Common\Foundation\Plugins\Plugin;
67

7-
class CommonPlugin extends Foundation\Plugins\Plugin
8+
class CommonPlugin extends Plugin
89
{
910
/**
1011
* Cluster that is used for grouping app and plugin settings

src/Foundation/Plugins/Plugin.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Eclipse\Common\Foundation\Plugins;
44

5+
use Exception;
56
use Filament\Panel;
67
use Illuminate\Support\Str;
78
use ReflectionClass;
@@ -36,7 +37,7 @@ public function __construct()
3637
/**
3738
* Register any plugin services.
3839
*
39-
* @throws \Exception
40+
* @throws Exception
4041
*/
4142
public function register(Panel $panel): void
4243
{

src/Providers/GlobalSearchProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/**
1111
* Global search provider that uses Laravel Scout for resources/models that implement it
1212
*/
13-
class GlobalSearchProvider implements \Filament\GlobalSearch\Contracts\GlobalSearchProvider
13+
class GlobalSearchProvider implements \Filament\GlobalSearch\Providers\Contracts\GlobalSearchProvider
1414
{
1515
public function getResults(string $query): ?GlobalSearchResults
1616
{

tests/Pest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
'--all' => null,
2323
'--panel' => 'admin',
2424
'--option' => 'permissions',
25-
'--minimal' => null,
2625
]);
2726
})
2827
->in(__DIR__);

workbench/database/factories/UserFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/**
1111
* @template TModel of \Workbench\App\Models\User
1212
*
13-
* @extends \Illuminate\Database\Eloquent\Factories\Factory<TModel>
13+
* @extends Factory<TModel>
1414
*/
1515
class UserFactory extends Factory
1616
{

0 commit comments

Comments
 (0)