Allow nullable string properties.

jboctor · Aug 20, 2023 · 030ba36 · 030ba36
1 parent d24f6b1
commit 030ba36
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/src/Formatter/ArrayBasedFormatter.php b/src/Formatter/ArrayBasedFormatter.php
@@ -52,10 +52,10 @@ public function serializeFloat(mixed $runningValue, Field $field, float $next):
     /**
      * @param array<string, mixed> $runningValue
      * @param Field $field
-     * @param string $next
+     * @param string|null $next
      * @return array<string, mixed>
      */
-    public function serializeString(mixed $runningValue, Field $field, string $next): array
+    public function serializeString(mixed $runningValue, Field $field, ?string $next): array
     {
         $runningValue[$field->serializedName] = $next;
         return $runningValue;

diff --git a/src/Formatter/CsvStreamFormatter.php b/src/Formatter/CsvStreamFormatter.php
@@ -53,7 +53,7 @@ public function format(): string
     /**
      * @param FormatterStream $runningValue
      */
-    public function serializeString(mixed $runningValue, Field $field, string $next): mixed
+    public function serializeString(mixed $runningValue, Field $field, ?string $next): mixed
     {
         $next = str_replace($this->enclosure, $this->escape . $this->enclosure, $next);
         $runningValue->write($this->enclosure . $next . $this->enclosure);

diff --git a/src/Formatter/Formatter.php b/src/Formatter/Formatter.php
@@ -24,7 +24,7 @@ public function serializeInt(mixed $runningValue, Field $field, int $next): mixe
 
     public function serializeFloat(mixed $runningValue, Field $field, float $next): mixed;
 
-    public function serializeString(mixed $runningValue, Field $field, string $next): mixed;
+    public function serializeString(mixed $runningValue, Field $field, ?string $next): mixed;
 
     public function serializeBool(mixed $runningValue, Field $field, bool $next): mixed;
 

diff --git a/src/Formatter/StreamFormatter.php b/src/Formatter/StreamFormatter.php
@@ -38,7 +38,7 @@ public function serializeFloat(mixed $runningValue, Field $field, float $next):
         return $runningValue;
     }
 
-    public function serializeString(mixed $runningValue, Field $field, string $next): mixed
+    public function serializeString(mixed $runningValue, Field $field, ?string $next): mixed
     {
         $runningValue->printf('"%s"', $next);
         return $runningValue;

diff --git a/tests/ArrayBasedFormatterTest.php b/tests/ArrayBasedFormatterTest.php
@@ -145,7 +145,7 @@ protected function empty_values_validate(mixed $serialized): void
         self::assertEquals('boop', $toTest['withDefault']);
         self::assertArrayNotHasKey('nullableUninitialized', $toTest);
         self::assertArrayNotHasKey('uninitialized', $toTest);
-        self::assertArrayNotHasKey('roNullable', $toTest);
+        self::assertNull($toTest['roNullable']);
     }
 
     public function exclude_values_validate(mixed $serialized): void

diff --git a/tests/JsonFormatterTest.php b/tests/JsonFormatterTest.php
@@ -47,7 +47,7 @@ protected function point_validate(mixed $serialized): void
     protected function visibility_validate(mixed $serialized): void
     {
         parent::visibility_validate($serialized);
-        self::assertEquals('{"public":1,"protected":2,"private":3,"visibility":{"public":4,"protected":5,"private":6}}', $serialized);
+        self::assertEquals('{"public":1,"protected":2,"private":3,"visibility":{"public":4,"protected":5,"private":6,"visibility":null}}', $serialized);
     }
 
     protected function optional_point_validate(mixed $serialized): void