Fix casing and ignore errors with hashmap keys.

microsoft · Oct 3, 2023 · c0e2014 · c0e2014
1 parent e75387d
commit c0e2014
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/it/php/phpstan.neon b/it/php/phpstan.neon
@@ -7,4 +7,4 @@ parameters:
     - src
   ignoreErrors:
     - '#Parameter [\w\W]+ \$errorMappings of method [\w\\]+RequestAdapter::send[\w]+\(\) expects [\w\W\s]+ given\.#'
-    - '#getFieldDeserializers\(\) should return array\<string, callable\(Microsoft\\Kiota\\Abstractions\\Serialization\\ParseNode\)\: void\> but returns array\{[\d]\: Closure\(Microsoft\\Kiota\\Abstractions\\Serialization\\ParseNode\)\: void.+#'
+    - '#getFieldDeserializers\(\) should return array\<string, callable\(Microsoft\\Kiota\\Abstractions\\Serialization\\ParseNode\)\: void\> but returns array\{[\d]+\: Closure\(Microsoft\\Kiota\\Abstractions\\Serialization\\ParseNode\)\: void.+#'
diff --git a/src/Kiota.Builder/Writers/Php/CodeMethodWriter.cs b/src/Kiota.Builder/Writers/Php/CodeMethodWriter.cs
@@ -268,7 +268,7 @@ private string GetDocCommentReturnType(CodeMethod codeMethod)
     {
         return codeMethod.Kind switch
         {
-            CodeMethodKind.Deserializer => "array<string, callable(ParseNode): void>",
+            CodeMethodKind.Deserializer => "array<string|int, callable(ParseNode): void>",
             CodeMethodKind.Getter when codeMethod.AccessedProperty?.IsOfKind(CodePropertyKind.AdditionalData) ?? false => "array<string, mixed>",
             CodeMethodKind.Getter when codeMethod.AccessedProperty?.Type.IsCollection ?? false => $"array<{conventions.TranslateType(codeMethod.AccessedProperty.Type)}>",
             _ => conventions.GetTypeString(codeMethod.ReturnType, codeMethod)
@@ -719,7 +719,7 @@ private void WriteRequestExecutorBody(CodeMethod codeElement, CodeClass parentCl
             writer.IncreaseIndent(2);
             errorMappings.ToList().ForEach(errorMapping =>
             {
-                writer.WriteLine($"'{errorMapping.Key}' => [{errorMapping.Value.Name}::class, '{CreateDiscriminatorMethodName}'],");
+                writer.WriteLine($"'{errorMapping.Key}' => [{errorMapping.Value.Name.ToFirstCharacterUpperCase()}::class, '{CreateDiscriminatorMethodName}'],");
             });
             writer.DecreaseIndent();
             writer.WriteLine("];");