chore: rector
Some checks failed
tests / ci (push) Has been cancelled

This commit is contained in:
Benjamin Nussbaum 2025-10-02 22:28:01 +02:00
parent 203584107f
commit 91e222f7a6
6 changed files with 21 additions and 18 deletions

View file

@ -12,7 +12,7 @@ class ExpressionUtils
*/ */
public static function isAssociativeArray(array $array): bool public static function isAssociativeArray(array $array): bool
{ {
if (empty($array)) { if ($array === []) {
return false; return false;
} }
@ -81,8 +81,10 @@ class ExpressionUtils
self::evaluateCondition($condition['right'], $variable, $object); self::evaluateCondition($condition['right'], $variable, $object);
case 'or': case 'or':
return self::evaluateCondition($condition['left'], $variable, $object) || if (self::evaluateCondition($condition['left'], $variable, $object)) {
self::evaluateCondition($condition['right'], $variable, $object); return true;
}
return self::evaluateCondition($condition['right'], $variable, $object);
case 'comparison': case 'comparison':
$leftValue = self::resolveValue($condition['left'], $variable, $object); $leftValue = self::resolveValue($condition['left'], $variable, $object);

View file

@ -36,7 +36,7 @@ class BatteryLow extends Notification
return (new MailMessage)->markdown('mail.battery-low', ['device' => $this->device]); return (new MailMessage)->markdown('mail.battery-low', ['device' => $this->device]);
} }
public function toWebhook(object $notifiable) public function toWebhook(object $notifiable): \App\Notifications\Messages\WebhookMessage
{ {
return WebhookMessage::create() return WebhookMessage::create()
->data([ ->data([

View file

@ -58,6 +58,7 @@ class PluginExportService
// Generate shared.liquid if needed (for liquid templates) // Generate shared.liquid if needed (for liquid templates)
if ($plugin->markup_language === 'liquid') { if ($plugin->markup_language === 'liquid') {
$sharedTemplate = $this->generateSharedTemplate(); $sharedTemplate = $this->generateSharedTemplate();
/** @phpstan-ignore-next-line */
if ($sharedTemplate) { if ($sharedTemplate) {
File::put($tempDir.'/shared.liquid', $sharedTemplate); File::put($tempDir.'/shared.liquid', $sharedTemplate);
} }

View file

@ -18,7 +18,7 @@ beforeEach(function (): void {
Storage::disk('public')->put('/images/sleep.bmp', 'fake-bmp-content'); Storage::disk('public')->put('/images/sleep.bmp', 'fake-bmp-content');
}); });
test('command transforms default images for all device models', function () { test('command transforms default images for all device models', function (): void {
// Ensure we have device models // Ensure we have device models
$deviceModels = DeviceModel::all(); $deviceModels = DeviceModel::all();
expect($deviceModels)->not->toBeEmpty(); expect($deviceModels)->not->toBeEmpty();
@ -43,7 +43,7 @@ test('command transforms default images for all device models', function () {
} }
}); });
test('getDeviceSpecificDefaultImage returns correct path for device with model', function () { test('getDeviceSpecificDefaultImage returns correct path for device with model', function (): void {
$deviceModel = DeviceModel::first(); $deviceModel = DeviceModel::first();
expect($deviceModel)->not->toBeNull(); expect($deviceModel)->not->toBeNull();
@ -66,7 +66,7 @@ test('getDeviceSpecificDefaultImage returns correct path for device with model',
expect($sleepImage)->toBe($sleepPath); expect($sleepImage)->toBe($sleepPath);
}); });
test('getDeviceSpecificDefaultImage falls back to original images for device without model', function () { test('getDeviceSpecificDefaultImage falls back to original images for device without model', function (): void {
$device = new Device(); $device = new Device();
$device->deviceModel = null; $device->deviceModel = null;
@ -77,7 +77,7 @@ test('getDeviceSpecificDefaultImage falls back to original images for device wit
expect($sleepImage)->toBe('images/sleep.bmp'); expect($sleepImage)->toBe('images/sleep.bmp');
}); });
test('generateDefaultScreenImage creates images from Blade templates', function () { test('generateDefaultScreenImage creates images from Blade templates', function (): void {
$device = Device::factory()->create(); $device = Device::factory()->create();
$setupUuid = ImageGenerationService::generateDefaultScreenImage($device, 'setup-logo'); $setupUuid = ImageGenerationService::generateDefaultScreenImage($device, 'setup-logo');
@ -97,14 +97,14 @@ test('generateDefaultScreenImage creates images from Blade templates', function
expect(Storage::disk('public')->exists($sleepPath))->toBeTrue(); expect(Storage::disk('public')->exists($sleepPath))->toBeTrue();
}); });
test('generateDefaultScreenImage throws exception for invalid image type', function () { test('generateDefaultScreenImage throws exception for invalid image type', function (): void {
$device = Device::factory()->create(); $device = Device::factory()->create();
expect(fn () => ImageGenerationService::generateDefaultScreenImage($device, 'invalid-type')) expect(fn (): string => ImageGenerationService::generateDefaultScreenImage($device, 'invalid-type'))
->toThrow(InvalidArgumentException::class); ->toThrow(InvalidArgumentException::class);
}); });
test('getDeviceSpecificDefaultImage returns null for invalid image type', function () { test('getDeviceSpecificDefaultImage returns null for invalid image type', function (): void {
$device = new Device(); $device = new Device();
$device->deviceModel = DeviceModel::first(); $device->deviceModel = DeviceModel::first();

View file

@ -146,7 +146,7 @@ LIQUID
// Instead of checking for absence of 1 and 2, let's verify the count // Instead of checking for absence of 1 and 2, let's verify the count
// The filtered result should only contain 3, 4, 5 // The filtered result should only contain 3, 4, 5
$filteredContent = strip_tags($result); $filteredContent = strip_tags((string) $result);
$this->assertStringNotContainsString('1', $filteredContent); $this->assertStringNotContainsString('1', $filteredContent);
$this->assertStringNotContainsString('2', $filteredContent); $this->assertStringNotContainsString('2', $filteredContent);
}); });

View file

@ -17,7 +17,7 @@ beforeEach(function (): void {
Storage::disk('public')->put('/images/sleep.bmp', 'fake-bmp-content'); Storage::disk('public')->put('/images/sleep.bmp', 'fake-bmp-content');
}); });
test('command transforms default images for all device models', function () { test('command transforms default images for all device models', function (): void {
// Ensure we have device models // Ensure we have device models
$deviceModels = DeviceModel::all(); $deviceModels = DeviceModel::all();
expect($deviceModels)->not->toBeEmpty(); expect($deviceModels)->not->toBeEmpty();
@ -42,7 +42,7 @@ test('command transforms default images for all device models', function () {
} }
}); });
test('getDeviceSpecificDefaultImage falls back to original images for device without model', function () { test('getDeviceSpecificDefaultImage falls back to original images for device without model', function (): void {
$device = new Device(); $device = new Device();
$device->deviceModel = null; $device->deviceModel = null;
@ -53,7 +53,7 @@ test('getDeviceSpecificDefaultImage falls back to original images for device wit
expect($sleepImage)->toBe('images/sleep.bmp'); expect($sleepImage)->toBe('images/sleep.bmp');
}); });
test('generateDefaultScreenImage creates images from Blade templates', function () { test('generateDefaultScreenImage creates images from Blade templates', function (): void {
$device = Device::factory()->create(); $device = Device::factory()->create();
$setupUuid = ImageGenerationService::generateDefaultScreenImage($device, 'setup-logo'); $setupUuid = ImageGenerationService::generateDefaultScreenImage($device, 'setup-logo');
@ -71,14 +71,14 @@ test('generateDefaultScreenImage creates images from Blade templates', function
expect(Storage::disk('public')->exists($sleepPath))->toBeTrue(); expect(Storage::disk('public')->exists($sleepPath))->toBeTrue();
})->skipOnCI(); })->skipOnCI();
test('generateDefaultScreenImage throws exception for invalid image type', function () { test('generateDefaultScreenImage throws exception for invalid image type', function (): void {
$device = Device::factory()->create(); $device = Device::factory()->create();
expect(fn () => ImageGenerationService::generateDefaultScreenImage($device, 'invalid-type')) expect(fn (): string => ImageGenerationService::generateDefaultScreenImage($device, 'invalid-type'))
->toThrow(InvalidArgumentException::class); ->toThrow(InvalidArgumentException::class);
}); });
test('getDeviceSpecificDefaultImage returns null for invalid image type', function () { test('getDeviceSpecificDefaultImage returns null for invalid image type', function (): void {
$device = new Device(); $device = new Device();
$device->deviceModel = DeviceModel::first(); $device->deviceModel = DeviceModel::first();