Fix invalid go generation (#121)

riverwaysoft · Apr 22, 2024 · b642a4b · b642a4b
1 parent 19d982f
commit b642a4b
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 30 deletions.
diff --git a/src/OutputGenerator/Go/GoEnumResolver.php b/src/OutputGenerator/Go/GoEnumResolver.php
@@ -57,7 +57,7 @@ private function convertEnumToGoEnumProperties(array $properties, string $enum):
             }
             $this->usedConstantsStore[] = $const;
 
-            $spaces = str_repeat(' ', $maxEnumPropNameLength - strlen($prop->getName()) + 1);
+            $spaces = str_repeat(' ', $maxEnumPropNameLength - strlen($const) + 1);
 
             $value = $prop->isNumeric() ? $prop->getValue() : sprintf('"%s"', $prop->getValue());
             $string .= sprintf("\n\t%s$spaces%s = %s", $const, $enum, $value);

diff --git a/src/OutputGenerator/Go/GoTypeResolver.php b/src/OutputGenerator/Go/GoTypeResolver.php
@@ -81,9 +81,9 @@ private function resolveBase(PhpBaseType $type, ?DtoType $dto): string
             $type->equalsTo(PhpBaseType::string()) => 'string',
             $type->equalsTo(PhpBaseType::bool()) => 'bool',
             $type->equalsTo(PhpBaseType::mixed()),
-            $type->equalsTo(PhpBaseType::object()) => 'interface{}',
+            $type->equalsTo(PhpBaseType::object()),
             $type->equalsTo(PhpBaseType::array()),
-            $type->equalsTo(PhpBaseType::iterable()) => '[]interface{}',
+            $type->equalsTo(PhpBaseType::iterable()) => 'interface{}',
             $type->equalsTo(PhpBaseType::null()) => 'null',
             $type->equalsTo(PhpBaseType::self()) => "*{$dto->getName()}", // * for prevent recursive definition
             default => throw new Exception('Unknown base PHP type: %s' . json_encode($type))

diff --git a/src/OutputGenerator/Go/OutputFilesProcessorProvider.php b/src/OutputGenerator/Go/OutputFilesProcessorProvider.php
@@ -19,9 +19,9 @@ public static function provide(?OutputFilesProcessor $outputFilesProcessor = nul
             [
                 new PrependAutogeneratedNoticeFileProcessor(
                     text: <<<TEXT
-// THE FILE WAS AUTOGENERATED USING PHP-CONVERTER. PLEASE DO NOT EDIT IT!
-// THE FILE WAS AUTOGENERATED USING PHP-CONVERTER. PLEASE DO NOT EDIT IT!
-// THE FILE WAS AUTOGENERATED USING PHP-CONVERTER. PLEASE DO NOT EDIT IT!
+// Code generated by php-converter. DO NOT EDIT.
+// Code generated by php-converter. DO NOT EDIT.
+// Code generated by php-converter. DO NOT EDIT.
 
 package gen
 

diff --git a/tests/OutputGenerator/Fixtures/NestedDto.php b/tests/OutputGenerator/Fixtures/NestedDto.php
@@ -9,6 +9,8 @@ final class PermissionsEnum extends Enum
     private const VIEW = 'view';
 
     private const EDIT = 'edit';
+
+    private const CREATE_EXTRA_SUPER_FILE = 'create-extra-super-file';
 }
 
 class FullName

diff --git a/...eneratorTest/testDtoConstantDoesntThrow/GoGeneratorTest__testDtoConstantDoesntThrow__1.go b/...eneratorTest/testDtoConstantDoesntThrow/GoGeneratorTest__testDtoConstantDoesntThrow__1.go
diff --git a/...pshots__/GoGeneratorTest/testNestedDtoConvert/GoGeneratorTest__testNestedDtoConvert__1.go b/...pshots__/GoGeneratorTest/testNestedDtoConvert/GoGeneratorTest__testNestedDtoConvert__1.go
diff --git a/.../__snapshots__/GoGeneratorTest/testNormalization/GoGeneratorTest__testNormalization__2.go b/.../__snapshots__/GoGeneratorTest/testNormalization/GoGeneratorTest__testNormalization__2.go
diff --git a/...eratorTest/testNormalizationDirectory/GoGeneratorTest__testNormalizationDirectory__1.json b/...eratorTest/testNormalizationDirectory/GoGeneratorTest__testNormalizationDirectory__1.json
@@ -75,6 +75,10 @@
             {
                 "name": "EDIT",
                 "value": "edit"
+            },
+            {
+                "name": "CREATE_EXTRA_SUPER_FILE",
+                "value": "create-extra-super-file"
             }
         ],
         "generics": []

diff --git a/...eneratorTest/testNormalizationDirectory/GoGeneratorTest__testNormalizationDirectory__2.go b/...eneratorTest/testNormalizationDirectory/GoGeneratorTest__testNormalizationDirectory__2.go
diff --git a/...onWithCustomTypeResolvers/GoGeneratorTest__testNormalizationWithCustomTypeResolvers__1.go b/...onWithCustomTypeResolvers/GoGeneratorTest__testNormalizationWithCustomTypeResolvers__1.go
diff --git a/...eneratorTest/testPhp81SuccessWhenBacked/GoGeneratorTest__testPhp81SuccessWhenBacked__1.go b/...eneratorTest/testPhp81SuccessWhenBacked/GoGeneratorTest__testPhp81SuccessWhenBacked__1.go
diff --git a/...ator/__snapshots__/GoGeneratorTest/testUseTypeEnum/GoGeneratorTest__testUseTypeEnum__1.go b/...ator/__snapshots__/GoGeneratorTest/testUseTypeEnum/GoGeneratorTest__testUseTypeEnum__1.go
diff --git a/...OutputGenerator/__snapshots__/TypeScriptGeneratorTest__testNormalizationDirectory__1.json b/...OutputGenerator/__snapshots__/TypeScriptGeneratorTest__testNormalizationDirectory__1.json
@@ -75,6 +75,10 @@
             {
                 "name": "EDIT",
                 "value": "edit"
+            },
+            {
+                "name": "CREATE_EXTRA_SUPER_FILE",
+                "value": "create-extra-super-file"
             }
         ],
         "generics": []

diff --git a/...s/OutputGenerator/__snapshots__/TypeScriptGeneratorTest__testNormalizationDirectory__2.ts b/...s/OutputGenerator/__snapshots__/TypeScriptGeneratorTest__testNormalizationDirectory__2.ts
@@ -19,6 +19,7 @@ export enum NumberEnum {
 export enum PermissionsEnum {
   VIEW = 'view',
   EDIT = 'edit',
+  CREATE_EXTRA_SUPER_FILE = 'create-extra-super-file',
 }
 
 export type Profile = {