Merge pull request #79 from iz-ahmad/feat/laravel-13-support

me-shaon · web-flow · commit 7ff26d8151ed · 2026-04-06T15:10:36.000+06:00
feat: add support for laravel 13 and PHP 8.5
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -17,8 +17,8 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        php: [8.3, 8.2, 8.1]
-        laravel: [10.*, 11.*, 12.*]
+        php: [8.5, 8.4, 8.3, 8.2, 8.1]
+        laravel: [10.*, 11.*, 12.*, 13.*]
         stability: [prefer-lowest, prefer-stable]
         include:
           - laravel: 10.*
@@ -30,11 +30,16 @@ jobs:
           - laravel: 12.*
             testbench: 10.*
             carbon: ^3.0
+          - laravel: 13.*
+            testbench: 11.*
+            carbon: ^3.0
         exclude:
           - laravel: 11.*
             php: 8.1
           - laravel: 12.*
             php: 8.1
+          - laravel: 13.*
+            php: 8.1
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
diff --git a/composer.json b/composer.json
@@ -16,16 +16,16 @@
         }
     ],
     "require": {
-        "php": "^8.1 | ^8.2 | ^8.3",
-        "illuminate/contracts": "^10.0 | ^11.0 | ^12.0",
+        "php": "^8.1 | ^8.2 | ^8.3 | ^8.4 | ^8.5",
+        "illuminate/contracts": "^10.0 | ^11.0 | ^12.0 | ^13.0",
         "spatie/laravel-package-tools": "^1.16.0"
     },
     "require-dev": {
         "laravel/pint": "^1.0",
         "mockery/mockery": "^1.6",
         "nunomaduro/collision": "^7.8 | ^8.1",
-        "orchestra/workbench": "^8.0 | ^9.0 | ^10.0",
-        "phpunit/phpunit": "^10.5 | ^11.0",
+        "orchestra/workbench": "^8.0 | ^9.0 | ^10.0 | ^11.0",
+        "phpunit/phpunit": "^10.5 | ^11.0 | ^12.0",
         "rector/rector": "^2.1.7"
     },
     "autoload": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.5/phpunit.xsd"
     backupGlobals="false"
     bootstrap="vendor/autoload.php"
     colors="true"
-    processIsolation="false"
-    stopOnFailure="false"
     executionOrder="random"
-    failOnWarning="true"
-    failOnRisky="true"
     failOnEmptyTestSuite="true"
-    beStrictAboutOutputDuringTests="true"
     cacheDirectory=".phpunit.cache"
     backupStaticProperties="false"
 >
diff --git a/rector.php b/rector.php
@@ -14,7 +14,7 @@
 
     // Define what rule sets will be applied
     $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_81,
+        LevelSetList::UP_TO_PHP_85,
         SetList::CODE_QUALITY,
         SetList::DEAD_CODE,
         SetList::EARLY_RETURN,
diff --git a/src/Concern/CaptureRequest.php b/src/Concern/CaptureRequest.php
@@ -119,7 +119,7 @@ protected function anonymizeIp(string $ip): string
         return $ip;
     }
 
-    protected function parseUserAgent($userAgent): array
+    protected function parseUserAgent(?string $userAgent): array
     {
         $operating_system = $this->getOperatingSystem($userAgent);
         $browser = $this->getBrowser($userAgent);
@@ -128,7 +128,7 @@ protected function parseUserAgent($userAgent): array
         return ['operating_system' => $operating_system, 'browser' => $browser, 'device' => $device];
     }
 
