Removed Collection::groupMessagesByType() macro

CHANGELOG.md

@@ -7,6 +7,7 @@ Changelog
 - Minimum PHP version increased to 8.2
 - Minimum version of Laravel increased to 10
 - Added support for Laravel 11
+- Removed `Collection::groupMessagesByType()` macro
 - File names in uppercase: README.md, CHANGELOG.md and UPGRADE.md
 - Added and run code quality and control tools
 

src/Concerns/CanGroupMessagesByType.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Axn\Notifier\Concerns;
 
 use Axn\Notifier\Notify;
@@ -20,13 +22,13 @@ public static function groupMessagesByType(Collection $messages): Collection
         $messages
             ->groupBy('type')
             ->each(function ($messages, $type) use (&$infoMessages, &$successMessages, &$warningMessages, &$errorMessages): void {
-                if ($type == Notify::INFO) {
+                if ($type === Notify::INFO) {
                     static::groupMessagesOfSameType($messages, $infoMessages);
-                } elseif ($type == Notify::SUCCESS) {
+                } elseif ($type === Notify::SUCCESS) {
                     static::groupMessagesOfSameType($messages, $successMessages);
-                } elseif ($type == Notify::WARNING) {
+                } elseif ($type === Notify::WARNING) {
                     static::groupMessagesOfSameType($messages, $warningMessages);
-                } elseif ($type == Notify::ERROR) {
+                } elseif ($type === Notify::ERROR) {
                     static::groupMessagesOfSameType($messages, $errorMessages);
                 }
             });

src/Concerns/HasFlashMessages.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Axn\Notifier\Concerns;
 
 use Axn\Notifier\Notify;

src/Concerns/HasNowMessages.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Axn\Notifier\Concerns;
 
 use Axn\Notifier\Notify;

src/Notify.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Axn\Notifier;
 
 use Axn\Notifier\Concerns\CanGroupMessagesByType;

src/ServiceProvider.php

@@ -1,29 +1,32 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Axn\Notifier;
 
 use Axn\Notifier\View\Components\NotifyComponent;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\ServiceProvider as BaseServiceProvider;
 
 class ServiceProvider extends BaseServiceProvider
 {
+    private string $basePath = '';
+
     public function register(): void
     {
-        $this->mergeConfigFrom(__DIR__.'/../config/notifier.php', 'notifier');
+        $this->basePath = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR;
+
+        $this->mergeConfigFrom($this->basePath.'config/notifier.php', 'notifier');
 
         $this->app->bind(Notify::class, fn ($app): Notify => new Notify($app['session']));
     }
 
     public function boot(): void
     {
-        $this->loadViewsFrom(__DIR__.'/../resources/views/', 'notifier');
+        $this->loadViewsFrom($this->basePath.'resources/views/', 'notifier');
 
         Blade::component('notify', NotifyComponent::class);
 
-        Collection::macro('groupMessagesByType', fn (): Collection => Notify::groupMessagesByType($this));
-
         if ($this->app->runningInConsole()) {
             $this->configurePublishing();
         }
@@ -36,12 +39,12 @@ private function configurePublishing(): void
     {
         // config
         $this->publishes([
-            __DIR__.'/../config/notifier.stub' => config_path('notifier.php'),
+            $this->basePath.'config/notifier.stub' => $this->app->configPath('notifier.php'),
         ], 'notifier-config');
 
         // views
         $this->publishes([
-            __DIR__.'/../resources/views/' => base_path('resources/views/vendor/notifier'),
+            $this->basePath.'resources/views/' => $this->app->resourcePath('views/vendor/notifier'),
         ], 'notifier-views');
     }
 }

src/View/Components/NotifyComponent.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Axn\Notifier\View\Components;
 
 use Axn\Notifier\Notify;
@@ -88,7 +90,7 @@ private function flashMessages(): Collection
             ->count();
 
         return $this->notify->flashMessages()
-            ->when($this->groupByType, fn ($messages) => $messages->groupMessagesByType())
+            ->when($this->groupByType, fn ($messages): Collection => Notify::groupMessagesByType($messages))
             ->when($this->sortByType, fn ($messages) => $messages->sortBy('type_order'));
     }
 
@@ -108,7 +110,7 @@ private function nowMessages(): Collection
             ->count();
 
         return $this->notify->nowMessages()
-            ->when($this->groupByType, fn ($messages) => $messages->groupMessagesByType())
+            ->when($this->groupByType, fn ($messages): Collection => Notify::groupMessagesByType($messages))
             ->when($this->sortByType, fn ($messages) => $messages->sortBy('type_order'));
     }
 

src/helpers.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Axn\Notifier\Notify;
 
 if (! function_exists('notify')) {