Apply Rector changes

Author: me-shaon

src/Controllers/Api/AnalyticsApiController.php

@@ -14,21 +14,16 @@
 
 class AnalyticsApiController extends BaseController
 {
-    protected AnalyticsService $analyticsService;
-
-    public function __construct(AnalyticsService $analyticsService)
+    public function __construct(protected AnalyticsService $analyticsService)
     {
-        $this->analyticsService = $analyticsService;
     }
 
     public function overview(OverviewRequest $request): JsonResponse
     {
         $params = $request->validated();
         $dateRange = $this->analyticsService->getDateRange($params);
 
-        $data = Cache::remember("api_overview_{$dateRange['key']}", now()->addMinutes(5), function () use ($params) {
-            return $this->analyticsService->getOverviewData($params);
-        });
+        $data = Cache::remember("api_overview_{$dateRange['key']}", now()->addMinutes(5), fn(): array => $this->analyticsService->getOverviewData($params));
 
         return response()->json([
             'data' => $data,

src/Http/Middleware/APIRequestCapture.php

@@ -2,6 +2,7 @@
 
 namespace MeShaon\RequestAnalytics\Http\Middleware;
 
+use MeShaon\RequestAnalytics\Http\DTO\RequestDataDTO;
 use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
@@ -21,7 +22,7 @@ public function handle(Request $request, Closure $next): Response
     public function terminate(Request $request, Response $response): void
     {
         try {
-            if ($requestData = $this->capture($request, $response, 'api')) {
+            if (($requestData = $this->capture($request, $response, 'api')) instanceof RequestDataDTO) {
                 if (config('request-analytics.queue.enabled', true)) {
                     ProcessData::dispatch($requestData);
                 } else {

src/Http/Middleware/WebRequestCapture.php

@@ -2,6 +2,7 @@
 
 namespace MeShaon\RequestAnalytics\Http\Middleware;
 
+use MeShaon\RequestAnalytics\Http\DTO\RequestDataDTO;
 use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
@@ -26,7 +27,7 @@ public function handle(Request $request, Closure $next): Response
     public function terminate(Request $request, Response $response): void
     {
         try {
-            if ($requestData = $this->capture($request, $response, 'web')) {
+            if (($requestData = $this->capture($request, $response, 'web')) instanceof RequestDataDTO) {
                 if (config('request-analytics.queue.enabled', true)) {
                     ProcessData::dispatch($requestData);
                 } else {

src/RequestAnalytics.php

@@ -6,8 +6,6 @@
 
 class RequestAnalytics
 {
-    public function __construct(private RequestAnalyticsService $requestAnalyticsService) {}
-
     public function getPages() {}
 
     public function getMostVisitedPages() {}

src/RequestAnalyticsServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace MeShaon\RequestAnalytics;
 
+use Illuminate\Contracts\Http\Kernel;
 use MeShaon\RequestAnalytics\Commands\RequestAnalyticsCommand;
 use MeShaon\RequestAnalytics\Http\Middleware\AnalyticsDashboardMiddleware;
 use MeShaon\RequestAnalytics\Http\Middleware\APIRequestCapture;
@@ -34,13 +35,13 @@ public function configurePackage(Package $package): void
         $this->registerMiddlewareAsAliases();
     }
 
-    public function boot()
+    public function boot(): void
     {
         parent::boot();
         $this->pushMiddlewareToPipeline();
     }
 
-    private function registerMiddlewareAsAliases()
+    private function registerMiddlewareAsAliases(): void
     {
         /* @var \Illuminate\Routing\Router */
         $router = $this->app->make('router');
@@ -50,15 +51,15 @@ private function registerMiddlewareAsAliases()
         $router->aliasMiddleware('request-analytics.access', AnalyticsDashboardMiddleware::class);
     }
 
-    private function pushMiddlewareToPipeline()
+    private function pushMiddlewareToPipeline(): void
     {
         if (config('request-analytics.capture.web')) {
-            $this->app[\Illuminate\Contracts\Http\Kernel::class]->appendMiddlewareToGroup('web',
+            $this->app[Kernel::class]->appendMiddlewareToGroup('web',
                 WebRequestCapture::class);
         }
 
         if (config('request-analytics.capture.api')) {
-            $this->app[\Illuminate\Contracts\Http\Kernel::class]->appendMiddlewareToGroup('api',
+            $this->app[Kernel::class]->appendMiddlewareToGroup('api',
                 APIRequestCapture::class);
         }
     }

src/Services/BotDetectionService.php

@@ -124,6 +124,6 @@ public function getBotName(?string $userAgent): ?string
         ];
 
         return collect($botNames)
-            ->first(fn ($name, $pattern): bool => str_contains($userAgentLower, (string) $pattern));
+            ->first(fn ($name, $pattern): bool => str_contains($userAgentLower, $pattern));
     }
 }

src/Services/RequestAnalyticsService.php

@@ -35,7 +35,7 @@ public function store(RequestDataDTO $requestDataDTO)
         return RequestAnalytics::create($requestData);
     }
 
-    private function extractPageTitle(string $content)
+    private function extractPageTitle(string $content): string
     {
         $matches = [];
         preg_match('/<title>(.*?)<\/title>/i', $content, $matches);

src/Traits/CaptureRequest.php

@@ -96,31 +96,31 @@ protected function anonymizeIp(string $ip): string
             // For IPv4, zero out the last octet
             $parts = explode('.', $ip);
             $parts[3] = '0';
-
             return implode('.', $parts);
-        } elseif (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+        }
+        if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
             // For IPv6, zero out the last 80 bits
             $parts = explode(':', $ip);
-            for ($i = 3; $i < count($parts); $i++) {
+            $counter = count($parts);
+            for ($i = 3; $i < $counter; $i++) {
                 $parts[$i] = '0';
             }
-
             return implode(':', $parts);
         }
 
         return $ip;
     }
 
-    protected function parseUserAgent($userAgent)
+    protected function parseUserAgent($userAgent): array
     {
         $operating_system = $this->getOperatingSystem($userAgent);
         $browser = $this->getBrowser($userAgent);
         $device = $this->getDevice($userAgent);
 
-        return compact('operating_system', 'browser', 'device');
+        return ['operating_system' => $operating_system, 'browser' => $browser, 'device' => $device];
     }
 
-    protected function getOperatingSystem($userAgent)
+    protected function getOperatingSystem($userAgent): string
     {
         $operatingSystem = 'Unknown';
         $osRegexes = [
@@ -150,7 +150,7 @@ protected function getOperatingSystem($userAgent)
         ];
 
         foreach ($osRegexes as $regex => $os) {
-            if (preg_match($regex, $userAgent)) {
+            if (preg_match($regex, (string) $userAgent)) {
                 $operatingSystem = $os;
                 break;
             }
@@ -159,7 +159,7 @@ protected function getOperatingSystem($userAgent)
         return $operatingSystem;
     }
 
-    protected function getBrowser($userAgent)
+    protected function getBrowser($userAgent): string
     {
         $browser = 'Unknown';
         $browserRegexes = [
@@ -174,7 +174,7 @@ protected function getBrowser($userAgent)
         ];
 
         foreach ($browserRegexes as $regex => $br) {
-            if (preg_match($regex, $userAgent)) {
+            if (preg_match($regex, (string) $userAgent)) {
                 $browser = $br;
                 break;
             }
@@ -183,7 +183,7 @@ protected function getBrowser($userAgent)
         return $browser;
     }
 
-    protected function getDevice($userAgent)
+    protected function getDevice($userAgent): string
     {
         $device = 'Unknown';
         $deviceRegexes = [
@@ -198,7 +198,7 @@ protected function getDevice($userAgent)
         ];
 
         foreach ($deviceRegexes as $regex => $dev) {
-            if (preg_match($regex, $userAgent)) {
+            if (preg_match($regex, (string) $userAgent)) {
                 $device = $dev;
                 break;
             }