use correct return types

Author: Jamie Hannaford

src/Common/Api/Operator.php

@@ -129,9 +129,9 @@ public function newInstance(): self
     }
 
     /**
-     * @return \GuzzleHttp\Psr7\Uri
+     * @return \GuzzleHttp\Psr7\Uri:null
      */
-    protected function getHttpBaseUrl(): Uri
+    protected function getHttpBaseUrl()
     {
         return $this->client->getConfig('base_uri');
     }

src/Common/Api/Parameter.php

@@ -338,9 +338,9 @@ public function getPath(): string
     /**
      * Retrieves the common schema that an array parameter applies to all its child elements.
      *
-     * @return Parameter
+     * @return Parameter|null
      */
-    public function getItemSchema(): Parameter
+    public function getItemSchema()
     {
         return $this->itemSchema;
     }

src/Common/Resource/AbstractResource.php

@@ -84,7 +84,7 @@ public function populateFromArray(array $array): self
         $reflClass = new \ReflectionClass($this);
 
         foreach ($array as $key => $val) {
-            $propertyName = isset($this->aliases[$key]) ? $this->aliases[$key] : $key;
+            $propertyName = (string) (isset($this->aliases[$key]) ? $this->aliases[$key] : $key);
 
             if (property_exists($this, $propertyName)) {
                 if ($type = $this->extractTypeFromDocBlock($reflClass, $propertyName)) {

src/Common/Resource/Creatable.php

@@ -15,5 +15,5 @@ interface Creatable
      * @param array $userOptions
      * @return self
      */
-    public function create(array $userOptions): self;
+    public function create(array $userOptions): Creatable;
 }

src/Common/Resource/HasMetadata.php

@@ -32,9 +32,9 @@ public function getMetadata(): array;
      *
      * @param array $metadata The new metadata items
      *
-     * @return mixed
+     * @return void
      */
-    public function mergeMetadata(array $metadata): array;
+    public function mergeMetadata(array $metadata);
 
     /**
      * Replaces all of the existing metadata items for a resource with a new set of values. Any metadata items which
@@ -52,9 +52,9 @@ public function mergeMetadata(array $metadata): array;
      *
      * @param array $metadata The new metadata items
      *
-     * @return mixed
+     * @return void
      */
-    public function resetMetadata(array $metadata): array;
+    public function resetMetadata(array $metadata);
 
     /**
      * Extracts metadata from a response object and returns it in the form of an associative array.

src/Common/Transport/JsonSerializer.php

@@ -87,7 +87,7 @@ public function stockJson(Parameter $param, $userValue, array $json): array
         if ($param->isArray()) {
             $userValue = $this->stockArrayJson($param, $userValue);
         } elseif ($param->isObject()) {
-            $userValue = $this->stockObjectJson($param, $userValue);
+            $userValue = $this->stockObjectJson($param, (object) $userValue);
         }
         // Populate the final value
         return $this->stockValue($param, $userValue, $json);