Improve Fleet-Ops server test coverage

composer.json

@@ -90,6 +90,10 @@
             "@test:coverage:clover",
             "@coverage:summary"
         ],
+        "coverage:check": [
+            "@test:coverage:clover",
+            "php scripts/coverage-summary.php coverage/clover.xml --fail-under=100"
+        ],
         "coverage:summary": "php scripts/coverage-summary.php coverage/clover.xml",
         "lint": "php-cs-fixer fix -v",
         "test:lint": "php-cs-fixer fix -v --dry-run",

scripts/coverage-summary.php

@@ -2,7 +2,20 @@
 
 declare(strict_types=1);
 
-$cloverPath = $argv[1] ?? 'coverage/clover.xml';
+$cloverPath = 'coverage/clover.xml';
+$failUnder  = null;
+
+foreach (array_slice($argv, 1) as $arg) {
+    if (str_starts_with($arg, '--fail-under=')) {
+        $failUnder = (float) substr($arg, strlen('--fail-under='));
+
+        continue;
+    }
+
+    if ($arg !== '') {
+        $cloverPath = $arg;
+    }
+}
 
 if (!is_file($cloverPath)) {
     fwrite(STDERR, "Coverage file not found: {$cloverPath}\n");
@@ -108,3 +121,8 @@ function intMetric(SimpleXMLElement $node, string $name): int
     $relativePath = preg_replace('#^' . preg_quote(getcwd(), '#') . '/?#', '', $file['path']);
     printf("  %6.2f%%  %5d/%-5d  %s\n", $file['percent'], $file['covered'], $file['statements'], $relativePath ?: $file['path']);
 }
+
+if ($failUnder !== null && coveragePercent($coveredStatements, $statements) < $failUnder) {
+    fwrite(STDERR, sprintf("\nCoverage %.2f%% is below the required %.2f%% line threshold.\n", coveragePercent($coveredStatements, $statements), $failUnder));
+    exit(1);
+}

server/src/Events/DriverLocationChanged.php

@@ -6,7 +6,7 @@
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Carbon;
 

server/src/Events/DriverSimulatedLocationChanged.php

@@ -7,7 +7,7 @@
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Carbon;
 

server/src/Events/EntityActivityChanged.php

@@ -8,7 +8,7 @@
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Carbon;
 

server/src/Events/EntityCompleted.php

@@ -8,7 +8,7 @@
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Carbon;
 

server/src/Events/EntityDriverAssigned.php

@@ -5,7 +5,7 @@
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
 class EntityDriverAssigned implements ShouldBroadcast

server/src/Events/FuelProviderTransactionImported.php

@@ -3,7 +3,7 @@
 namespace Fleetbase\FleetOps\Events;
 
 use Fleetbase\FleetOps\Models\FuelProviderTransaction;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
 class FuelProviderTransactionImported

server/src/Events/FuelProviderTransactionMatched.php

@@ -3,7 +3,7 @@
 namespace Fleetbase\FleetOps\Events;
 
 use Fleetbase\FleetOps\Models\FuelProviderTransaction;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
 class FuelProviderTransactionMatched

server/src/Events/FuelProviderTransactionUnmatched.php

@@ -3,7 +3,7 @@
 namespace Fleetbase\FleetOps\Events;
 
 use Fleetbase\FleetOps\Models\FuelProviderTransaction;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
 class FuelProviderTransactionUnmatched

server/src/Events/FuelReportCreatedFromProvider.php

@@ -4,7 +4,7 @@
 
 use Fleetbase\FleetOps\Models\FuelProviderTransaction;
 use Fleetbase\FleetOps\Models\FuelReport;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
 class FuelReportCreatedFromProvider

server/src/Events/GeofenceDwelled.php

@@ -7,7 +7,7 @@
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
 /**

server/src/Events/GeofenceEntered.php

@@ -8,7 +8,7 @@
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
 /**

server/src/Events/GeofenceExited.php

@@ -8,7 +8,7 @@
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
 /**

server/src/Events/VehicleLocationChanged.php

@@ -6,7 +6,7 @@
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Carbon;
 

server/src/Events/WaypointActivityChanged.php

@@ -8,7 +8,7 @@
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Carbon;
 

server/src/Events/WaypointCompleted.php

@@ -8,7 +8,7 @@
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Carbon;
 

server/src/Exceptions/TelematicRateLimitExceededException.php

@@ -7,6 +7,6 @@
  *
  * Exception thrown when provider rate limit is exceeded.
  */
-class TelematicRateLimitExceededException extends ProviderException
+class TelematicRateLimitExceededException extends TelematicProviderException
 {
 }

server/src/Http/Requests/BulkDispatchRequest.php

@@ -11,7 +11,7 @@ class BulkDispatchRequest extends FleetbaseRequest
      *
      * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
     {
         return $this->session()->has('user');
     }
