ref: macros service provider

fzldn · Sep 20, 2024 · 7bab53a · 7bab53a
1 parent e3415d3
commit 7bab53a
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 32 deletions.
diff --git a/app/Models/Traits/LogsModel.php b/app/Models/Traits/LogsModel.php
@@ -48,14 +48,13 @@ protected function getLogSubjectName(): string
         return $this->name;
     }
 
-    protected function getLogCauserName(): HtmlString
+    protected function getLogCauserName(): string
     {
-        $user = auth('web')->user();
+        if ($user = auth('web')->user()) {
+            return $user->name;
+        }
 
-        return str($user->name ?? __('system'))
-            ->wrap($user ? '**' : '*')
-            ->inlineMarkdown()
-            ->toHtmlString();
+        return __('System');
     }
 
     protected function getLogFirstSubject(): object
@@ -80,32 +79,32 @@ protected function getLogSecondSubjectName(): string
 
     protected function logDescription(string $eventName): string
     {
-        return __(':subject.type <strong>:subject.name</strong> was <strong>:event</strong> by :causer.name', [
+        return __(':subject.type :subject.name was :event by :causer.name', [
             'subject.type' => str(class_basename(get_class($this)))->headline(),
-            'subject.name' => e($this->getLogSubjectName()),
-            'event' => $eventName,
-            'causer.name' => $this->getLogCauserName(),
+            'subject.name' => str(e($this->getLogSubjectName()))->wrapHtmlTag('strong'),
+            'event' => str($eventName)->wrapHtmlTag('em')->wrapHtmlTag('strong'),
+            'causer.name' => str(e($this->getLogCauserName()))->wrapHtmlTag('strong'),
         ]);
     }
 
     protected function logDescriptionPivot(string $eventName): string
     {
-        return __(':subject.first.type <strong>:subject.first.name</strong> was <strong>:event</strong> :to :subject.second.type <strong>:subject.second.name</strong> by :causer.name', [
+        return __(':subject.first.type :subject.first.name was :event :to :subject.second.type :subject.second.name by :causer.name', [
             'subject.first.type' => str(class_basename(get_class($this->getLogFirstSubject())))->headline(),
-            'subject.first.name' => e($this->getLogFirstSubjectName()),
-            'event' => match ($eventName) {
+            'subject.first.name' => str(e($this->getLogFirstSubjectName()))->wrapHtmlTag('strong'),
+            'event' => str(match ($eventName) {
                 'created' => __('attached'),
                 'deleted' => __('detached'),
                 default => $eventName,
-            },
+            })->wrapHtmlTag('em')->wrapHtmlTag('strong'),
             'to' => match ($eventName) {
                 'created' => __('to'),
                 'deleted' => __('from'),
                 default => __('for'),
             },
             'subject.second.type' => str(class_basename(get_class($this->getLogSecondSubject())))->headline(),
-            'subject.second.name' => e($this->getLogSecondSubjectName()),
-            'causer.name' => $this->getLogCauserName(),
+            'subject.second.name' => str(e($this->getLogSecondSubjectName()))->wrapHtmlTag('strong'),
+            'causer.name' => str(e($this->getLogCauserName()))->wrapHtmlTag('strong'),
         ]);
     }
 }
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -6,7 +6,6 @@
 use App\Models\User;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\ServiceProvider;
-use Illuminate\Support\Str;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -50,19 +49,4 @@ public function boot(): void
             return null;
         });
     }
-
-    protected function macros(): void
-    {
-        Str::macro('wrapHtmlTag', function ($string, $tag = 'span', $attributes = []) {
-            $attrString = '';
-
-            if (!empty($attributes)) {
-                foreach ($attributes as $key => $value) {
-                    $attrString .= " {$key}=\"{$value}\"";
-                }
-            }
-
-            return "<{$tag}{$attrString}>{$string}</{$tag}>";
-        });
-    }
 }
diff --git a/app/Providers/MacrosServiceProvider.php b/app/Providers/MacrosServiceProvider.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Str;
+use Illuminate\Support\Stringable;
+
+class MacrosServiceProvider extends ServiceProvider
+{
+    /**
+     * Register services.
+     */
+    public function register(): void
+    {
+        //
+    }
+
+    /**
+     * Bootstrap services.
+     */
+    public function boot(): void
+    {
+        Str::macro('wrapHtmlTag', function (string $string, string $tag = 'span', array $attributes = []): string {
+            $attrString = '';
+
+            if (!empty($attributes)) {
+                foreach ($attributes as $key => $value) {
+                    $attrString .= " {$key}=\"{$value}\"";
+                }
+            }
+
+            return "<{$tag}{$attrString}>{$string}</{$tag}>";
+        });
+
+        Stringable::macro('wrapHtmlTag', function (string $tag = 'span', array $attributes = []): Stringable {
+            return new Stringable(Str::wrapHtmlTag((string) $this, $tag, $attributes));
+        });
+    }
+}
diff --git a/bootstrap/providers.php b/bootstrap/providers.php
@@ -2,5 +2,6 @@
 
 return [
     App\Providers\AppServiceProvider::class,
+    App\Providers\MacrosServiceProvider::class,
     App\Providers\Filament\AdminPanelProvider::class,
 ];