chore: change device detector

Author: k2so-dev

app/Helpers/Utils.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Helpers;
+
+use DeviceDetector\DeviceDetector;
+
+class Utils
+{
+    public static function getDeviceDetectorByUserAgent(string $userAgent): DeviceDetector
+    {
+        $detector = new DeviceDetector(
+            userAgent: $userAgent,
+        );
+
+        $detector->parse();
+
+        return $detector;
+    }
+
+    /**
+     * Get device name from user agent
+     */
+    public static function getDeviceNameFromDetector(DeviceDetector $device): string
+    {
+        return implode(' / ', array_filter([
+            trim(implode(' ', [$device->getOs('name'), $device->getOs('version')])),
+            trim(implode(' ', [$device->getClient('name'), $device->getClient('version')])),
+        ])) ?? 'Unknown';
+    }
+}

app/Providers/AppServiceProvider.php

@@ -102,13 +102,12 @@ public function boot(): void
             return Str::replaceMatches('/[^\p{L}\d ]/u', '', $text);
         });
 
-        Request::macro('deviceName', function (): string {
-            $device = $this->device();
+        Request::macro('device', function () {
+            return Utils::getDeviceDetectorByUserAgent($this->userAgent());
+        });
 
-            return implode(' / ', array_filter([
-                trim(implode(' ', [$device->getOs('name'), $device->getOs('version')])),
-                trim(implode(' ', [$device->getClient('name'), $device->getClient('version')])),
-            ])) ?? 'Unknown';
+        Request::macro('deviceName', function (): string {
+            return Utils::getDeviceNameFromDetector($this->device());
         });
 
         Sanctum::usePersonalAccessTokenModel(

composer.json

@@ -3,7 +3,10 @@
     "name": "laravel/laravel",
     "type": "project",
     "description": "The skeleton application for the Laravel framework.",
-    "keywords": ["laravel", "framework"],
+    "keywords": [
+        "laravel",
+        "framework"
+    ],
     "license": "MIT",
     "require": {
         "php": "^8.3",
@@ -14,7 +17,7 @@
         "laravel/socialite": "^5.12",
         "laravel/tinker": "^2.9",
         "league/flysystem-aws-s3-v3": "^3.24",
-        "reefki/laravel-device-detector": "^1.0",
+        "matomo/device-detector": "^6.4",
         "spatie/laravel-permission": "^6.4",
         "symfony/filesystem": "^7.2"
     },
@@ -79,4 +82,4 @@
     },
     "minimum-stability": "stable",
     "prefer-stable": true
-}
+}