-    protected function getOperatingSystem($userAgent): string
+    protected function getOperatingSystem(?string $userAgent): string
     {
         $operatingSystem = 'Unknown';
         $osRegexes = [
@@ -167,7 +167,7 @@ protected function getOperatingSystem($userAgent): string
         return $operatingSystem;
     }
 
-    protected function getBrowser($userAgent): string
+    protected function getBrowser(?string $userAgent): string
     {
         $browser = 'Unknown';
         $browserRegexes = [
@@ -191,7 +191,7 @@ protected function getBrowser($userAgent): string
         return $browser;
     }
 
-    protected function getDevice($userAgent): string
+    protected function getDevice(?string $userAgent): string
     {
         $device = 'Unknown';
         $deviceRegexes = [
diff --git a/src/DTO/RequestDataDTO.php b/src/DTO/RequestDataDTO.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MeShaon\RequestAnalytics\DTO;
 
 class RequestDataDTO
diff --git a/src/Exceptions/BotDetectionException.php b/src/Exceptions/BotDetectionException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MeShaon\RequestAnalytics\Exceptions;
 
 /**
diff --git a/src/Exceptions/GeolocationException.php b/src/Exceptions/GeolocationException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MeShaon\RequestAnalytics\Exceptions;
 
 /**
diff --git a/src/Exceptions/GeolocationProviderException.php b/src/Exceptions/GeolocationProviderException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MeShaon\RequestAnalytics\Exceptions;
 
 /**
diff --git a/src/Exceptions/MaxMindConfigurationException.php b/src/Exceptions/MaxMindConfigurationException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MeShaon\RequestAnalytics\Exceptions;
 
 /**
diff --git a/src/Exceptions/MaxMindDependencyException.php b/src/Exceptions/MaxMindDependencyException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MeShaon\RequestAnalytics\Exceptions;
 
 /**
diff --git a/src/Exceptions/RequestAnalyticsException.php b/src/Exceptions/RequestAnalyticsException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MeShaon\RequestAnalytics\Exceptions;
 
 use Exception;
diff --git a/src/Exceptions/RequestAnalyticsStorageException.php b/src/Exceptions/RequestAnalyticsStorageException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MeShaon\RequestAnalytics\Exceptions;
 
 /**
diff --git a/src/Http/Middleware/AnalyticsDashboardMiddleware.php b/src/Http/Middleware/AnalyticsDashboardMiddleware.php
@@ -10,7 +10,7 @@
 
 class AnalyticsDashboardMiddleware
 {
-    public function handle(Request $request, Closure $next)
+    public function handle(Request $request, Closure $next): mixed
     {
         $user = $request->user();
         if ($user) {
diff --git a/src/Jobs/ProcessData.php b/src/Jobs/ProcessData.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MeShaon\RequestAnalytics\Jobs;
 
 use Illuminate\Bus\Queueable;

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ protected function anonymizeIp(string $ip): string`
`119`	`119`	`return $ip;`
`120`	`120`	`}`
`121`	`121`
`122`		`- protected function parseUserAgent($userAgent): array`
	`122`	`+ protected function parseUserAgent(?string $userAgent): array`
`123`	`123`	`{`
`124`	`124`	`$operating_system = $this->getOperatingSystem($userAgent);`
`125`	`125`	`$browser = $this->getBrowser($userAgent);`
`@@ -128,7 +128,7 @@ protected function parseUserAgent($userAgent): array`
`128`	`128`	`return ['operating_system' => $operating_system, 'browser' => $browser, 'device' => $device];`
`129`	`129`	`}`
`130`	`130`
`131`		`- protected function getOperatingSystem($userAgent): string`
	`131`	`+ protected function getOperatingSystem(?string $userAgent): string`
`132`	`132`	`{`
`133`	`133`	`$operatingSystem = 'Unknown';`
`134`	`134`	`$osRegexes = [`
`@@ -167,7 +167,7 @@ protected function getOperatingSystem($userAgent): string`
`167`	`167`	`return $operatingSystem;`
`168`	`168`	`}`
`169`	`169`
`170`		`- protected function getBrowser($userAgent): string`
	`170`	`+ protected function getBrowser(?string $userAgent): string`
`171`	`171`	`{`
`172`	`172`	`$browser = 'Unknown';`
`173`	`173`	`$browserRegexes = [`
`@@ -191,7 +191,7 @@ protected function getBrowser($userAgent): string`
`191`	`191`	`return $browser;`
`192`	`192`	`}`
`193`	`193`
`194`		`- protected function getDevice($userAgent): string`
	`194`	`+ protected function getDevice(?string $userAgent): string`
`195`	`195`	`{`
`196`	`196`	`$device = 'Unknown';`
`197`	`197`	`$deviceRegexes = [`
-Original file line number
+Diff line change
@@ @@ -1,5 +1,7 @@ @@
 <?php
 +declare(strict_types=1);
++
 namespace MeShaon\RequestAnalytics\Exceptions;
 /**