Use int as the PHP representation of long fields in generated code (#1471)

* Use int as the PHP representation of long fields in generated code

* Add changelog entries for signature changes affecting strict types

* Remove generator hacks needed for endpoint shapes to force the type

Now that long fields are always defined as integer, we don't need such
hacks anymore

Author: stof

src/CodeGenerator/src/Generator/CodeGenerator/PopulatorGenerator.php

@@ -123,7 +123,6 @@ private function generateProperties(StructureShape $shape, ClassBuilder $classBu
                     $this->objectGenerator->generate($memberShape, $forEndpoint);
                     if ($forEndpoint && 'endpoints' === $propertyName) {
                         $forEndpoint = false;
-                        $returnType = 'array';
                     }
                 }
                 if (!empty($memberShape->getEnum())) {

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

@@ -187,10 +187,10 @@ private function getNativePhpType(string $parameterType): string
             case 'structure':
             case 'map':
                 return 'array';
-            case 'long':
             case 'string':
             case 'blob':
                 return 'string';
+            case 'long':
             case 'integer':
                 return 'int';
             case 'float':

src/CodeGenerator/src/Generator/InputGenerator.php

@@ -514,8 +514,8 @@ private function stringify(string $variable, Member $member, string $part): stri
             case 'boolean':
                 return $variable . ' ? "true" : "false"';
             case 'string':
-            case 'long':
                 return $variable;
+            case 'long':
             case 'integer':
                 return '(string) ' . $variable;
         }

src/CodeGenerator/src/Generator/ObjectGenerator.php

@@ -219,7 +219,7 @@ private function namedConstructor(StructureShape $shape, ClassBuilder $classBuil
      */
     private function addProperties(StructureShape $shape, ClassBuilder $classBuilder, bool $forEndpoint): void
     {
-        $forEndpointProps = $forEndpoint ? ['address' => false, 'cachePeriodInMinutes' => false] : ['address' => true, 'cachePeriodInMinutes' => true];
+        $forEndpointProps = $forEndpoint ? ['address' => false, 'cachePeriodInMinutes' => false] : [];
         foreach ($shape->getMembers() as $member) {
             $nullable = $returnType = null;
             $memberShape = $member->getShape();
@@ -231,9 +231,6 @@ private function addProperties(StructureShape $shape, ClassBuilder $classBuilder
             [$returnType, $parameterType, $memberClassNames] = $this->typeGenerator->getPhpType($memberShape);
             if ($forEndpoint && isset($forEndpointProps[$propertyName])) {
                 $forEndpointProps[$propertyName] = true;
-                if ('cachePeriodInMinutes' === $propertyName) {
-                    $returnType = $parameterType = 'int';
-                }
             }
             foreach ($memberClassNames as $memberClassName) {
                 $classBuilder->addUse($memberClassName->getFqdn());

src/CodeGenerator/src/Generator/ResponseParser/RestJsonParser.php

@@ -164,8 +164,8 @@ private function parseElement(string $input, Shape $shape, bool $required, bool
 
         switch ($shape->getType()) {
             case 'string':
-            case 'long':
                 return $this->parseResponseString($input, $required);
+            case 'long':
             case 'integer':
                 return $this->parseResponseInteger($input, $required);
             case 'float':

src/CodeGenerator/src/Generator/ResponseParser/RestXmlParser.php

@@ -162,8 +162,8 @@ private function parseXmlElement(string $input, Shape $shape, bool $required, bo
 
         switch ($shape->getType()) {
             case 'string':
-            case 'long':
                 return $this->parseXmlResponseString($input, $required);
+            case 'long':
             case 'integer':
                 return $this->parseXmlResponseInteger($input, $required);
             case 'float':

src/Service/AppSync/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## NOT RELEASED
 
+### BC-BREAK
+
+- The type for `\AsyncAws\AppSync\Input\UpdateApiKeyRequest::setExpires` and `\AsyncAws\AppSync\Input\UpdateApiKeyRequest::getExpires` uses `int` instead of `string` to reflect the AWS type.
+- The return type for the methods `getDeletes` and `getExpires` of `\AsyncAws\AppSync\ValueObject\ApiKey` uses `int` instead of `string` to reflect the AWS type.
+- The return type for `\AsyncAws\AppSync\ValueObject\CachingConfig::getTtl` uses `int` instead of `string` to reflect the AWS type.
+- The return type for the methods `getBaseTableTtl` and `getDeltaSyncTableTtl` of `\AsyncAws\AppSync\ValueObject\DeltaSyncConfig` uses `int` instead of `string` to reflect the AWS type.
+
 ## 1.1.0
 
 ### Added

src/Service/AppSync/src/AppSyncClient.php

@@ -267,7 +267,7 @@ public function startSchemaCreation($input): StartSchemaCreationResponse
      *   apiId: string,
      *   id: string,
      *   description?: string,
-     *   expires?: string,
+     *   expires?: int,
      *   '@region'?: string|null,
      * }|UpdateApiKeyRequest $input
      *

src/Service/AppSync/src/Input/UpdateApiKeyRequest.php

@@ -38,7 +38,7 @@ final class UpdateApiKeyRequest extends Input
      * From the update time, the time after which the API key expires. The date is represented as seconds since the epoch.
      * For more information, see .
      *
-     * @var string|null
+     * @var int|null
      */
     private $expires;
 
@@ -47,7 +47,7 @@ final class UpdateApiKeyRequest extends Input
      *   apiId?: string,
      *   id?: string,
      *   description?: string,
-     *   expires?: string,
+     *   expires?: int,
      *   '@region'?: string|null,
      * } $input
      */
@@ -65,7 +65,7 @@ public function __construct(array $input = [])
      *   apiId?: string,
      *   id?: string,
      *   description?: string,
-     *   expires?: string,
+     *   expires?: int,
      *   '@region'?: string|null,
      * }|UpdateApiKeyRequest $input
      */
@@ -84,7 +84,7 @@ public function getDescription(): ?string
         return $this->description;
     }
 
-    public function getExpires(): ?string
+    public function getExpires(): ?int
     {
         return $this->expires;
     }
@@ -139,7 +139,7 @@ public function setDescription(?string $value): self
         return $this;
     }
 
-    public function setExpires(?string $value): self
+    public function setExpires(?int $value): self
     {
         $this->expires = $value;
 

src/Service/AppSync/src/Result/CreateResolverResponse.php

@@ -43,7 +43,7 @@ private function populateResultAppSyncRuntime(array $json): AppSyncRuntime
     private function populateResultCachingConfig(array $json): CachingConfig
     {
         return new CachingConfig([
-            'ttl' => (string) $json['ttl'],
+            'ttl' => (int) $json['ttl'],
             'cachingKeys' => !isset($json['cachingKeys']) ? null : $this->populateResultCachingKeys($json['cachingKeys']),
         ]);
     }