feat: upgrade filament to v4

composer.json

@@ -21,7 +21,7 @@
     ],
     "require": {
         "php": "^8.1",
-        "filament/filament": "^3.0",
+        "filament/filament": "^4.0",
         "spatie/laravel-activitylog": "^4.10",
         "spatie/laravel-package-tools": "^1.15.0"
     },

src/Actions/ActivitylogAction.php

@@ -4,7 +4,7 @@
 
 use Closure;
 use Filament\Actions\Action;
-use Filament\Support\Enums\MaxWidth;
+use Filament\Support\Enums\Width;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\View\View;
@@ -61,7 +61,7 @@ protected function setUp(): void
                 'enableComments' => $this->getEnableComments(),
             ]))
             ->modalHeading(__('filament-activitylog::activitylog.action.heading'))
-            ->modalWidth(MaxWidth::ScreenSmall)
+            ->modalWidth(Width::ScreenSmall)
             ->modalSubmitAction(false)
             ->modalCancelAction(false);
     }

src/AttributeTable/Attribute.php

@@ -2,33 +2,28 @@
 
 namespace Swis\Filament\Activitylog\AttributeTable;
 
+use Illuminate\Contracts\Support\Htmlable;
 use Stringable;
 
 /** @phpstan-consistent-constructor */
 class Attribute
 {
     protected string $key;
 
-    /**
-     * @var string|Stringable
-     */
-    protected $value;
+    protected string | Htmlable | Stringable $value;
 
-    /**
-     * @var string|Stringable|null
-     */
-    protected $oldValue = null;
+    protected null | string | Htmlable | Stringable $oldValue = null;
 
     protected string $label;
 
-    public function __construct(string $key, string | Stringable $value, string $label)
+    public function __construct(string $key, string | Htmlable | Stringable $value, string $label)
     {
         $this->key = $key;
         $this->value = $value;
         $this->label = $label;
     }
 
-    public static function make(string $key, string | Stringable $value, string $label): static
+    public static function make(string $key, string | Htmlable | Stringable $value, string $label): static
     {
         return new static($key, $value, $label);
     }
@@ -38,27 +33,20 @@ public function getKey(): string
         return $this->key;
     }
 
-    /**
-     * @return string|Stringable
-     */
-    public function getValue(): mixed
+    public function getValue(): string | Htmlable | Stringable
     {
         return $this->value;
     }
 
-    /**
-     * @return string|Stringable|null
-     */
-    public function getOldValue()
+    public function getOldValue(): null | string | Htmlable | Stringable
     {
         return $this->oldValue;
     }
 
     /**
-     * @param  string|Stringable  $oldValue
      * @return $this
      */
