refactor: cover psr7, psr18, valinor telemetry bridges with mago

Author: norberttech

Justfile

@@ -81,7 +81,10 @@ analyze-mago *args:
         src/bridge/monolog/http \
         src/bridge/monolog/telemetry \
         src/bridge/phpunit/postgresql \
-        src/bridge/phpunit/telemetry
+        src/bridge/phpunit/telemetry \
+        src/bridge/postgresql/valinor \
+        src/bridge/psr18/telemetry \
+        src/bridge/psr7/telemetry
 
 # Auto-fix code style (Mago format + lint --fix) and GitHub Actions findings (zizmor --fix).
 fix:

src/bridge/postgresql/valinor/tests/Flow/PostgreSql/Bridge/Valinor/Tests/Unit/ValinorBuilderMapperTest.php

@@ -15,6 +15,7 @@
 use PHPUnit\Framework\TestCase;
 
 use function Flow\PostgreSql\DSL\type_mapper;
+use function Flow\Types\DSL\type_instance_of;
 use function Flow\Types\DSL\type_integer;
 use function Flow\Types\DSL\type_string;
 use function Flow\Types\DSL\type_structure;
@@ -36,13 +37,11 @@ public function test_composes_with_type_mapper_to_decode_jsonb_into_nested_objec
             new ValinorBuilderMapper(new MapperBuilder(), UserWithAddress::class),
         );
 
-        $result = $mapper->map([
+        $result = type_instance_of(UserWithAddress::class)->assert($mapper->map([
             'id' => 1,
             'name' => 'Jane',
             'address' => '{"street":"Main 1","city":"Warsaw"}',
-        ], MapperContextMother::any());
-
-        static::assertInstanceOf(UserWithAddress::class, $result);
+        ], MapperContextMother::any()));
         static::assertInstanceOf(Address::class, $result->address);
         static::assertSame('Main 1', $result->address->street);
         static::assertSame('Warsaw', $result->address->city);

src/bridge/postgresql/valinor/tests/Flow/PostgreSql/Bridge/Valinor/Tests/Unit/ValinorTreeMapperTest.php

@@ -19,6 +19,7 @@
 
 use function Flow\PostgreSql\DSL\type_mapper;
 use function Flow\Types\DSL\type_datetime;
+use function Flow\Types\DSL\type_instance_of;
 use function Flow\Types\DSL\type_integer;
 use function Flow\Types\DSL\type_string;
 use function Flow\Types\DSL\type_structure;
@@ -52,12 +53,11 @@ public function test_composes_with_type_mapper_for_datetime_columns(): void
             new ValinorTreeMapper((new MapperBuilder())->mapper(), WithDateTime::class),
         );
 
-        $result = $mapper->map([
+        $result = type_instance_of(WithDateTime::class)->assert($mapper->map([
             'id' => 7,
             'createdAt' => '2024-03-15 14:30:00',
-        ], MapperContextMother::any());
+        ], MapperContextMother::any()));
 
-        static::assertInstanceOf(WithDateTime::class, $result);
         static::assertSame(7, $result->id);
         static::assertSame('2024-03-15 14:30:00', $result->createdAt->format('Y-m-d H:i:s'));
     }
@@ -76,13 +76,11 @@ public function test_composes_with_type_mapper_to_decode_jsonb_into_nested_objec
             new ValinorTreeMapper((new MapperBuilder())->mapper(), UserWithAddress::class),
         );
 
-        $result = $mapper->map([
+        $result = type_instance_of(UserWithAddress::class)->assert($mapper->map([
             'id' => 1,
             'name' => 'Jane',
             'address' => '{"street":"Main 1","city":"Warsaw"}',
-        ], MapperContextMother::any());
-
-        static::assertInstanceOf(UserWithAddress::class, $result);
+        ], MapperContextMother::any()));
         static::assertInstanceOf(Address::class, $result->address);
         static::assertSame('Main 1', $result->address->street);
         static::assertSame('Warsaw', $result->address->city);

src/bridge/psr18/telemetry/tests/Flow/Bridge/Psr18/Telemetry/Tests/Integration/PSR18TraceableClientIntegrationTest.php

@@ -54,8 +54,13 @@ public function test_real_http_request_creates_span(): void
         static::assertSame(8080, $attributes['server.port']);
         static::assertSame(200, $attributes['http.response.status_code']);
 
-        static::assertNotNull($span->status());
-        static::assertTrue($span->status()->isOk());
+        $status = $span->status();
+
+        if ($status === null) {
+            static::fail('Expected span to have status');
+        }
+
+        static::assertTrue($status->isOk());
     }
 
     private function createTelemetry(MemorySpanProcessor $spanProcessor): Telemetry

src/bridge/psr18/telemetry/tests/Flow/Bridge/Psr18/Telemetry/Tests/Unit/PSR18TraceableClientTest.php

@@ -57,9 +57,14 @@ public function test_exception_is_recorded_and_rethrown(): void
             static::assertSame(RuntimeException::class, $eventAttributes['exception.type']);
             static::assertSame('Connection failed', $eventAttributes['exception.message']);
 
-            static::assertNotNull($span->status());
-            static::assertTrue($span->status()->isError());
-            static::assertSame('Connection failed', $span->status()->description);
+            $status = $span->status();
+
+            if ($status === null) {
+                static::fail('Expected span to have status');
+            }
+
+            static::assertTrue($status->isError());
+            static::assertSame('Connection failed', $status->description);
         }
     }
 
@@ -80,9 +85,14 @@ public function test_request_with_4xx_status_creates_error_span(): void
         static::assertCount(1, $spans);
         $span = $spans[0];
 
-        static::assertNotNull($span->status());
-        static::assertTrue($span->status()->isError());
-        static::assertSame('HTTP 404', $span->status()->description);
+        $status = $span->status();
+
+        if ($status === null) {
+            static::fail('Expected span to have status');
+        }
+
+        static::assertTrue($status->isError());
+        static::assertSame('HTTP 404', $status->description);
         static::assertSame(404, $span->attributes()['http.response.status_code']);
     }
 
@@ -103,9 +113,14 @@ public function test_request_with_5xx_status_creates_error_span(): void
         static::assertCount(1, $spans);
         $span = $spans[0];
 
-        static::assertNotNull($span->status());
-        static::assertTrue($span->status()->isError());
-        static::assertSame('HTTP 500', $span->status()->description);
+        $status = $span->status();
+
+        if ($status === null) {
+            static::fail('Expected span to have status');
+        }
+
+        static::assertTrue($status->isError());
+        static::assertSame('HTTP 500', $status->description);
         static::assertSame(500, $span->attributes()['http.response.status_code']);
     }
 
@@ -173,8 +188,13 @@ public function test_successful_request_creates_span_with_ok_status(): void
         $span = $spans[0];
 
         static::assertSame('GET api.example.com', $span->name());
-        static::assertNotNull($span->status());
-        static::assertTrue($span->status()->isOk());
+        $status = $span->status();
+
+        if ($status === null) {
+            static::fail('Expected span to have status');
+        }
+
+        static::assertTrue($status->isOk());
     }
 
     private function createTelemetry(MemorySpanProcessor $spanProcessor): Telemetry