Fix the generated param types for maps and lists (#1466)

The constructor are not enforcing the usage of value objects. They also
support passing an array accepted by the create method.

Author: stof

src/CodeGenerator/src/Generator/CodeGenerator/TypeGenerator.php

@@ -61,10 +61,10 @@ public function generateDocblock(StructureShape $shape, ClassName $shapeClassNam
                 // is the list item an object?
                 if ($listMemberShape instanceof StructureShape) {
                     $classNames[] = $className = $this->namespaceRegistry->getObject($listMemberShape);
-                    $param = $className->getName() . '[]';
+                    $param = 'array<' . $className->getName() . '|array>';
                 } elseif (!empty($listMemberShape->getEnum())) {
                     $classNames[] = $className = $this->namespaceRegistry->getEnum($listMemberShape);
-                    $param = 'list<' . $className->getName() . '::*>';
+                    $param = 'array<' . $className->getName() . '::*>';
                 } else {
                     $param = $this->getNativePhpType($listMemberShape->getType()) . '[]';
                 }
@@ -74,7 +74,7 @@ public function generateDocblock(StructureShape $shape, ClassName $shapeClassNam
                 // is the map item an object?
                 if ($mapValueShape instanceof StructureShape) {
                     $classNames[] = $className = $this->namespaceRegistry->getObject($mapValueShape);
-                    $param = $className->getName();
+                    $param = $className->getName() . '|array';
                 } elseif (!empty($mapValueShape->getEnum())) {
                     $classNames[] = $className = $this->namespaceRegistry->getEnum($mapValueShape);
                     $param = $className->getName() . '::*';

src/Core/src/Sts/Input/AssumeRoleRequest.php

@@ -232,10 +232,10 @@ final class AssumeRoleRequest extends Input
      * @param array{
      *   RoleArn?: string,
      *   RoleSessionName?: string,
-     *   PolicyArns?: PolicyDescriptorType[],
+     *   PolicyArns?: array<PolicyDescriptorType|array>,
      *   Policy?: string,
      *   DurationSeconds?: int,
-     *   Tags?: Tag[],
+     *   Tags?: array<Tag|array>,
      *   TransitiveTagKeys?: string[],
      *   ExternalId?: string,
      *   SerialNumber?: string,
@@ -264,10 +264,10 @@ public function __construct(array $input = [])
      * @param array{
      *   RoleArn?: string,
      *   RoleSessionName?: string,
-     *   PolicyArns?: PolicyDescriptorType[],
+     *   PolicyArns?: array<PolicyDescriptorType|array>,
      *   Policy?: string,
      *   DurationSeconds?: int,
-     *   Tags?: Tag[],
+     *   Tags?: array<Tag|array>,
      *   TransitiveTagKeys?: string[],
      *   ExternalId?: string,
      *   SerialNumber?: string,

src/Core/src/Sts/Input/AssumeRoleWithWebIdentityRequest.php

@@ -135,7 +135,7 @@ final class AssumeRoleWithWebIdentityRequest extends Input
      *   RoleSessionName?: string,
      *   WebIdentityToken?: string,
      *   ProviderId?: string,
-     *   PolicyArns?: PolicyDescriptorType[],
+     *   PolicyArns?: array<PolicyDescriptorType|array>,
      *   Policy?: string,
      *   DurationSeconds?: int,
      *   '@region'?: string|null,
@@ -159,7 +159,7 @@ public function __construct(array $input = [])
      *   RoleSessionName?: string,
      *   WebIdentityToken?: string,
      *   ProviderId?: string,
-     *   PolicyArns?: PolicyDescriptorType[],
+     *   PolicyArns?: array<PolicyDescriptorType|array>,
      *   Policy?: string,
      *   DurationSeconds?: int,
      *   '@region'?: string|null,

src/Core/src/Sts/StsClient.php

@@ -112,10 +112,10 @@ class StsClient extends AbstractApi
      * @param array{
      *   RoleArn: string,
      *   RoleSessionName: string,
-     *   PolicyArns?: PolicyDescriptorType[],
+     *   PolicyArns?: array<PolicyDescriptorType|array>,
      *   Policy?: string,
      *   DurationSeconds?: int,
-     *   Tags?: Tag[],
+     *   Tags?: array<Tag|array>,
      *   TransitiveTagKeys?: string[],
      *   ExternalId?: string,
      *   SerialNumber?: string,
@@ -273,7 +273,7 @@ public function assumeRole($input): AssumeRoleResponse
      *   RoleSessionName: string,
      *   WebIdentityToken: string,
      *   ProviderId?: string,
-     *   PolicyArns?: PolicyDescriptorType[],
+     *   PolicyArns?: array<PolicyDescriptorType|array>,
      *   Policy?: string,
      *   DurationSeconds?: int,
      *   '@region'?: string|null,

src/Service/AppSync/src/ValueObject/BadRequestDetail.php

@@ -15,7 +15,7 @@ final class BadRequestDetail
 
     /**
      * @param array{
-     *   codeErrors?: null|CodeError[],
+     *   codeErrors?: null|array<CodeError|array>,
      * } $input
      */
     public function __construct(array $input)
@@ -25,7 +25,7 @@ public function __construct(array $input)
 
     /**
      * @param array{
-     *   codeErrors?: null|CodeError[],
+     *   codeErrors?: null|array<CodeError|array>,
      * }|BadRequestDetail $input
      */
     public static function create($input): self

src/Service/Athena/src/ValueObject/ResultSet.php

@@ -20,7 +20,7 @@ final class ResultSet
 
     /**
      * @param array{
-     *   Rows?: null|Row[],
+     *   Rows?: null|array<Row|array>,
      *   ResultSetMetadata?: null|ResultSetMetadata|array,
      * } $input
      */
@@ -32,7 +32,7 @@ public function __construct(array $input)
 
     /**
      * @param array{
-     *   Rows?: null|Row[],
+     *   Rows?: null|array<Row|array>,
      *   ResultSetMetadata?: null|ResultSetMetadata|array,
      * }|ResultSet $input
      */

src/Service/Athena/src/ValueObject/ResultSetMetadata.php

@@ -15,7 +15,7 @@ final class ResultSetMetadata
 
     /**
      * @param array{
-     *   ColumnInfo?: null|ColumnInfo[],
+     *   ColumnInfo?: null|array<ColumnInfo|array>,
      * } $input
      */
     public function __construct(array $input)
@@ -25,7 +25,7 @@ public function __construct(array $input)
 
     /**
      * @param array{
-     *   ColumnInfo?: null|ColumnInfo[],
+     *   ColumnInfo?: null|array<ColumnInfo|array>,
      * }|ResultSetMetadata $input
      */
     public static function create($input): self

src/Service/Athena/src/ValueObject/Row.php

@@ -14,7 +14,7 @@ final class Row
 
     /**
      * @param array{
-     *   Data?: null|Datum[],
+     *   Data?: null|array<Datum|array>,
      * } $input
      */
     public function __construct(array $input)
@@ -24,7 +24,7 @@ public function __construct(array $input)
 
     /**
      * @param array{
-     *   Data?: null|Datum[],
+     *   Data?: null|array<Datum|array>,
      * }|Row $input
      */
     public static function create($input): self

src/Service/Athena/src/ValueObject/TableMetadata.php

@@ -48,8 +48,8 @@ final class TableMetadata
      *   CreateTime?: null|\DateTimeImmutable,
      *   LastAccessTime?: null|\DateTimeImmutable,
      *   TableType?: null|string,
-     *   Columns?: null|Column[],
-     *   PartitionKeys?: null|Column[],
+     *   Columns?: null|array<Column|array>,
+     *   PartitionKeys?: null|array<Column|array>,
      *   Parameters?: null|array<string, string>,
      * } $input
      */
@@ -70,8 +70,8 @@ public function __construct(array $input)
      *   CreateTime?: null|\DateTimeImmutable,
      *   LastAccessTime?: null|\DateTimeImmutable,
      *   TableType?: null|string,
-     *   Columns?: null|Column[],
-     *   PartitionKeys?: null|Column[],
+     *   Columns?: null|array<Column|array>,
+     *   PartitionKeys?: null|array<Column|array>,
      *   Parameters?: null|array<string, string>,
      * }|TableMetadata $input
      */

src/Service/CloudFormation/src/ValueObject/RollbackConfiguration.php

@@ -52,7 +52,7 @@ final class RollbackConfiguration
 
     /**
      * @param array{
-     *   RollbackTriggers?: null|RollbackTrigger[],
+     *   RollbackTriggers?: null|array<RollbackTrigger|array>,
      *   MonitoringTimeInMinutes?: null|int,
      * } $input
      */
@@ -64,7 +64,7 @@ public function __construct(array $input)
 
     /**
      * @param array{
-     *   RollbackTriggers?: null|RollbackTrigger[],
+     *   RollbackTriggers?: null|array<RollbackTrigger|array>,
      *   MonitoringTimeInMinutes?: null|int,
      * }|RollbackConfiguration $input
      */