@@ -21,7 +21,7 @@ public function authorize()
      *
      * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'ids' => ['required', 'array'],
@@ -33,7 +33,7 @@ public function rules()
      *
      * @return array
      */
-    public function messages()
+    public function messages(): array
     {
         return [
             'ids.required' => 'Please provide a resource ID.',

server/src/Http/Requests/CancelOrderRequest.php

@@ -11,7 +11,7 @@ class CancelOrderRequest extends FleetbaseRequest
      *
      * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
     {
         return request()->session()->has('api_credential');
     }
@@ -21,7 +21,7 @@ public function authorize()
      *
      * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'order' => 'required|exists:orders,uuid',

server/src/Http/Requests/CreateContactRequest.php

@@ -12,7 +12,7 @@ class CreateContactRequest extends FleetbaseRequest
      *
      * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
     {
         return request()->session()->has('storefront_key') || request()->session()->has('api_credential') || request()->session()->has('is_sanctum_token');
     }
@@ -22,7 +22,7 @@ public function authorize()
      *
      * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'name'  => [new RequiredIf($this->isMethod('POST'))],

server/src/Http/Requests/CreateDeviceRequest.php

@@ -8,12 +8,12 @@
 
 class CreateDeviceRequest extends FleetbaseRequest
 {
-    public function authorize()
+    public function authorize(): bool
     {
         return request()->session()->has('api_credential') || request()->session()->has('is_sanctum_token');
     }
 
-    public function rules()
+    public function rules(): array
     {
         return [
             'name'                  => [Rule::requiredIf($this->isMethod('POST')), 'string'],

server/src/Http/Requests/CreateDriverRequest.php

@@ -13,7 +13,7 @@ class CreateDriverRequest extends FleetbaseRequest
      *
      * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
     {
         return request()->is('navigator/v1/*') || request()->session()->has('api_credential') || request()->session()->has('is_sanctum_token');
     }
@@ -23,7 +23,7 @@ public function authorize()
      *
      * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         $isCreating = $this->isMethod('POST');
 
@@ -50,7 +50,7 @@ public function rules()
      *
      * @return array
      */
-    public function attributes()
+    public function attributes(): array
     {
         return [
             'email' => 'email address',

server/src/Http/Requests/CreateEntityRequest.php

@@ -12,7 +12,7 @@ class CreateEntityRequest extends FleetbaseRequest
      *
      * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
     {
         return request()->session()->has('api_credential') || request()->session()->has('is_sanctum_token');
     }
@@ -22,7 +22,7 @@ public function authorize()
      *
      * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'name'            => [Rule::requiredIf($this->isMethod('POST'))],

server/src/Http/Requests/CreateEquipmentRequest.php

@@ -7,12 +7,12 @@
 
 class CreateEquipmentRequest extends FleetbaseRequest
 {
-    public function authorize()
+    public function authorize(): bool
     {
         return request()->session()->has('api_credential') || request()->session()->has('is_sanctum_token');
     }
 
-    public function rules()
+    public function rules(): array
     {
         return [
             'name'           => [Rule::requiredIf($this->isMethod('POST')), 'string'],

server/src/Http/Requests/CreateFleetRequest.php

@@ -12,7 +12,7 @@ class CreateFleetRequest extends FleetbaseRequest
      *
      * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
     {
         return request()->session()->has('api_credential');
     }
@@ -22,7 +22,7 @@ public function authorize()
      *
      * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'name'         => [Rule::requiredIf($this->isMethod('POST'))],

server/src/Http/Requests/CreateFuelReportRequest.php

@@ -11,7 +11,7 @@ class CreateFuelReportRequest extends FleetbaseRequest
      *
      * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
     {
         return request()->session()->has('api_credential') || request()->session()->has('is_sanctum_token');
     }
@@ -21,7 +21,7 @@ public function authorize()
      *
      * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'driver'          => ['required'],

server/src/Http/Requests/CreateFuelTransactionRequest.php

@@ -7,12 +7,12 @@
 
 class CreateFuelTransactionRequest extends FleetbaseRequest
 {
-    public function authorize()
+    public function authorize(): bool
     {
         return request()->session()->has('api_credential') || request()->session()->has('is_sanctum_token');
     }
 
-    public function rules()
+    public function rules(): array
     {
         return [
             'provider'                => [Rule::requiredIf($this->isMethod('POST')), 'string'],

server/src/Http/Requests/CreateIssueRequest.php

@@ -11,7 +11,7 @@ class CreateIssueRequest extends FleetbaseRequest
      *
      * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
     {
         return request()->session()->has('api_credential') || request()->session()->has('is_sanctum_token');
     }
@@ -21,7 +21,7 @@ public function authorize()
      *
      * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'driver'       => ['required'],