Merge pull request #48 from awcodes/fix/format-types

Fix: format types in widget class

Author: awcodes

src/Concerns/HandlesOverlookWidgetCustomization.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Awcodes\Overlook\Concerns;
 
 use Illuminate\Database\Eloquent\Builder;

src/Contracts/CustomizeOverlookWidget.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Awcodes\Overlook\Contracts;
 
 use Illuminate\Database\Eloquent\Builder;

src/OverlookPlugin.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Awcodes\Overlook;
 
 use Closure;
@@ -9,63 +11,59 @@
 use Filament\Panel;
 use Filament\Support\Concerns\EvaluatesClosures;
 
-class OverlookPlugin implements Plugin
+final class OverlookPlugin implements Plugin
 {
     use EvaluatesClosures;
     use HasColumns;
 
-    protected array | Closure | null $excludes = null;
+    protected array|Closure|null $excludes = null;
 
-    protected array | Closure | null $includes = null;
+    protected array|Closure|null $includes = null;
 
-    protected bool | Closure | null $shouldAbbreviateCount = null;
+    protected bool|Closure|null $shouldAbbreviateCount = null;
 
-    protected bool | Closure | null $shouldShowTooltips = null;
+    protected bool|Closure|null $shouldShowTooltips = null;
 
-    protected int | Closure | null $shouldSortAlphabetical = null;
+    protected int|Closure|null $shouldSortAlphabetical = null;
 
-    protected int | Closure | null $sort = null;
+    protected int|Closure|null $sort = null;
 
-    protected array | Closure | null $icons = null;
+    protected array|Closure|null $icons = null;
 
-    public function getId(): string
+    public static function make(): static
     {
-        return 'awcodes/overlook';
+        return app(self::class);
     }
 
-    public function register(Panel $panel): void
+    public static function get(): static
     {
+        return filament(app(static::class)->getId());
     }
 
-    public function boot(Panel $panel): void
+    public function getId(): string
     {
+        return 'awcodes/overlook';
     }
 
-    public static function make(): static
-    {
-        return app(static::class);
-    }
+    public function register(Panel $panel): void {}
 
-    public static function get(): static
-    {
-        return filament(app(static::class)->getId());
-    }
+    public function boot(Panel $panel): void {}
 
-    public function alphabetical(bool | Closure | null $condition = true): static
+    public function alphabetical(bool|Closure|null $condition = true): static
     {
         $this->shouldSortAlphabetical = $condition;
 
         return $this;
     }
 
-    public function abbreviateCount(bool | Closure | null $condition = true): static
+    public function abbreviateCount(bool|Closure|null $condition = true): static
     {
         $this->shouldAbbreviateCount = $condition;
 
         return $this;
     }
 
-    public function excludes(array | Closure $resources): static
+    public function excludes(array|Closure $resources): static
     {
         $this->excludes = $resources;
 
@@ -103,7 +101,7 @@ public function getSort(): int
         return $this->evaluate($this->sort) ?? -1;
     }
 
-    public function includes(array | Closure $resources): static
+    public function includes(array|Closure $resources): static
     {
         $this->includes = $resources;
 
@@ -125,21 +123,21 @@ public function shouldSortAlphabetical(): bool
         return $this->evaluate($this->shouldSortAlphabetical) ?? false;
     }
 
-    public function sort(int | Closure $sort): static
+    public function sort(int|Closure $sort): static
     {
         $this->sort = $sort;
 
         return $this;
     }
 
-    public function tooltips(bool | Closure | null $condition = true): static
+    public function tooltips(bool|Closure|null $condition = true): static
     {
         $this->shouldShowTooltips = $condition;
 
         return $this;
     }
 
-    public function icons(array | Closure | null $icons): static
+    public function icons(array|Closure|null $icons): static
     {
         $this->icons = $icons;
 

src/OverlookServiceProvider.php

@@ -1,12 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Awcodes\Overlook;
 
 use Livewire\Livewire;
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
 
-class OverlookServiceProvider extends PackageServiceProvider
+final class OverlookServiceProvider extends PackageServiceProvider
 {
     public function configurePackage(Package $package): void
     {

src/Widgets/OverlookWidget.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Awcodes\Overlook\Widgets;
 
 use Awcodes\Overlook\Contracts\CustomizeOverlookWidget;
@@ -8,12 +10,8 @@
 use Filament\Widgets\Widget;
 use NumberFormatter;
 
-class OverlookWidget extends Widget
+final class OverlookWidget extends Widget
 {
-    protected static string $view = 'overlook::widget';
-
-    protected int | string | array $columnSpan = 'full';
-
     public array $data = [];
 
     public array $excludes = [];
@@ -24,6 +22,15 @@ class OverlookWidget extends Widget
 
     public array $icons = [];
 
+    protected static string $view = 'overlook::widget';
+
+    protected int|string|array $columnSpan = 'full';
+
+    public static function getSort(): int
+    {
+        return OverlookPlugin::get()->getSort();
+    }
+
     /**
      * @throws Exception
      */
@@ -36,23 +43,23 @@ public function mount(): void
         }
     }
 
-    public function convertCount(string $number): string
+    public function convertCount(string | int | float $number): string
     {
         if (OverlookPlugin::get()->shouldAbbreviateCount()) {
             $formatter = new NumberFormatter(
                 app()->getLocale(),
                 NumberFormatter::PATTERN_DECIMAL,
             );
 
-            return $formatter->format($number);
+            return $formatter->format((int) $number);
         }
 
         return $number;
     }
 
-    public function formatRawCount(string $number): string
+    public function formatRawCount(string | int | float $number): string
     {
-        return number_format($number);
+        return number_format((int) $number);
     }
 
     /**
@@ -105,15 +112,10 @@ public function getData(): array
             ->toArray();
     }
 
-    public static function getSort(): int
-    {
-        return OverlookPlugin::get()->getSort();
-    }
-
     public function shouldShowTooltips(string $number): bool
     {
         $plugin = OverlookPlugin::get();
 
-        return strlen($number) >= 4 && $plugin->shouldAbbreviateCount() && $plugin->shouldShowTooltips();
+        return mb_strlen($number) >= 4 && $plugin->shouldAbbreviateCount() && $plugin->shouldShowTooltips();
     }
 }