Better generate requestBody (#174)

* Better generate request body and parse responses

* Delete xml.php

* Added some type hints

* CS

* CS

* cs

* CS

Author: Nyholm

AbstractApi.php

@@ -99,18 +99,16 @@ abstract protected function getSignatureVersion(): string;
     abstract protected function getSignatureScopeName(): string;
 
     /**
-     * @param string[]|string[][]            $headers headers names provided as keys or as part of values
-     * @param array|string|resource|callable $body
+     * @param string[]|string[][]      $headers headers names provided as keys or as part of values
+     * @param string|resource|callable $body
      */
     final protected function getResponse(string $method, $body, $headers = [], ?string $endpoint = null): ResponseInterface
     {
-        [$contentType, $body] = $this->stringifyBody($body);
+        $body = $this->stringifyBody($body);
         if (!isset($headers['content-type'])) {
-            $headers['content-type'] = $contentType;
-        }
-        if (empty($body)) {
-            $headers['content-length'] = '0';
+            $headers['content-type'] = 'text/plain';
         }
+        $headers['content-length'] = (string) \strlen($body);
 
         $request = new Request($method, $this->fillEndpoint($endpoint), $headers, $body);
         $this->getSigner()->Sign($request, $this->credentialProvider->getCredentials($this->configuration));
@@ -148,14 +146,12 @@ protected function getSignerFactories(): array
         ];
     }
 
-    private function stringifyBody($body): array
+    private function stringifyBody($body): string
     {
         if (\is_callable($body)) {
             return $this->stringifyBody($body());
         }
-        if (\is_array($body)) {
-            return ['application/x-www-form-urlencoded', http_build_query($body, '', '&', \PHP_QUERY_RFC1738)];
-        }
+
         if (\is_resource($body)) {
             if (!stream_get_meta_data($body)['seekable']) {
                 throw new InvalidArgument(sprintf('The give body is not seekable. Therefor request can not be signed.'));
@@ -168,7 +164,7 @@ private function stringifyBody($body): array
             }
         }
 
-        return ['text/plain', (string) $body];
+        return (string) $body;
     }
 
     private function getSigner()

Sts/Input/AssumeRoleRequest.php

@@ -190,21 +190,25 @@ public function getTransitiveTagKeys(): array
         return $this->TransitiveTagKeys;
     }
 
-    public function requestBody(): array
+    public function requestBody(): string
     {
         $payload = ['Action' => 'AssumeRole', 'Version' => '2011-06-15'];
         $indices = new \stdClass();
         $payload['RoleArn'] = $this->RoleArn;
         $payload['RoleSessionName'] = $this->RoleSessionName;
-        (static function ($input) use (&$payload, $indices) {
+
+        (static function (array $input) use (&$payload, $indices) {
             $indices->kd8fbed2 = 0;
             foreach ($input as $value) {
                 ++$indices->kd8fbed2;
-                (static function ($input) use (&$payload, $indices) {
-                    if (null !== $v = $input->getarn()) {
-                        $payload["PolicyArns.{$indices->kd8fbed2}.arn"] = $v;
-                    }
-                })($value);
+
+                if (null !== $value) {
+                    (static function (PolicyDescriptorType $input) use (&$payload, $indices) {
+                        if (null !== $v = $input->getarn()) {
+                            $payload["PolicyArns.{$indices->kd8fbed2}.arn"] = $v;
+                        }
+                    })($value);
+                }
             }
         })($this->PolicyArns);
 
@@ -216,17 +220,21 @@ public function requestBody(): array
             $payload['DurationSeconds'] = $v;
         }
 
-        (static function ($input) use (&$payload, $indices) {
+        (static function (array $input) use (&$payload, $indices) {
             $indices->k848eed0 = 0;
             foreach ($input as $value) {
                 ++$indices->k848eed0;
-                (static function ($input) use (&$payload, $indices) {
-                    $payload["Tags.{$indices->k848eed0}.Key"] = $input->getKey();
-                    $payload["Tags.{$indices->k848eed0}.Value"] = $input->getValue();
-                })($value);
+
+                if (null !== $value) {
+                    (static function (Tag $input) use (&$payload, $indices) {
+                        $payload["Tags.{$indices->k848eed0}.Key"] = $input->getKey();
+                        $payload["Tags.{$indices->k848eed0}.Value"] = $input->getValue();
+                    })($value);
+                }
             }
         })($this->Tags);
-        (static function ($input) use (&$payload, $indices) {
+
+        (static function (array $input) use (&$payload, $indices) {
             $indices->k296eb4e = 0;
             foreach ($input as $value) {
                 ++$indices->k296eb4e;
@@ -246,12 +254,12 @@ public function requestBody(): array
             $payload['TokenCode'] = $v;
         }
 
-        return $payload;
+        return http_build_query($payload, '', '&', \PHP_QUERY_RFC1738);
     }
 
     public function requestHeaders(): array
     {
-        $headers = [];
+        $headers = ['content-type' => 'application/x-www-form-urlencoded'];
 
         return $headers;
     }

Sts/Input/GetCallerIdentityRequest.php

@@ -9,16 +9,16 @@ public static function create($input): self
         return $input instanceof self ? $input : new self();
     }
 
-    public function requestBody(): array
+    public function requestBody(): string
     {
         $payload = ['Action' => 'GetCallerIdentity', 'Version' => '2011-06-15'];
 
-        return $payload;
+        return http_build_query($payload, '', '&', \PHP_QUERY_RFC1738);
     }
 
     public function requestHeaders(): array
     {
-        $headers = [];
+        $headers = ['content-type' => 'application/x-www-form-urlencoded'];
 
         return $headers;
     }