diff --git a/database/migrations/2023_08_15_110333_create_tickets_table.php b/database/migrations/2023_08_15_110333_create_tickets_table.php index d4f6888..9a646b3 100644 --- a/database/migrations/2023_08_15_110333_create_tickets_table.php +++ b/database/migrations/2023_08_15_110333_create_tickets_table.php @@ -11,7 +11,7 @@ */ public function up(): void { - if(config('filament-cms.features.tickets')) { + if (config('filament-cms.features.tickets')) { Schema::create('tickets', function (Blueprint $table) { $table->id(); diff --git a/database/migrations/2023_08_15_110444_create_ticket_comments_table.php b/database/migrations/2023_08_15_110444_create_ticket_comments_table.php index a4f4de3..2ae1ec9 100644 --- a/database/migrations/2023_08_15_110444_create_ticket_comments_table.php +++ b/database/migrations/2023_08_15_110444_create_ticket_comments_table.php @@ -11,7 +11,7 @@ */ public function up(): void { - if(config('filament-cms.features.tickets')) { + if (config('filament-cms.features.tickets')) { Schema::create('ticket_comments', function (Blueprint $table) { $table->id(); diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php index dff563a..e1e62ef 100644 --- a/resources/lang/en/messages.php +++ b/resources/lang/en/messages.php @@ -1,8 +1,8 @@ [ - "title" => "Tickets", - "single" => "Ticket" - ] + 'tickets' => [ + 'title' => 'Tickets', + 'single' => 'Ticket', + ], ]; diff --git a/src/Console/FilamentSupportInstall.php b/src/Console/FilamentSupportInstall.php index dd04101..1f24e0d 100644 --- a/src/Console/FilamentSupportInstall.php +++ b/src/Console/FilamentSupportInstall.php @@ -28,7 +28,6 @@ public function __construct() parent::__construct(); } - /** * Execute the console command. * @@ -37,8 +36,8 @@ public function __construct() public function handle() { $this->info('Publish Vendor Assets'); - $this->artisanCommand(["migrate"]); - $this->artisanCommand(["optimize:clear"]); + $this->artisanCommand(['migrate']); + $this->artisanCommand(['optimize:clear']); $this->info('Filament support installed successfully.'); } } diff --git a/src/Filament/Resources/TicketCommentResource.php b/src/Filament/Resources/TicketCommentResource.php index fec90d8..e4ebd8d 100644 --- a/src/Filament/Resources/TicketCommentResource.php +++ b/src/Filament/Resources/TicketCommentResource.php @@ -2,16 +2,13 @@ namespace TomatoPHP\FilamentSupport\Filament\Resources; -use TomatoPHP\FilamentSupport\Filament\Resources\TicketCommentResource\Pages; -use TomatoPHP\FilamentSupport\Filament\Resources\TicketCommentResource\RelationManagers; -use TomatoPHP\FilamentSupport\Models\TicketComment; use Filament\Forms; use Filament\Forms\Form; use Filament\Resources\Resource; use Filament\Tables; use Filament\Tables\Table; -use Illuminate\Database\Eloquent\Builder; -use Illuminate\Database\Eloquent\SoftDeletingScope; +use TomatoPHP\FilamentSupport\Filament\Resources\TicketCommentResource\Pages; +use TomatoPHP\FilamentSupport\Models\TicketComment; class TicketCommentResource extends Resource { diff --git a/src/Filament/Resources/TicketCommentResource/Pages/CreateTicketComment.php b/src/Filament/Resources/TicketCommentResource/Pages/CreateTicketComment.php index 86787ab..f840b78 100644 --- a/src/Filament/Resources/TicketCommentResource/Pages/CreateTicketComment.php +++ b/src/Filament/Resources/TicketCommentResource/Pages/CreateTicketComment.php @@ -2,9 +2,8 @@ namespace TomatoPHP\FilamentSupport\Filament\Resources\TicketCommentResource\Pages; -use TomatoPHP\FilamentSupport\Filament\Resources\TicketCommentResource; -use Filament\Actions; use Filament\Resources\Pages\CreateRecord; +use TomatoPHP\FilamentSupport\Filament\Resources\TicketCommentResource; class CreateTicketComment extends CreateRecord { diff --git a/src/Filament/Resources/TicketCommentResource/Pages/EditTicketComment.php b/src/Filament/Resources/TicketCommentResource/Pages/EditTicketComment.php index 0ebb0ec..397287d 100644 --- a/src/Filament/Resources/TicketCommentResource/Pages/EditTicketComment.php +++ b/src/Filament/Resources/TicketCommentResource/Pages/EditTicketComment.php @@ -2,9 +2,9 @@ namespace TomatoPHP\FilamentSupport\Filament\Resources\TicketCommentResource\Pages; -use TomatoPHP\FilamentSupport\Filament\Resources\TicketCommentResource; use Filament\Actions; use Filament\Resources\Pages\EditRecord; +use TomatoPHP\FilamentSupport\Filament\Resources\TicketCommentResource; class EditTicketComment extends EditRecord { diff --git a/src/Filament/Resources/TicketCommentResource/Pages/ListTicketComments.php b/src/Filament/Resources/TicketCommentResource/Pages/ListTicketComments.php index cf516d9..13cfbe8 100644 --- a/src/Filament/Resources/TicketCommentResource/Pages/ListTicketComments.php +++ b/src/Filament/Resources/TicketCommentResource/Pages/ListTicketComments.php @@ -2,9 +2,9 @@ namespace TomatoPHP\FilamentSupport\Filament\Resources\TicketCommentResource\Pages; -use TomatoPHP\FilamentSupport\Filament\Resources\TicketCommentResource; use Filament\Actions; use Filament\Resources\Pages\ListRecords; +use TomatoPHP\FilamentSupport\Filament\Resources\TicketCommentResource; class ListTicketComments extends ListRecords { diff --git a/src/Filament/Resources/TicketResource.php b/src/Filament/Resources/TicketResource.php index d0fbee2..296a976 100644 --- a/src/Filament/Resources/TicketResource.php +++ b/src/Filament/Resources/TicketResource.php @@ -2,16 +2,13 @@ namespace TomatoPHP\FilamentSupport\Filament\Resources; -use TomatoPHP\FilamentSupport\Filament\Resources\TicketResource\Pages; -use TomatoPHP\FilamentSupport\Filament\Resources\TicketResource\RelationManagers; -use TomatoPHP\FilamentSupport\Models\Ticket; use Filament\Forms; use Filament\Forms\Form; use Filament\Resources\Resource; use Filament\Tables; use Filament\Tables\Table; -use Illuminate\Database\Eloquent\Builder; -use Illuminate\Database\Eloquent\SoftDeletingScope; +use TomatoPHP\FilamentSupport\Filament\Resources\TicketResource\Pages; +use TomatoPHP\FilamentSupport\Models\Ticket; class TicketResource extends Resource { diff --git a/src/Filament/Resources/TicketResource/Pages/CreateTicket.php b/src/Filament/Resources/TicketResource/Pages/CreateTicket.php index 5bb30b2..56439d1 100644 --- a/src/Filament/Resources/TicketResource/Pages/CreateTicket.php +++ b/src/Filament/Resources/TicketResource/Pages/CreateTicket.php @@ -2,9 +2,8 @@ namespace TomatoPHP\FilamentSupport\Filament\Resources\TicketResource\Pages; -use TomatoPHP\FilamentSupport\Filament\Resources\TicketResource; -use Filament\Actions; use Filament\Resources\Pages\CreateRecord; +use TomatoPHP\FilamentSupport\Filament\Resources\TicketResource; class CreateTicket extends CreateRecord { diff --git a/src/Filament/Resources/TicketResource/Pages/EditTicket.php b/src/Filament/Resources/TicketResource/Pages/EditTicket.php index 1bef445..937d1b0 100644 --- a/src/Filament/Resources/TicketResource/Pages/EditTicket.php +++ b/src/Filament/Resources/TicketResource/Pages/EditTicket.php @@ -2,9 +2,9 @@ namespace TomatoPHP\FilamentSupport\Filament\Resources\TicketResource\Pages; -use TomatoPHP\FilamentSupport\Filament\Resources\TicketResource; use Filament\Actions; use Filament\Resources\Pages\EditRecord; +use TomatoPHP\FilamentSupport\Filament\Resources\TicketResource; class EditTicket extends EditRecord { diff --git a/src/Filament/Resources/TicketResource/Pages/ListTickets.php b/src/Filament/Resources/TicketResource/Pages/ListTickets.php index 3e4819c..6962010 100644 --- a/src/Filament/Resources/TicketResource/Pages/ListTickets.php +++ b/src/Filament/Resources/TicketResource/Pages/ListTickets.php @@ -2,9 +2,9 @@ namespace TomatoPHP\FilamentSupport\Filament\Resources\TicketResource\Pages; -use TomatoPHP\FilamentSupport\Filament\Resources\TicketResource; use Filament\Actions; use Filament\Resources\Pages\ListRecords; +use TomatoPHP\FilamentSupport\Filament\Resources\TicketResource; class ListTickets extends ListRecords { diff --git a/src/FilamentSupportPlugin.php b/src/FilamentSupportPlugin.php index e322f21..05b8f18 100644 --- a/src/FilamentSupportPlugin.php +++ b/src/FilamentSupportPlugin.php @@ -7,7 +7,6 @@ class FilamentSupportPlugin implements Plugin { - public function getId(): string { return 'filament-support'; diff --git a/src/FilamentSupportServiceProvider.php b/src/FilamentSupportServiceProvider.php index 3e87171..da2a60a 100644 --- a/src/FilamentSupportServiceProvider.php +++ b/src/FilamentSupportServiceProvider.php @@ -4,39 +4,37 @@ use Illuminate\Support\ServiceProvider; - class FilamentSupportServiceProvider extends ServiceProvider { public function register(): void { //Register generate command $this->commands([ - \TomatoPHP\FilamentSupport\Console\FilamentSupportInstall::class, + \TomatoPHP\FilamentSupport\Console\FilamentSupportInstall::class, ]); //Register Config file - $this->mergeConfigFrom(__DIR__.'/../config/filament-support.php', 'filament-support'); + $this->mergeConfigFrom(__DIR__ . '/../config/filament-support.php', 'filament-support'); //Publish Config $this->publishes([ - __DIR__.'/../config/filament-support.php' => config_path('filament-support.php'), + __DIR__ . '/../config/filament-support.php' => config_path('filament-support.php'), ], 'filament-support-config'); //Register Migrations - $this->loadMigrationsFrom(__DIR__.'/../database/migrations'); + $this->loadMigrationsFrom(__DIR__ . '/../database/migrations'); //Publish Migrations $this->publishes([ - __DIR__.'/../database/migrations' => database_path('migrations'), + __DIR__ . '/../database/migrations' => database_path('migrations'), ], 'filament-support-migrations'); - //Register Langs - $this->loadTranslationsFrom(__DIR__.'/../resources/lang', 'filament-support'); + $this->loadTranslationsFrom(__DIR__ . '/../resources/lang', 'filament-support'); //Publish Lang $this->publishes([ - __DIR__.'/../resources/lang' => base_path('lang/vendor/filament-support'), + __DIR__ . '/../resources/lang' => base_path('lang/vendor/filament-support'), ], 'filament-support-lang'); } diff --git a/src/Models/Ticket.php b/src/Models/Ticket.php index 414dac9..de69f45 100644 --- a/src/Models/Ticket.php +++ b/src/Models/Ticket.php @@ -5,17 +5,17 @@ use Illuminate\Database\Eloquent\Model; /** - * @property integer $id - * @property integer $type_id + * @property int $id + * @property int $type_id * @property string $accountable_type - * @property integer $accountable_id + * @property int $accountable_id * @property string $name * @property string $phone * @property string $subject * @property string $code * @property string $message * @property string $last_update - * @property boolean $is_closed + * @property bool $is_closed * @property string $created_at * @property string $updated_at * @property TicketComment[] $ticketComments @@ -29,8 +29,9 @@ class Ticket extends Model protected $fillable = ['type_id', 'accountable_type', 'accountable_id', 'name', 'phone', 'subject', 'code', 'message', 'last_update', 'is_closed', 'created_at', 'updated_at']; protected $casts = [ - 'is_closed' => 'boolean' + 'is_closed' => 'boolean', ]; + /** * @return \Illuminate\Database\Eloquent\Relations\HasMany */ @@ -47,7 +48,8 @@ public function type() return $this->belongsTo('TomatoPHP\FilamentSupport\Models\Type'); } - public function accountable(){ + public function accountable() + { return $this->morphTo(); } } diff --git a/src/Models/TicketComment.php b/src/Models/TicketComment.php index 86eed6d..61f335a 100644 --- a/src/Models/TicketComment.php +++ b/src/Models/TicketComment.php @@ -5,10 +5,10 @@ use Illuminate\Database\Eloquent\Model; /** - * @property integer $id - * @property integer $ticket_id + * @property int $id + * @property int $ticket_id * @property string $accountable_type - * @property integer $accountable_id + * @property int $accountable_id * @property string $response * @property string $created_at * @property string $updated_at diff --git a/tests/src/TestCase.php b/tests/src/TestCase.php index 734287b..48f65df 100644 --- a/tests/src/TestCase.php +++ b/tests/src/TestCase.php @@ -16,7 +16,6 @@ use Orchestra\Testbench\TestCase as BaseTestCase; use RyanChandler\BladeCaptureDirective\BladeCaptureDirectiveServiceProvider; use TomatoPHP\FilamentSupport\FilamentSupportServiceProvider; -use TomatoPHP\FilamentSupport\Tests\Models\User; abstract class TestCase extends BaseTestCase {