test: Update tests

roxblnfk · roxblnfk · commit 4cbf8ac3b8ac · 2025-10-01T12:18:15.000+04:00
diff --git a/src/Context/DefaultProcessor.php b/src/Context/DefaultProcessor.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace RoadRunner\PsrLogger\Internal;
+namespace RoadRunner\PsrLogger\Context;
 
-use RoadRunner\PsrLogger\Internal\ContextProcessor\DateTimeProcessor;
-use RoadRunner\PsrLogger\Internal\ContextProcessor\FallbackProcessor;
-use RoadRunner\PsrLogger\Internal\ContextProcessor\StringableProcessor;
-use RoadRunner\PsrLogger\Internal\ContextProcessor\ThrowableProcessor;
+use RoadRunner\PsrLogger\Context\ObjectProcessor\DateTimeProcessor;
+use RoadRunner\PsrLogger\Context\ObjectProcessor\FallbackProcessor;
+use RoadRunner\PsrLogger\Context\ObjectProcessor\StringableProcessor;
+use RoadRunner\PsrLogger\Context\ObjectProcessor\ThrowableProcessor;
 
 final class DefaultProcessor
 {
@@ -23,6 +23,7 @@ public static function createDefault(): self
             new ThrowableProcessor(),
             new FallbackProcessor(),
         ];
