Remove reference $fn in PopulateResult (#678)

* Remove reference $fn in PopulateResult

* Split populateResponse in XML services

* Add docblock

* Better fix nullable map value

* Fix phpstan

Author: jderusse

src/Result/ListLayerVersionsResponse.php

@@ -4,6 +4,7 @@
 
 use AsyncAws\Core\Response;
 use AsyncAws\Core\Result;
+use AsyncAws\Lambda\Enum\Runtime;
 use AsyncAws\Lambda\Input\ListLayerVersionsRequest;
 use AsyncAws\Lambda\LambdaClient;
 use AsyncAws\Lambda\ValueObject\LayerVersionsListItem;
@@ -112,34 +113,44 @@ public function getNextMarker(): ?string
     protected function populateResult(Response $response): void
     {
         $data = $response->toArray();
-        $fn = [];
-        $fn['list-LayerVersionsList'] = static function (array $json) use (&$fn): array {
-            $items = [];
-            foreach ($json as $item) {
-                $items[] = new LayerVersionsListItem([
-                    'LayerVersionArn' => isset($item['LayerVersionArn']) ? (string) $item['LayerVersionArn'] : null,
-                    'Version' => isset($item['Version']) ? (string) $item['Version'] : null,
-                    'Description' => isset($item['Description']) ? (string) $item['Description'] : null,
-                    'CreatedDate' => isset($item['CreatedDate']) ? (string) $item['CreatedDate'] : null,
-                    'CompatibleRuntimes' => empty($item['CompatibleRuntimes']) ? [] : $fn['list-CompatibleRuntimes']($item['CompatibleRuntimes']),
-                    'LicenseInfo' => isset($item['LicenseInfo']) ? (string) $item['LicenseInfo'] : null,
-                ]);
-            }
 
-            return $items;
-        };
-        $fn['list-CompatibleRuntimes'] = static function (array $json) use (&$fn): array {
-            $items = [];
-            foreach ($json as $item) {
-                $a = isset($item) ? (string) $item : null;
-                if (null !== $a) {
-                    $items[] = $a;
-                }
+        $this->NextMarker = isset($data['NextMarker']) ? (string) $data['NextMarker'] : null;
+        $this->LayerVersions = empty($data['LayerVersions']) ? [] : $this->populateResultLayerVersionsList($data['LayerVersions']);
+    }
+
+    /**
+     * @return list<Runtime::*>
+     */
+    private function populateResultCompatibleRuntimes(array $json): array
+    {
+        $items = [];
+        foreach ($json as $item) {
+            $a = isset($item) ? (string) $item : null;
+            if (null !== $a) {
+                $items[] = $a;
             }
+        }
 
-            return $items;
-        };
-        $this->NextMarker = isset($data['NextMarker']) ? (string) $data['NextMarker'] : null;
-        $this->LayerVersions = empty($data['LayerVersions']) ? [] : $fn['list-LayerVersionsList']($data['LayerVersions']);
+        return $items;
+    }
+
+    /**
+     * @return LayerVersionsListItem[]
+     */
+    private function populateResultLayerVersionsList(array $json): array
+    {
+        $items = [];
+        foreach ($json as $item) {
+            $items[] = new LayerVersionsListItem([
+                'LayerVersionArn' => isset($item['LayerVersionArn']) ? (string) $item['LayerVersionArn'] : null,
+                'Version' => isset($item['Version']) ? (string) $item['Version'] : null,
+                'Description' => isset($item['Description']) ? (string) $item['Description'] : null,
+                'CreatedDate' => isset($item['CreatedDate']) ? (string) $item['CreatedDate'] : null,
+                'CompatibleRuntimes' => empty($item['CompatibleRuntimes']) ? [] : $this->populateResultCompatibleRuntimes($item['CompatibleRuntimes']),
+                'LicenseInfo' => isset($item['LicenseInfo']) ? (string) $item['LicenseInfo'] : null,
+            ]);
+        }
+
+        return $items;
     }
 }

src/Result/PublishLayerVersionResponse.php

@@ -113,18 +113,7 @@ public function getVersion(): ?string
     protected function populateResult(Response $response): void
     {
         $data = $response->toArray();
-        $fn = [];
-        $fn['list-CompatibleRuntimes'] = static function (array $json) use (&$fn): array {
-            $items = [];
-            foreach ($json as $item) {
-                $a = isset($item) ? (string) $item : null;
-                if (null !== $a) {
-                    $items[] = $a;
-                }
-            }
 
-            return $items;
-        };
         $this->Content = empty($data['Content']) ? null : new LayerVersionContentOutput([
             'Location' => isset($data['Content']['Location']) ? (string) $data['Content']['Location'] : null,
             'CodeSha256' => isset($data['Content']['CodeSha256']) ? (string) $data['Content']['CodeSha256'] : null,
@@ -135,7 +124,23 @@ protected function populateResult(Response $response): void
         $this->Description = isset($data['Description']) ? (string) $data['Description'] : null;
         $this->CreatedDate = isset($data['CreatedDate']) ? (string) $data['CreatedDate'] : null;
         $this->Version = isset($data['Version']) ? (string) $data['Version'] : null;
-        $this->CompatibleRuntimes = empty($data['CompatibleRuntimes']) ? [] : $fn['list-CompatibleRuntimes']($data['CompatibleRuntimes']);
+        $this->CompatibleRuntimes = empty($data['CompatibleRuntimes']) ? [] : $this->populateResultCompatibleRuntimes($data['CompatibleRuntimes']);
         $this->LicenseInfo = isset($data['LicenseInfo']) ? (string) $data['LicenseInfo'] : null;
     }
+
+    /**
+     * @return list<Runtime::*>
+     */
+    private function populateResultCompatibleRuntimes(array $json): array
+    {
+        $items = [];
+        foreach ($json as $item) {
+            $a = isset($item) ? (string) $item : null;
+            if (null !== $a) {
+                $items[] = $a;
+            }
+        }
+
+        return $items;
+    }
 }