-    public function withOldValue($oldValue): static
+    public function withOldValue(null | string | Htmlable | Stringable $oldValue): static
     {
         $this->oldValue = $oldValue;
 

src/AttributeTable/Builder.php

@@ -3,6 +3,7 @@
 namespace Swis\Filament\Activitylog\AttributeTable;
 
 use Closure;
+use Illuminate\Contracts\Support\Htmlable;
 use Illuminate\Support\Collection;
 use Stringable;
 use Swis\Filament\Activitylog\AttributeTable\Contracts\LabelProvider;
@@ -13,22 +14,22 @@
 class Builder
 {
     /**
-     * @var array<int, array<array-key, \Closure|\Swis\Filament\Activitylog\AttributeTable\Contracts\ValueFormatter>>
+     * @var array<int, array<array-key, Closure|ValueFormatter>>
      */
     protected array $valueFormatters = [];
 
     /**
-     * @var array<array-key, \Closure|\Swis\Filament\Activitylog\AttributeTable\Contracts\ValueFormatter>|null
+     * @var array<array-key, Closure|ValueFormatter>|null
      */
     protected ?array $sortedValueFormatters = null;
 
     /**
-     * @var array<int, array<array-key, \Closure|\Swis\Filament\Activitylog\AttributeTable\Contracts\LabelProvider>>
+     * @var array<int, array<array-key, Closure|LabelProvider>>
      */
     protected array $labelProviders = [];
 
     /**
-     * @var array<array-key, \Closure|\Swis\Filament\Activitylog\AttributeTable\Contracts\LabelProvider>|null
+     * @var array<array-key, Closure|LabelProvider>|null
      */
     protected ?array $sortedLabelProviders = null;
 
@@ -74,7 +75,7 @@ public function registerValueFormatter(Closure | ValueFormatter $valueFormatter,
     /**
      * Get the registered value formatters in order of priority.
      *
-     * @return array<array-key, \Closure|\Swis\Filament\Activitylog\AttributeTable\Contracts\ValueFormatter>
+     * @return array<array-key, Closure|ValueFormatter>
      */
     protected function getSortedValueFormatters(): array
     {
@@ -98,13 +99,13 @@ protected function getSortedValueFormatters(): array
      *
      * @param  array<string, mixed>  $attributes
      */
-    protected function executeValueFormatter(Closure | ValueFormatter $valueFormatter, mixed $value, string $key, array $attributes, string $recordClass): null | Stringable | string
+    protected function executeValueFormatter(Closure | ValueFormatter $valueFormatter, mixed $value, string $key, array $attributes, string $recordClass): null | Htmlable | Stringable | string
     {
         if ($valueFormatter instanceof ValueFormatter) {
             return $valueFormatter->formatAttributeTableValue($this, $value, $key, $attributes, $recordClass);
         }
 
-        /** @var null | Stringable | string $result */
+        /** @var null | Htmlable | Stringable | string $result */
         $result = app()->call($valueFormatter, [
             'builder' => $this,
             'value' => $value,
@@ -124,7 +125,7 @@ protected function executeValueFormatter(Closure | ValueFormatter $valueFormatte
      *
      * @param  array<string, mixed>  $attributes
      */
-    public function formatValue(mixed $value, string $key, array $attributes, string $recordClass): Stringable | string
+    public function formatValue(mixed $value, string $key, array $attributes, string $recordClass): Htmlable | Stringable | string
     {
         foreach ($this->getSortedValueFormatters() as $formatter) {
             $formattedValue = $this->executeValueFormatter($formatter, $value, $key, $attributes, $recordClass);
@@ -168,7 +169,7 @@ public function registerLabelProvider(Closure | LabelProvider $labelProvider, in
     /**
      * Get the registered label providers in order of priority.
      *
-     * @return array<array-key, \Closure|\Swis\Filament\Activitylog\AttributeTable\Contracts\LabelProvider>
+     * @return array<array-key, Closure|LabelProvider>
      */
     protected function getSortedLabelProviders(): array
     {
@@ -228,7 +229,7 @@ public function getLabel(string $key, string $recordClass): string
      *
      * @param  array<string, mixed>  $newAttributes
      * @param  ?array<string, mixed>  $oldAttributes
-     * @return \Illuminate\Support\Collection<string, Attribute>
+     * @return Collection<string, Attribute>
      */
     public function buildAttributes(string $recordClass, array $newAttributes, ?array $oldAttributes = null): Collection
     {

src/AttributeTable/Contracts/ValueFormatter.php

@@ -2,6 +2,7 @@
 
 namespace Swis\Filament\Activitylog\AttributeTable\Contracts;
 
+use Illuminate\Contracts\Support\Htmlable;
 use Stringable;
 use Swis\Filament\Activitylog\AttributeTable\Builder;
 
@@ -10,5 +11,5 @@ interface ValueFormatter
     /**
      * @param  array<string, mixed>  $attributes
      */
-    public function formatAttributeTableValue(Builder $builder, mixed $value, string $key, array $attributes, string $recordClass): Stringable | string | null;
+    public function formatAttributeTableValue(Builder $builder, mixed $value, string $key, array $attributes, string $recordClass): Htmlable | Stringable | string | null;
 }

src/AttributeTable/LabelProviders/BaseLabelProvider.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Swis\Filament\Activitylog\AttributeTable\LabelProviders;
+
+use Filament\Support\Components\Component;
+use Swis\Filament\Activitylog\AttributeTable\Contracts\LabelProvider;
+
+abstract class BaseLabelProvider extends Component implements LabelProvider
+{
+    protected string $evaluationIdentifier = 'labelProvider';
+
+    public static function make(): static
+    {
+        $static = app(static::class);
+        $static->configure();
+
+        return $static;
+    }
+}

src/AttributeTable/LabelProviders/HeadlineProvider.php

@@ -3,9 +3,8 @@
 namespace Swis\Filament\Activitylog\AttributeTable\LabelProviders;
 
 use Illuminate\Support\Str;
-use Swis\Filament\Activitylog\AttributeTable\Contracts\LabelProvider;
 
-class HeadlineProvider implements LabelProvider
+class HeadlineProvider extends BaseLabelProvider
 {
     public function getAttributeTableLabel(string $key, string $recordClass): ?string
     {

src/AttributeTable/LabelProviders/ModelSpecificProvider.php

@@ -4,7 +4,7 @@
 
 use Swis\Filament\Activitylog\AttributeTable\Contracts\LabelProvider;
 
-class ModelSpecificProvider implements LabelProvider
+class ModelSpecificProvider extends BaseLabelProvider
 {
     public function getAttributeTableLabel(string $key, string $recordClass): ?string
     {

src/AttributeTable/ValueFormatters/BaseValueFormatter.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Swis\Filament\Activitylog\AttributeTable\ValueFormatters;
+
+use Filament\Support\Components\Component;
+use Swis\Filament\Activitylog\AttributeTable\Contracts\ValueFormatter;
+
+abstract class BaseValueFormatter extends Component implements ValueFormatter
+{
+    protected string $evaluationIdentifier = 'valueFormatter';
+
+    public static function make(): static
+    {
+        $static = app(static::class);
+        $static->configure();
+
+        return $static;
+    }
+}

src/AttributeTable/ValueFormatters/BelongsToRelationFormatter.php

@@ -2,15 +2,15 @@
 
 namespace Swis\Filament\Activitylog\AttributeTable\ValueFormatters;
 
+use Illuminate\Contracts\Support\Htmlable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Stringable;
 use Swis\Filament\Activitylog\AttributeTable\Builder;
 use Swis\Filament\Activitylog\AttributeTable\Contracts\ModelRelationFinder;
-use Swis\Filament\Activitylog\AttributeTable\Contracts\ValueFormatter;
 
-class BelongsToRelationFormatter implements ValueFormatter
+class BelongsToRelationFormatter extends BaseValueFormatter
 {
     protected ModelRelationFinder $modelRelationFinder;
 
@@ -19,7 +19,7 @@ public function __construct(ModelRelationFinder $modelRelationFinder)
         $this->modelRelationFinder = $modelRelationFinder;
     }
 
-    public function formatAttributeTableValue(Builder $builder, mixed $value, string $key, array $attributes, string $recordClass): Stringable | string | null
+    public function formatAttributeTableValue(Builder $builder, mixed $value, string $key, array $attributes, string $recordClass): Htmlable | Stringable | string | null
     {
         if (empty($value) || ! is_scalar($value)) {
             return null;

src/AttributeTable/ValueFormatters/BoolFormatter.php

@@ -2,13 +2,13 @@
 
 namespace Swis\Filament\Activitylog\AttributeTable\ValueFormatters;
 
+use Illuminate\Contracts\Support\Htmlable;
 use Stringable;
 use Swis\Filament\Activitylog\AttributeTable\Builder;
-use Swis\Filament\Activitylog\AttributeTable\Contracts\ValueFormatter;
 
-class BoolFormatter implements ValueFormatter
+class BoolFormatter extends BaseValueFormatter
 {
-    public function formatAttributeTableValue(Builder $builder, mixed $value, string $key, array $attributes, string $recordClass): Stringable | string | null
+    public function formatAttributeTableValue(Builder $builder, mixed $value, string $key, array $attributes, string $recordClass): Htmlable | Stringable | string | null
     {
         if (! is_bool($value)) {
             return null;

src/AttributeTable/ValueFormatters/DateCastFormatter.php

@@ -3,16 +3,30 @@
 namespace Swis\Filament\Activitylog\AttributeTable\ValueFormatters;
 
 use Carbon\CarbonImmutable;
+use Closure;
 use DateTimeInterface;
-use Filament\Tables\Table;
+use Illuminate\Contracts\Support\Htmlable;
 use Illuminate\Database\Eloquent\Model;
 use Stringable;
 use Swis\Filament\Activitylog\AttributeTable\Builder;
-use Swis\Filament\Activitylog\AttributeTable\Contracts\ValueFormatter;
 
-class DateCastFormatter implements ValueFormatter
+class DateCastFormatter extends BaseValueFormatter
 {
-    public function formatAttributeTableValue(Builder $builder, mixed $value, string $key, array $attributes, string $recordClass): Stringable | string | null
+    protected string | Closure $dateDisplayFormat = 'M j, Y';
+
+    public function dateDisplayFormat(string | Closure $format): static
+    {
+        $this->dateDisplayFormat = $format;
+
+        return $this;
+    }
+
+    public function getDateDisplayFormat(): string
+    {
+        return $this->evaluate($this->dateDisplayFormat);
+    }
+
+    public function formatAttributeTableValue(Builder $builder, mixed $value, string $key, array $attributes, string $recordClass): Htmlable | Stringable | string | null
     {
         if (! is_a($recordClass, Model::class, true)) {
             return null;
@@ -29,11 +43,11 @@ public function formatAttributeTableValue(Builder $builder, mixed $value, string
         }
 
         if ($value instanceof DateTimeInterface) {
-            return CarbonImmutable::instance($value)->format(Table::$defaultDateDisplayFormat);
+            return CarbonImmutable::instance($value)->format($this->getDateDisplayFormat());
         }
 
         if (is_string($value) || is_int($value) || is_float($value)) {
-            return CarbonImmutable::parse($value)->format(Table::$defaultDateDisplayFormat);
+            return CarbonImmutable::parse($value)->format($this->getDateDisplayFormat());
         }
 
         return null;