+        return $self;
     }
 
     /**
diff --git a/src/Context/ObjectProcessor.php b/src/Context/ObjectProcessor.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace RoadRunner\PsrLogger\Internal;
+namespace RoadRunner\PsrLogger\Context;
 
 /**
  * Converts an object into a scalar or an arra for serializable logger context.
diff --git a/src/Context/ObjectProcessor/DateTimeProcessor.php b/src/Context/ObjectProcessor/DateTimeProcessor.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace RoadRunner\PsrLogger\Internal\ContextProcessor;
+namespace RoadRunner\PsrLogger\Context\ObjectProcessor;
 
-use RoadRunner\PsrLogger\Internal\ObjectProcessor;
+use RoadRunner\PsrLogger\Context\ObjectProcessor;
 
 /**
  * Processor for DateTime objects.
diff --git a/src/Context/ObjectProcessor/FallbackProcessor.php b/src/Context/ObjectProcessor/FallbackProcessor.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace RoadRunner\PsrLogger\Internal\ContextProcessor;
+namespace RoadRunner\PsrLogger\Context\ObjectProcessor;
 
-use RoadRunner\PsrLogger\Internal\ObjectProcessor;
+use RoadRunner\PsrLogger\Context\ObjectProcessor;
 
 /**
  * Fallback processor for unknown objects.
@@ -20,7 +20,7 @@ public function canProcess(object $value): bool
         return true;
     }
 
-    public function process(object $value, callable $processor): string
+    public function process(object $value, callable $processor): array
     {
         $result = ['@class' => $value::class] + \get_object_vars($value);
         foreach ($result as $k => &$v) {
diff --git a/src/Context/ObjectProcessor/StringableProcessor.php b/src/Context/ObjectProcessor/StringableProcessor.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace RoadRunner\PsrLogger\Internal\ContextProcessor;
+namespace RoadRunner\PsrLogger\Context\ObjectProcessor;
 
-use RoadRunner\PsrLogger\Internal\ObjectProcessor;
+use RoadRunner\PsrLogger\Context\ObjectProcessor;
 
 /**
  * Converts Stringable objects to their string representation.
diff --git a/src/Context/ObjectProcessor/ThrowableProcessor.php b/src/Context/ObjectProcessor/ThrowableProcessor.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace RoadRunner\PsrLogger\Internal\ContextProcessor;
+namespace RoadRunner\PsrLogger\Context\ObjectProcessor;
 
-use RoadRunner\PsrLogger\Internal\ObjectProcessor;
+use RoadRunner\PsrLogger\Context\ObjectProcessor;
 
 /**
  * Converts exceptions to structured data containing class, message,
diff --git a/src/RpcLogger.php b/src/RpcLogger.php
@@ -10,21 +10,19 @@
 use Psr\Log\InvalidArgumentException as PsrInvalidArgumentException;
 use RoadRunner\Logger\Logger as AppLogger;
 use RoadRunner\Logger\LogLevel;
-use RoadRunner\PsrLogger\Internal\DefaultProcessor;
-use RoadRunner\PsrLogger\Internal\ObjectProcessor;
-use RoadRunner\PsrLogger\Internal\ContextProcessor\ObjectProcessorManager;
+use RoadRunner\PsrLogger\Context\DefaultProcessor;
 
 class RpcLogger implements LoggerInterface
 {
     use LoggerTrait;
 
     private readonly AppLogger $logger;
-    private readonly ObjectProcessor $contextProcessor;
+    private readonly \Closure $objectProcessor;
 
     public function __construct(AppLogger $logger, ?callable $processor = null)
     {
         $this->logger = $logger;
-        $this->contextProcessor = $processor ?? DefaultProcessor::createDefault();
+        $this->objectProcessor = ($processor ?? DefaultProcessor::createDefault())(...);
     }
 
     /**
@@ -45,7 +43,7 @@ public function log($level, \Stringable|string $message, array $context = []): v
         });
 
         // Process context data for structured logging using the processor manager
-        $processedContext = $this->contextProcessor->processContext($context);
+        $processedContext = ($this->objectProcessor)($context);
 
         match ($normalizedLevel) {
             PsrLogLevel::EMERGENCY,
diff --git a/tests/Unit/Context/DefaultProcessorTest.php b/tests/Unit/Context/DefaultProcessorTest.php
@@ -0,0 +1,91 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Context;
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+use RoadRunner\PsrLogger\Context\DefaultProcessor;
+use RoadRunner\PsrLogger\Context\ObjectProcessor\BuiltInTypeProcessor;
+
+#[CoversClass(DefaultProcessor::class)]
+class DefaultProcessorTest extends TestCase
+{
+    private DefaultProcessor $processor;
+
+    public static function builtInTypeValuesProvider(): array
+    {
+        return [
+            'string' => ['test string', 'test string'],
+            'integer' => [42, 42],
+            'float' => [3.14, 3.14],
+            'boolean true' => [true, true],
+            'boolean false' => [false, false],
+            'null' => [null, null],
+            'empty array' => [[], []],
+            'simple array' => [[1, 2, 3], [1, 2, 3]],
+            'associative array' => [['key' => 'value'], ['key' => 'value']],
+            'resource' => [\fopen('php://memory', 'r'), 'stream resource'],
+        ];
+    }
+
+    #[DataProvider('builtInTypeValuesProvider')]
+    public function testCanProcessBuiltInTypes(mixed $value, mixed $expected): void
+    {
+        $this->assertSame($expected, ($this->processor)($value));
+    }
+
+    public function testProcessNull(): void
+    {
+        $recursiveProcessor = static fn($v) => $v;
+        $result = ($this->processor)(null, $recursiveProcessor);
+        $this->assertNull($result);
+    }
+
+    public function testProcessScalarValues(): void
+    {
+        $values = ['test string', 42, 3.14, true, false];
+        $recursiveProcessor = static fn($v) => $v;
+
+        foreach ($values as $value) {
+            $result = ($this->processor)($value, $recursiveProcessor);
+            $this->assertSame($value, $result);
+        }
+    }
+
+    public function testProcessSimpleArray(): void
+    {
+        $array = [1, 2, 'three', true];
+        $recursiveProcessor = static fn($v) => $v; // Identity function for simple values
+
+        $result = ($this->processor)($array, $recursiveProcessor);
+
+        $this->assertSame([1, 2, 'three', true], $result);
+    }
+
+    public function testProcessNestedArray(): void
+    {
+        $array = [
+            'level1' => [
+                'level2' => [
+                    'value' => 'deep',
+                ],
+            ],
+        ];
+
+        $result = ($this->processor)($array);
+
+        $this->assertArrayHasKey('level1', $result);
+        $this->assertIsArray($result['level1']);
+        $this->assertArrayHasKey('level2', $result['level1']);
+        $this->assertIsArray($result['level1']['level2']);
+        $this->assertSame('deep', $result['level1']['level2']['value']);
+    }
+
+    protected function setUp(): void
+    {
+        $this->processor = new DefaultProcessor();
+    }
+}
diff --git a/tests/Unit/Context/ObjectProcessor/DateTimeProcessorTest.php b/tests/Unit/Context/ObjectProcessor/DateTimeProcessorTest.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace RoadRunner\PsrLogger\Tests\Unit\ContextProcessor;
+namespace Context\ObjectProcessor;
 
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
-use RoadRunner\PsrLogger\Internal\ContextProcessor\DateTimeProcessor;
+use RoadRunner\PsrLogger\Context\ObjectProcessor\DateTimeProcessor;
 
 #[CoversClass(DateTimeProcessor::class)]
 class DateTimeProcessorTest extends TestCase
@@ -27,9 +27,6 @@ public function testCanProcessDateTimeImmutable(): void
 
     public function testCannotProcessNonDateTime(): void
     {
-        $this->assertFalse($this->processor->canProcess('not a datetime'));
-        $this->assertFalse($this->processor->canProcess(123));
-        $this->assertFalse($this->processor->canProcess([]));
         $this->assertFalse($this->processor->canProcess(new \stdClass()));
     }
 
diff --git a/tests/Unit/Context/ObjectProcessor/FallbackProcessorTest.php b/tests/Unit/Context/ObjectProcessor/FallbackProcessorTest.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Context\ObjectProcessor;
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+use RoadRunner\PsrLogger\Context\ObjectProcessor\FallbackProcessor;
+
+#[CoversClass(FallbackProcessor::class)]
+class FallbackProcessorTest extends TestCase
+{
+    private FallbackProcessor $processor;
+
+    public static function allTypesProvider(): array
+    {
+        $resource = \fopen('php://memory', 'r');
+
+        $data = [
+            'object' => [new \stdClass(), [
+                '@class' => 'stdClass',
+            ]],
+            'object with props' => [(object) ['foo' => 'bar'], [
+                '@class' => 'stdClass',
+                'foo' => 'bar',
+            ]],
+        ];
+
+        // Close the resource after creating the test data
+        \register_shutdown_function(static function () use ($resource): void {
+            if (\is_resource($resource)) {
+                \fclose($resource);
+            }
+        });
+
+        return $data;
+    }
+
+    #[DataProvider('allTypesProvider')]
+    public function testProcessReturnsTypeString(object $value, mixed $expectedType): void
+    {
+        $recursiveProcessor = static fn($v) => $v;
+        $result = $this->processor->process($value, $recursiveProcessor);
+
+        // FallbackProcessor should be able to process any object
+        $this->assertTrue($this->processor->canProcess($value));
+        $this->assertSame($expectedType, $result);
+    }
+
+    protected function setUp(): void
+    {
+        $this->processor = new FallbackProcessor();
+    }
+}
diff --git a/tests/Unit/Context/ObjectProcessor/StringableProcessorTest.php b/tests/Unit/Context/ObjectProcessor/StringableProcessorTest.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace RoadRunner\PsrLogger\Tests\Unit\ContextProcessor;
+namespace Context\ObjectProcessor;
 
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
-use RoadRunner\PsrLogger\Internal\ContextProcessor\StringableProcessor;
+use RoadRunner\PsrLogger\Context\ObjectProcessor\StringableProcessor;
 
 #[CoversClass(StringableProcessor::class)]
 class StringableProcessorTest extends TestCase
@@ -17,14 +17,13 @@ class StringableProcessorTest extends TestCase
     public static function nonStringableProvider(): array
     {
         return [
-            'string' => ['regular string'],
-            'integer' => [42],
-            'float' => [3.14],
-            'boolean' => [true],
-            'null' => [null],
-            'array' => [[]],
-            'object' => [new \stdClass()],
-            'resource' => [\fopen('php://memory', 'r')],
+            [new \stdClass(), false],
+            [new class implements \Stringable {
+                public function __toString(): string
+                {
+                    return 'I am string';
+                }
+            }, true],
         ];
     }
 
@@ -41,9 +40,9 @@ public function __toString(): string
     }
 
     #[DataProvider('nonStringableProvider')]
-    public function testCannotProcessNonStringable(mixed $value): void
+    public function testCannotProcessNonStringable(mixed $value, $expected): void
     {
-        $this->assertFalse($this->processor->canProcess($value));
+        $this->assertSame($expected, $this->processor->canProcess($value));
     }
 
     public function testProcessStringable(): void
diff --git a/tests/Unit/Context/ObjectProcessor/ThrowableProcessorTest.php b/tests/Unit/Context/ObjectProcessor/ThrowableProcessorTest.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace RoadRunner\PsrLogger\Tests\Unit\ContextProcessor;
+namespace Context\ObjectProcessor;
 
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
-use RoadRunner\PsrLogger\Internal\ContextProcessor\ThrowableProcessor;
+use RoadRunner\PsrLogger\Context\ObjectProcessor\ThrowableProcessor;
 
 #[CoversClass(ThrowableProcessor::class)]
 class ThrowableProcessorTest extends TestCase
@@ -28,12 +28,7 @@ public static function throwableProvider(): array
     public static function nonThrowableProvider(): array
     {
         return [
-            'string' => ['error message'],
-            'integer' => [500],
-            'array' => [['error' => 'message']],
             'object' => [new \stdClass()],
-            'null' => [null],
-            'boolean' => [false],
         ];
     }
 
diff --git a/tests/Unit/ContextProcessor/BuiltInTypeProcessorTest.php b/tests/Unit/ContextProcessor/BuiltInTypeProcessorTest.php
diff --git a/tests/Unit/ContextProcessor/ContextProcessorManagerTest.php b/tests/Unit/ContextProcessor/ContextProcessorManagerTest.php
diff --git a/tests/Unit/ContextProcessor/FallbackProcessorTest.php b/tests/Unit/ContextProcessor/FallbackProcessorTest.php
diff --git a/tests/Unit/ContextProcessor/ObjectProcessorTest.php b/tests/Unit/ContextProcessor/ObjectProcessorTest.php
diff --git a/tests/Unit/ContextProcessor/ResourceProcessorTest.php b/tests/Unit/ContextProcessor/ResourceProcessorTest.php
diff --git a/tests/Unit/RpcLoggerTest.php b/tests/Unit/RpcLoggerTest.php
