Filament 3 (#3)

* Add support for Filament 3 * Add support for Filament 3 * Remove config * Fix use statement * Show key in table * Composer packages * Update composer.json * Update FilamentOpcacheServiceProvider.php * widgets display w/o error * composer dependency changes - we want an explicit dependency on filament 3 - we do not want an explicit dependency on carbon via illuminate (ties us to laravel version 10) - removed unnecessary php version requirement... filament already requires 8.1 * update README * forgot to save --------- Co-authored-by: Haz <me@hazjohnson.com> Co-authored-by: Haz <hello@haztakki.solutions>
stechstudio · Oct 20, 2023 · 1e93897 · 1e93897
1 parent 8b9b93d
commit 1e93897
Show file tree

Hide file tree

Showing 11 changed files with 117 additions and 62 deletions.
diff --git a/README.md b/README.md
@@ -5,6 +5,14 @@ This package allows you to view OPcache data from your Filament admin panel.
 composer require stechstudio/filament-opcache
 ```
 
+In your `AdminPanelProvider` (or other `\Filament\PanelProvider`), add this package to your plugins:
+```php
+$panel
+    ->plugins([
+        \STS\FilamentOpcache\FilamentOpcachePlugin::make(),
+    ])
+```
+
 | Status Page |
 |---|
 | ![Status Page](/screenshots/Status.png) |

diff --git a/composer.json b/composer.json
@@ -12,12 +12,15 @@
         {
             "name": "David Palmer",
             "email": "dp@reproconnect.com"
+        },
+        {
+            "name": "Haz Johnson",
+            "email": "haz@stechstudio.com"
         }
     ],
     "require": {
-        "php": "^8.0",
-        "filament/filament": "^2.0",
-        "appstract/laravel-opcache": "^4.0",
+        "filament/filament": "^3.0",
+        "appstract/laravel-opcache": "^4.0.2",
         "nesbot/carbon": "^2.0"
     },
     "extra": {

diff --git a/resources/views/status.blade.php b/resources/views/status.blade.php
@@ -14,21 +14,21 @@
         </div>
 
         <div wire:poll.10s>
-            <x-tables::container>
-                <x-tables::table>
+            <x-filament-tables::container>
+                <x-filament-tables::table>
                     <x-slot name="header">
-                        <x-tables::header-cell width="50%">Key</x-tables::header-cell>
-                        <x-tables::header-cell>Value</x-tables::header-cell>
+                        <x-filament-tables::header-cell>Key</x-filament-tables::header-cell>
+                        <x-filament-tables::header-cell>Value</x-filament-tables::header-cell>
                     </x-slot>
 
                     @foreach($$activeTab as $key => $value)
-                        <x-tables::row>
-                            <x-tables::cell class="px-4 py-1">{{ $key }}</x-tables::cell>
-                            <x-tables::cell class="px-4 py-1">{{ $value }}</x-tables::cell>
-                        </x-tables::row>
+                        <x-filament-tables::row>
+                            <x-filament-tables::cell class="px-4 py-1">{{ $key }}</x-filament-tables::cell>
+                            <x-filament-tables::cell class="px-4 py-1">{{ $value }}</x-filament-tables::cell>
+                        </x-filament-tables::row>
                     @endforeach
-                </x-tables::table>
-            </x-tables::container>
+                </x-filament-tables::table>
+            </x-filament-tables::container>
         </div>
     </div>
 </x-filament::page>
diff --git a/src/FilamentOpcachePlugin.php b/src/FilamentOpcachePlugin.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace STS\FilamentOpcache;
+
+use Filament\Contracts\Plugin;
+use Filament\Panel;
+
+class FilamentOpcachePlugin implements Plugin
+{
+    public static function make(): static
+    {
+        return app(static::class);
+    }
+
+    public function getId(): string
+    {
+        return 'filament-opcache';
+    }
+
+    public function register(Panel $panel): void
+    {
+        $panel
+            ->pages([
+                Pages\Config::class,
+                Pages\Status::class,
+            ])
+            ->widgets([
+                Widgets\OpcacheHitsWidget::class,
+                Widgets\OpcacheMemoryWidget::class,
+            ]);
+    }
+
+    public function boot(Panel $panel): void
+    {
+        //
+    }
+}
diff --git a/src/FilamentOpcacheServiceProvider.php b/src/FilamentOpcacheServiceProvider.php
@@ -1,28 +1,20 @@
 <?php
 
+declare(strict_types=1);
+
 namespace STS\FilamentOpcache;
 
-use Filament\PluginServiceProvider;
 use Spatie\LaravelPackageTools\Package;
-use STS\FilamentOpcache\Pages;
-use STS\FilamentOpcache\Widgets;
+use Spatie\LaravelPackageTools\PackageServiceProvider;
 
-class FilamentOpcacheServiceProvider extends PluginServiceProvider
+class FilamentOpcacheServiceProvider extends PackageServiceProvider
 {
-    protected array $pages = [
-        Pages\Config::class,
-        Pages\Status::class,
-    ];
-
-    protected array $widgets = [
-        Widgets\OpcacheHitsWidget::class,
-        Widgets\OpcacheMemoryWidget::class,
-    ];
+    public static string $name = 'filament-opcache';
 
     public function configurePackage(Package $package): void
     {
         $package
-            ->name('laravel-filament-opcache')
-            ->hasViews('laravel-filament-opcache');
+            ->name(static::$name)
+            ->hasViews();
     }
 }
diff --git a/src/Memory.php b/src/Memory.php
@@ -1,13 +1,16 @@
 <?php
 
+declare(strict_types=1);
+
 namespace STS\FilamentOpcache;
 
 class Memory
 {
-    public static function humanReadable($bytes = 0)
+    public static function humanReadable(int $bytes = 0): string
     {
         $size = ['B', 'kB', 'MB', 'GB', 'TB'];
-        $factor = floor((strlen($bytes) - 1) / 3);
-        return sprintf("%.2f", $bytes / pow(1024, $factor)) . ' ' . @$size[intval($factor)];
+        $factor = floor((strlen((string)$bytes) - 1) / 3);
+
+        return sprintf("%.2f", (string)$bytes / pow(1024, $factor)) . ' ' . @$size[intval($factor)];
     }
 }
diff --git a/src/Pages/Config.php b/src/Pages/Config.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace STS\FilamentOpcache\Pages;
 
 use Appstract\Opcache\OpcacheFacade;
+use Filament\Actions\Action;
 use Filament\Notifications\Notification;
-use Filament\Pages\Actions\Action;
 use Filament\Pages\Page;
 
 class Config extends Page
@@ -17,14 +19,15 @@ class Config extends Page
 
     protected static ?string $navigationIcon = 'heroicon-o-cog';
 
-    protected static string $view = 'laravel-filament-opcache::status';
+    protected static string $view = 'filament-opcache::status';
 
     protected static ?string $navigationGroup = 'OPcache';
 
-    public $tabs = ['Directives', 'Version', 'Blacklist'];
+    public array $tabs = ['Directives', 'Version', 'Blacklist'];
 
-    public $activeTab = 'directives';
+    public string $activeTab = 'directives';
 
+    /** @noinspection DuplicatedCode */
     protected function getActions(): array
     {
         return [
@@ -57,15 +60,15 @@ protected function getViewData(): array
 
         return [
             'directives' => collect($config['directives'])
-                ->map(function ($value, $key) {
+                ->map(function ($value) {
                     if (is_bool($value)) {
                         return $value ? 'true' : 'false';
                     }
 
                     return (string)$value;
                 }),
-            'version' => collect($config['version']),
-            'blacklist' => collect($config['blacklist'])
+            'version'    => collect($config['version']),
+            'blacklist'  => collect($config['blacklist']),
         ];
     }
 }
diff --git a/src/Pages/Status.php b/src/Pages/Status.php
@@ -18,16 +18,17 @@ class Status extends Page
 
     protected static ?string $slug = 'opcache-status';
 
-    protected static ?string $navigationIcon = 'heroicon-o-database';
+    protected static ?string $navigationIcon = 'heroicon-o-circle-stack';
 
-    protected static string $view = 'laravel-filament-opcache::status';
+    protected static string $view = 'filament-opcache::status';
 
     protected static ?string $navigationGroup = 'OPcache';
 
-    public $tabs = ['Lifecycle', 'Memory', 'Strings', 'Statistics', 'JIT'];
+    public array $tabs = ['Lifecycle', 'Memory', 'Strings', 'Statistics', 'JIT'];
 
-    public $activeTab = 'lifecycle';
+    public string $activeTab = 'lifecycle';
 
+    /** @noinspection DuplicatedCode */
     protected function getActions(): array
     {
         return [
@@ -59,16 +60,16 @@ protected function getViewData(): array
         $status = OpcacheFacade::getStatus();
 
         return [
-            'lifecycle' => collect($status)
-                ->filter(fn($value, $key) => !is_array($value))
-                ->map(fn ($value) => $value ? 'true' : 'false'),
-            'memory' => collect($status['memory_usage'])
-                ->map(fn ($value, $key) => Str::contains($key, 'percentage') ?
+            'lifecycle'  => collect($status)
+                ->filter(fn($value, $key) => ! is_array($value))
+                ->map(fn($value) => $value ? 'true' : 'false'),
+            'memory'     => collect($status['memory_usage'])
+                ->map(fn($value, $key) => Str::contains($key, 'percentage') ?
                     number_format($value, 2) . '%' :
                     Memory::humanReadable($value)),
-            'strings' => collect($status['interned_strings_usage'])
-                ->map(fn ($value, $key) => Str::contains($key, 'number_of') ?
-                    number_format($value, 0) :
+            'strings'    => collect($status['interned_strings_usage'])
+                ->map(fn($value, $key) => Str::contains($key, 'number_of') ?
+                    number_format($value) :
                     Memory::humanReadable($value)),
             'statistics' => collect($status['opcache_statistics'])
                 ->map(function ($value, $key) {
@@ -84,16 +85,16 @@ protected function getViewData(): array
                         return (string)(new Carbon($value));
                     }
 
-                    return number_format($value, 0);
+                    return number_format($value);
                 }),
-            'jit' => collect($status['jit'])
-                ->map(function ($value, $key) {
+            'jit'        => collect($status['jit'])
+                ->map(function ($value) {
                     if (is_bool($value)) {
                         return $value ? 'true' : 'false';
                     }
 
-                    return number_format($value, 0);
-                })
+                    return number_format($value);
+                }),
         ];
     }
 }
diff --git a/src/Widgets/OpcacheHitsWidget.php b/src/Widgets/OpcacheHitsWidget.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace STS\FilamentOpcache\Widgets;
 
 use Appstract\Opcache\OpcacheFacade;

diff --git a/src/Widgets/OpcacheMemoryWidget.php b/src/Widgets/OpcacheMemoryWidget.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace STS\FilamentOpcache\Widgets;
 
 use Appstract\Opcache\OpcacheFacade;

diff --git a/src/Widgets/PercentageChart.php b/src/Widgets/PercentageChart.php
@@ -1,28 +1,32 @@
 <?php
 
+declare(strict_types=1);
+
 namespace STS\FilamentOpcache\Widgets;
 
-abstract class PercentageChart extends \Filament\Widgets\PieChartWidget
+use Filament\Widgets\PieChartWidget;
+
+abstract class PercentageChart extends PieChartWidget
 {
     protected function chartDataFor($title, $labelA, $valueA, $labelB, $valueB): array
     {
         return [
-            'labels' => [
+            'labels'   => [
                 $labelA . ' ' . $this->percentage($valueA, $valueA + $valueB),
                 $labelB . ' ' . $this->percentage($valueB, $valueA + $valueB),
             ],
-            'datasets' =>[
+            'datasets' => [
                 [
-                    'label' => $title,
-                    'data' => [
+                    'label'           => $title,
+                    'data'            => [
                         $valueA,
                         $valueB,
                     ],
                     'backgroundColor' => [
                         '#1c3d5a',
-                        '#8795a1'
+                        '#8795a1',
                     ],
-                ]
+                ],
             ],
         ];
     }