Apply feedback from code review

* remove import of JsonSerializable * add test for mixed (int and string) enums
asyncapi · Aug 25, 2023 · 048c9e1 · 048c9e1
1 parent 1304e30
commit 048c9e1
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 8 deletions.
diff --git a/examples/php-generate-json-serializable-preset/__snapshots__/index.spec.ts.snap b/examples/php-generate-json-serializable-preset/__snapshots__/index.spec.ts.snap
@@ -9,7 +9,7 @@ namespace Asyncapi;
 
 
 use JsonSerializable;
-final class Root implements JsonSerializable
+final class Root implements \\\\JsonSerializable
 {
   private ?string $email;
 

diff --git a/src/generators/php/presets/JsonSerializablePreset.ts b/src/generators/php/presets/JsonSerializablePreset.ts
@@ -3,16 +3,13 @@ import { PhpRenderer } from '../PhpRenderer';
 import { ConstrainedMetaModel } from '../../../models';
 
 function renderSelf({
-  content,
-  renderer
+  content
 }: {
   content: string;
   renderer: PhpRenderer<ConstrainedMetaModel>;
 }): string {
-  renderer.dependencyManager.addDependency('use JsonSerializable;');
-
   const contentLines = content.split('\n');
-  contentLines[0] += ` implements JsonSerializable`;
+  contentLines[0] += ` implements \\JsonSerializable`;
 
   return contentLines.join('\n');
 }

diff --git a/test/generators/php/presets/JsonSerializablePreset.spec.ts b/test/generators/php/presets/JsonSerializablePreset.spec.ts
@@ -38,4 +38,16 @@ describe('PHP_JSON_SERIALIZABLE_PRESET', () => {
     expect(models).toHaveLength(1);
     expect(models[0].result).toMatchSnapshot();
   });
+
+  test('should render jsonSerialize method for enum with mixed types', async () => {
+    const doc = {
+      $id: 'Enumm',
+      type: 'enum',
+      enum: [1, 'B']
+    };
+
+    const models = await generator.generate(doc);
+    expect(models).toHaveLength(1);
+    expect(models[0].result).toMatchSnapshot();
+  });
 });
diff --git a/test/generators/php/presets/__snapshots__/JsonSerializablePreset.spec.ts.snap b/test/generators/php/presets/__snapshots__/JsonSerializablePreset.spec.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`PHP_JSON_SERIALIZABLE_PRESET should render jsonSerialize method for class 1`] = `
-"final class Clazz implements JsonSerializable
+"final class Clazz implements \\\\JsonSerializable
 {
   private ?string $prop;
   private ?string $propMinusWithMinusDash;
@@ -29,7 +29,7 @@ exports[`PHP_JSON_SERIALIZABLE_PRESET should render jsonSerialize method for cla
 `;
 
 exports[`PHP_JSON_SERIALIZABLE_PRESET should render jsonSerialize method for enum 1`] = `
-"enum Enumm implements JsonSerializable
+"enum Enumm implements \\\\JsonSerializable
 {
   case VALUE_MINUS_A;
   case VALUE_MINUS_B;
@@ -44,3 +44,20 @@ exports[`PHP_JSON_SERIALIZABLE_PRESET should render jsonSerialize method for enu
 }
 "
 `;
+
+exports[`PHP_JSON_SERIALIZABLE_PRESET should render jsonSerialize method for enum with mixed types 1`] = `
+"enum Enumm implements \\\\JsonSerializable
+{
+  case NUMBER_1;
+  case B;
+
+  public function jsonSerialize(): mixed
+  {
+    return match($this) {
+      self::NUMBER_1 => 1,
+      self::B => \\"B\\",
+    };
+  }
+}
+"
+`;