Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor Heroicon Icon Handling to Use Enums #15495

Merged
merged 10 commits into from
Feb 1, 2025
+469 −365
Merged

Refactor Heroicon Icon Handling to Use Enums #15495

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
143f559
Refactor Heroicon icons in PHP classes to use Enums instead of string…
leandrocfe Jan 31, 2025
f7cc32f
Refactor Heroicon icons in PHP classes to use Enums instead of string…
leandrocfe Jan 31, 2025
1eeaaf8
Refactor Heroicon icons in Blade views to use Enums instead of string…
leandrocfe Jan 31, 2025
eee3c66
Refactor Heroicon icons in Tests to use Enums instead of string values
leandrocfe Jan 31, 2025
d88d46d
Resolve icon type issue in tests
leandrocfe Jan 31, 2025
f3b2724
Resolve icon type issue in tests
leandrocfe Jan 31, 2025
a3964e8
Rebuild the snapshots
leandrocfe Jan 31, 2025
5485800
chore: fix code style
leandrocfe Jan 31, 2025
55c0455
Update EntriesDemo.php
danharrin Feb 1, 2025
bb9651b
fix imports in generated classes
danharrin Feb 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix imports in generated classes
@danharrin
danharrin committed Feb 1, 2025
commit bb9651bcbe2bc6dff07a43db8da99492e5141db7
3 changes: 2 additions & 1 deletion ...spatie-laravel-settings-plugin/src/Commands/FileGenerators/SettingsPageClassGenerator.php
View file
Original file line number Diff line number Diff line change
@@ -84,8 +84,9 @@ protected function addMethodsToClass(ClassType $class): void
protected function addNavigationIconPropertyToClass(ClassType $class): void
{
$this->namespace->addUse(BackedEnum::class);
$this->namespace->addUse(Heroicon::class);

$property = $class->addProperty('navigationIcon', Heroicon::OutlinedCog6Tooth)
$property = $class->addProperty('navigationIcon', new Literal('Heroicon::OutlinedCog6Tooth'))
->setProtected()
->setStatic()
->setType('string|BackedEnum|null');
3 changes: 2 additions & 1 deletion ...anels/Commands/Legacy/LegacyMakeSettingsPageCommandTest/it_can_generate_a_page_class.snap
View file
Original file line number Diff line number Diff line change
@@ -6,11 +6,12 @@ use BackedEnum;
use Filament\Forms;
use Filament\Pages\SettingsPage;
use Filament\Schemas\Schema;
use Filament\Support\Icons\Heroicon;
use Filament\Tests\Panels\Commands\Legacy\Settings;

class ManageSettings extends SettingsPage
{
protected static string|BackedEnum|null $navigationIcon = \Filament\Support\Icons\Heroicon::OutlinedCog6Tooth;
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedCog6Tooth;

protected static string $settings = Settings::class;

3 changes: 2 additions & 1 deletion ...s/Legacy/LegacyMakeSettingsPageCommandTest/it_can_generate_a_page_class_in_a_cluster.snap
View file
Original file line number Diff line number Diff line change
@@ -7,11 +7,12 @@ use BackedEnum;
use Filament\Forms;
use Filament\Pages\SettingsPage;
use Filament\Schemas\Schema;
use Filament\Support\Icons\Heroicon;
use Filament\Tests\Panels\Commands\Legacy\Settings;

class ManageSettings extends SettingsPage
{
protected static string|BackedEnum|null $navigationIcon = \Filament\Support\Icons\Heroicon::OutlinedCog6Tooth;
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedCog6Tooth;

protected static string $settings = Settings::class;

3 changes: 2 additions & 1 deletion ...LegacyMakeSettingsPageCommandTest/it_can_generate_a_page_class_in_a_nested_directory.snap
View file
Original file line number Diff line number Diff line change
@@ -6,11 +6,12 @@ use BackedEnum;
use Filament\Forms;
use Filament\Pages\SettingsPage;
use Filament\Schemas\Schema;
use Filament\Support\Icons\Heroicon;
use Filament\Tests\Panels\Commands\Legacy\Settings;

class ManageSettings extends SettingsPage
{
protected static string|BackedEnum|null $navigationIcon = \Filament\Support\Icons\Heroicon::OutlinedCog6Tooth;
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedCog6Tooth;

protected static string $settings = Settings::class;

3 changes: 2 additions & 1 deletion ...akeSettingsPageCommandTest/it_can_generate_a_page_class_with_a_generated_form_schema.snap
View file
Original file line number Diff line number Diff line change
@@ -6,12 +6,13 @@ use BackedEnum;
use Filament\Forms;
use Filament\Pages\SettingsPage;
use Filament\Schemas\Schema;
use Filament\Support\Icons\Heroicon;
use Filament\Tests\Panels\Commands\Legacy\Settings;
use Filament\Tests\Panels\Commands\Legacy\SettingsPropertyEnum;

class ManageSettings extends SettingsPage
{
protected static string|BackedEnum|null $navigationIcon = \Filament\Support\Icons\Heroicon::OutlinedCog6Tooth;
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedCog6Tooth;

protected static string $settings = Settings::class;

3 changes: 2 additions & 1 deletion ...apshots/src/Panels/Commands/MakeSettingsPageCommandTest/it_can_generate_a_page_class.snap
View file
Original file line number Diff line number Diff line change
@@ -5,11 +5,12 @@ namespace App\Filament\Pages;
use BackedEnum;
use Filament\Pages\SettingsPage;
use Filament\Schemas\Schema;
use Filament\Support\Icons\Heroicon;
use Filament\Tests\Panels\Commands\Settings;

class ManageSettings extends SettingsPage
{
protected static string|BackedEnum|null $navigationIcon = \Filament\Support\Icons\Heroicon::OutlinedCog6Tooth;
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedCog6Tooth;

protected static string $settings = Settings::class;

3 changes: 2 additions & 1 deletion ...anels/Commands/MakeSettingsPageCommandTest/it_can_generate_a_page_class_in_a_cluster.snap
View file
Original file line number Diff line number Diff line change
@@ -6,11 +6,12 @@ use App\Filament\Clusters\Site\SiteCluster;
use BackedEnum;
use Filament\Pages\SettingsPage;
use Filament\Schemas\Schema;
use Filament\Support\Icons\Heroicon;
use Filament\Tests\Panels\Commands\Settings;

class ManageSettings extends SettingsPage
{
protected static string|BackedEnum|null $navigationIcon = \Filament\Support\Icons\Heroicon::OutlinedCog6Tooth;
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedCog6Tooth;

protected static string $settings = Settings::class;

3 changes: 2 additions & 1 deletion ...mands/MakeSettingsPageCommandTest/it_can_generate_a_page_class_in_a_nested_directory.snap
View file
Original file line number Diff line number Diff line change
@@ -5,11 +5,12 @@ namespace App\Filament\Pages\Site;
use BackedEnum;
use Filament\Pages\SettingsPage;
use Filament\Schemas\Schema;
use Filament\Support\Icons\Heroicon;
use Filament\Tests\Panels\Commands\Settings;

class ManageSettings extends SettingsPage
{
protected static string|BackedEnum|null $navigationIcon = \Filament\Support\Icons\Heroicon::OutlinedCog6Tooth;
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedCog6Tooth;

protected static string $settings = Settings::class;

3 changes: 2 additions & 1 deletion ...akeSettingsPageCommandTest/it_can_generate_a_page_class_with_a_generated_form_schema.snap
View file
Original file line number Diff line number Diff line change
@@ -10,12 +10,13 @@ use Filament\Forms\Components\TextInput;
use Filament\Forms\Components\Toggle;
use Filament\Pages\SettingsPage;
use Filament\Schemas\Schema;
use Filament\Support\Icons\Heroicon;
use Filament\Tests\Panels\Commands\Settings;
use Filament\Tests\Panels\Commands\SettingsPropertyEnum;

class ManageSettings extends SettingsPage
{
protected static string|BackedEnum|null $navigationIcon = \Filament\Support\Icons\Heroicon::OutlinedCog6Tooth;
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedCog6Tooth;

protected static string $settings = Settings::class;