cs and analysis update

Author: OStefan2001

config/autoload/ip-address.global.php

@@ -2,7 +2,6 @@
 
 declare(strict_types=1);
 
-
 // @see https://github.com/akrabat/ip-address-middleware/blob/main/src/IpAddress.php
 return [
     'rka' => [

src/App/src/Service/ContactService.php

@@ -79,7 +79,7 @@ public function turnstileSiteKey(): string
         return $this->turnstile['secret_key'] !== '' ? $this->turnstile['site_key'] : '';
     }
 
-    public function verifyTurnstile(string $token, ?string $remoteIp): bool
+    public function verifyTurnstile(string $token, string $remoteIp): bool
     {
         if ($this->turnstileSiteKey() === '') {
             return true;
@@ -93,7 +93,7 @@ public function verifyTurnstile(string $token, ?string $remoteIp): bool
             'secret'   => $this->turnstile['secret_key'],
             'response' => $token,
         ];
-        if ($remoteIp) {
+        if ($remoteIp !== '') {
             $data['remoteip'] = $remoteIp;
         }
 
@@ -176,7 +176,7 @@ public function validate(array $data): array
     /**
      * @param ContactData $data
      */
-    public function send(array $data, ?string $ipAddress = null): bool
+    public function send(array $data, string $ipAddress = ''): bool
     {
         $this->mailService->getMessage()->setReplyTo($data['email'], $data['name']);
         $this->mailService->setSubject('New contact form submission on dotkernel.com');
@@ -237,7 +237,7 @@ private function stringValue(array $raw, string $key): string
     /**
      * @param ContactData $data
      */
-    private function buildBody(array $data, ?string $ipAddress): string
+    private function buildBody(array $data, string $ipAddress): string
     {
         $rows = [
             'Topic'         => ContactTopicEnum::tryFrom($data['topic'])?->label() ?? '',

test/Unit/App/Service/ContactServiceTest.php

@@ -391,7 +391,7 @@ public function testTurnstileIsOffWithEmptyKeys(): void
         );
 
         $this->assertSame('', $service->turnstileSiteKey());
-        $this->assertTrue($service->verifyTurnstile('', null));
+        $this->assertTrue($service->verifyTurnstile('', ''));
         $this->assertSame([], $calls);
     }
 
@@ -405,14 +405,14 @@ public function testTurnstileIsOffWithoutASecretKey(): void
         );
 
         $this->assertSame('', $service->turnstileSiteKey());
-        $this->assertTrue($service->verifyTurnstile('', null));
+        $this->assertTrue($service->verifyTurnstile('', ''));
         $this->assertSame([], $calls);
     }
 
     public function testTurnstileIsOffByDefault(): void
     {
         $this->assertSame('', $this->service()->turnstileSiteKey());
-        $this->assertTrue($this->service()->verifyTurnstile('', null));
+        $this->assertTrue($this->service()->verifyTurnstile('', ''));
     }
 
     public function testTurnstileSiteKeyIsExposedWhenBothKeysAreSet(): void
@@ -449,7 +449,7 @@ public function testRemoteIpIsOmittedWhenNull(): void
         $calls   = [];
         $service = $this->turnstileService(self::TURNSTILE, self::SITEVERIFY_SUCCESS, $calls);
 
-        $this->assertTrue($service->verifyTurnstile('token', null));
+        $this->assertTrue($service->verifyTurnstile('token', ''));
         $this->assertSame([['secret' => 'secret-key', 'response' => 'token']], $calls);
     }
 
@@ -476,7 +476,7 @@ public static function rejectedSiteverifyProvider(): array
     #[DataProvider('rejectedSiteverifyProvider')]
     public function testRejectedSiteverifyFails(array $turnstile, ?string $response): void
     {
-        $this->assertFalse($this->turnstileService($turnstile, $response)->verifyTurnstile('token', null));
+        $this->assertFalse($this->turnstileService($turnstile, $response)->verifyTurnstile('token', ''));
     }
 
     public function testMatchingHostnamePasses(): void
@@ -486,7 +486,7 @@ public function testMatchingHostnamePasses(): void
             self::SITEVERIFY_SUCCESS
         );
 
-        $this->assertTrue($service->verifyTurnstile('token', null));
+        $this->assertTrue($service->verifyTurnstile('token', ''));
     }
 
     public function testTestingKeyResponsePassesEvenWithAHostnameConfigured(): void
@@ -496,6 +496,6 @@ public function testTestingKeyResponsePassesEvenWithAHostnameConfigured(): void
             '{"success":true,"hostname":"example.com","metadata":{"result_with_testing_key":true}}'
         );
 
-        $this->assertTrue($service->verifyTurnstile('token', null));
+        $this->assertTrue($service->verifyTurnstile('token', ''));
     }
 }