Merge pull request #7 from WyriHaximus/json_serializable

Any JsonSerializable object will now be turned into an array
WyriHaximus · Dec 1, 2018 · ca1924d · ca1924d
2 parents 6936b89 + b55701d
commit ca1924d
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 35 deletions.
diff --git a/src/functions.php b/src/functions.php
@@ -61,6 +61,10 @@ function formatValue($value): string
 function normalizeContext(array $context): array
 {
     foreach ($context as $index => $value) {
+        if ($value instanceof \JsonSerializable) {
+            $value = $value->jsonSerialize();
+        }
+
         if (\is_array($value)) {
             $context[$index] = normalizeContext($value);
             continue;
@@ -78,6 +82,10 @@ function normalizeContext(array $context): array
 function normalizeContextWithFormatValue(array $context): array
 {
     foreach ($context as $index => $value) {
+        if ($value instanceof \JsonSerializable) {
+            $value = $value->jsonSerialize();
+        }
+
         if (\is_array($value)) {
             $context[$index] = normalizeContextWithFormatValue($value);
             continue;

diff --git a/tests/NormalizeContextTest.php b/tests/NormalizeContextTest.php
@@ -47,6 +47,28 @@ public function provideContexts()
                 ],
             ],
         ];
+
+        yield [
+            [
+                [
+                    'json_serializable' => new class() implements \JsonSerializable {
+                        public function jsonSerialize()
+                        {
+                            return [
+                                'foo' => 'bar',
+                            ];
+                        }
+                    },
+                ],
+            ],
+            [
+                [
+                    'json_serializable' => [
+                        'foo' => 'bar',
+                    ],
+                ],
+            ],
+        ];
     }
 
     /**

diff --git a/tests/NormalizeContextWithFormatValueTest.php b/tests/NormalizeContextWithFormatValueTest.php
@@ -12,41 +12,7 @@ final class NormalizeContextWithFormatValueTest extends TestCase
 {
     public function provideContexts()
     {
-        yield [
-            [],
-            [],
-        ];
-
-        yield [
-            [
-                [],
-            ],
-            [
-                [],
-            ],
-        ];
-
-        yield [
-            [
-                'stdout' => STDOUT,
-            ],
-            [
-                'stdout' => '[resource] (stream)',
-            ],
-        ];
-
-        yield [
-            [
-                [
-                    'stdout' => STDOUT,
-                ],
-            ],
-            [
-                [
-                    'stdout' => '[resource] (stream)',
-                ],
-            ],
-        ];
+        yield from (new NormalizeContextTest())->provideContexts();
 
         yield [
             [