php 8.1 compat

Author: romainmenke

lib/aws-sdk/Guzzle/Common/Exception/ExceptionCollection.php

@@ -60,7 +60,7 @@ public function add($e)
      *
      * @return int
      */
-    public function count()
+    public function count(): int
     {
         return count($this->exceptions);
     }
@@ -70,7 +70,7 @@ public function count()
      *
      * @return \ArrayIterator
      */
-    public function getIterator()
+    public function getIterator(): \Traversable
     {
         return new \ArrayIterator($this->exceptions);
     }

lib/aws-sdk/Guzzle/Http/Curl/CurlMulti.php

@@ -119,7 +119,7 @@ public function send()
         }
     }
 
-    public function count()
+    public function count(): int
     {
         return count($this->requests);
     }

lib/aws-sdk/Guzzle/Http/Curl/CurlMultiProxy.php

@@ -105,7 +105,7 @@ public function send()
         }
     }
 
-    public function count()
+    public function count(): int
     {
         return count($this->all());
     }

lib/aws-sdk/Guzzle/Http/Message/Header.php

@@ -113,12 +113,12 @@ public function toArray()
         return $this->values;
     }
 
-    public function count()
+    public function count(): int
     {
         return count($this->toArray());
     }
 
-    public function getIterator()
+    public function getIterator(): \Traversable
     {
         return new \ArrayIterator($this->toArray());
     }

lib/aws-sdk/Guzzle/Http/Message/Header/HeaderCollection.php

@@ -64,12 +64,12 @@ public function get($key)
         return $this->offsetGet($key);
     }
 
-    public function count()
+    public function count(): int
     {
         return count($this->headers);
     }
 
-    public function offsetExists($offset)
+    public function offsetExists($offset): bool
     {
         return isset($this->headers[strtolower($offset)]);
     }
@@ -81,17 +81,17 @@ public function offsetGet($offset)
         return isset($this->headers[$l]) ? $this->headers[$l] : null;
     }
 
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
         $this->add($value);
     }
 
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
         unset($this->headers[strtolower($offset)]);
     }
 
-    public function getIterator()
+    public function getIterator(): \Traversable
     {
         return new \ArrayIterator($this->headers);
     }

lib/aws-sdk/Guzzle/Http/Url.php

@@ -40,7 +40,7 @@ public static function factory($url)
         $parts += $defaults;
 
         // Convert the query string into a QueryString object
-        if ($parts['query'] || 0 !== strlen($parts['query'])) {
+        if ($parts['query'] || 0 !== strlen($parts['query'] ?? '')) {
             $parts['query'] = QueryString::fromString($parts['query']);
         }
 
@@ -280,6 +280,12 @@ public function setPath($path)
             $path = '/' . implode('/', $path);
         }
 
+        if ($path === null) {
+            $this->path = null;
+
+            return $this;
+        }
+
         $this->path = strtr($path, $pathReplace);
 
         return $this;

lib/aws-sdk/Guzzle/Iterator/AppendIterator.php

@@ -12,7 +12,7 @@ class AppendIterator extends \AppendIterator
      *
      * @param \Iterator $iterator Iterator to append
      */
-    public function append(\Iterator $iterator)
+    public function append(\Iterator $iterator): void
     {
         $this->getArrayIterator()->append($iterator);
     }

lib/aws-sdk/Guzzle/Iterator/ChunkedIterator.php

@@ -29,13 +29,13 @@ public function __construct(\Traversable $iterator, $chunkSize)
         $this->chunkSize = $chunkSize;
     }
 
-    public function rewind()
+    public function rewind(): void
     {
         parent::rewind();
         $this->next();
     }
 
-    public function next()
+    public function next(): void
     {
         $this->chunk = array();
         for ($i = 0; $i < $this->chunkSize && parent::valid(); $i++) {
@@ -49,7 +49,7 @@ public function current()
         return $this->chunk;
     }
 
-    public function valid()
+    public function valid(): bool
     {
         return (bool) $this->chunk;
     }

lib/aws-sdk/Guzzle/Iterator/FilterIterator.php

@@ -29,7 +29,7 @@ public function __construct(\Iterator $iterator, $callback)
         $this->callback = $callback;
     }
 
-    public function accept()
+    public function accept(): bool
     {
         return call_user_func($this->callback, $this->current());
     }