Merge pull request #829 from wing328/php_support_map

[PHP] bug fix for map, added test case

Author: fehguy

modules/swagger-codegen/src/main/resources/php/APIClient.mustache

@@ -376,17 +376,16 @@ class ApiClient {
   {
     if (null === $data) {
       $deserialized = null;
-    } elseif (substr($class, 0, 4) == 'map[') {
+    } elseif (substr($class, 0, 4) == 'map[') { # for associative array e.g. map[string,int]
       $inner = substr($class, 4, -1);
-      $values = array();
+      $deserialized = array();
       if(strrpos($inner, ",") !== false) {
         $subClass_array = explode(',', $inner, 2);
         $subClass = $subClass_array[1];
         foreach ($data as $key => $value) {
-          $values[] = array($key => self::deserialize($value, $subClass));
+          $deserialized[$key] = self::deserialize($value, $subClass);
         }        
       }
-      $deserialized = $values;
     } elseif (strcasecmp(substr($class, 0, 6),'array[') == 0) {
       $subClass = substr($class, 6, -1);
       $values = array();

samples/client/petstore/php/SwaggerClient-php/lib/APIClient.php

@@ -381,17 +381,16 @@ public static function deserialize($data, $class)
   {
     if (null === $data) {
       $deserialized = null;
-    } elseif (substr($class, 0, 4) == 'map[') {
+    } elseif (substr($class, 0, 4) == 'map[') { # for associative array e.g. map[string,int]
       $inner = substr($class, 4, -1);
-      $values = array();
+      $deserialized = array();
       if(strrpos($inner, ",") !== false) {
         $subClass_array = explode(',', $inner, 2);
         $subClass = $subClass_array[1];
         foreach ($data as $key => $value) {
-          $values[] = array($key => self::deserialize($value, $subClass));
+          $deserialized[$key] = self::deserialize($value, $subClass);
         }        
       }
-      $deserialized = $values;
     } elseif (strcasecmp(substr($class, 0, 6),'array[') == 0) {
       $subClass = substr($class, 6, -1);
       $values = array();

samples/client/petstore/php/SwaggerClient-php/tests/PetApiTest.php

@@ -181,7 +181,7 @@ public function testAddPet()
     $this->assertSame($response->name, 'PHP Unit Test');
   }
 
-  // test 
+  // test upload file
   public function testUploadFile()
   {
     // initialize the API client
@@ -194,6 +194,20 @@ public function testUploadFile()
     $this->assertSame($add_response, NULL);
   }
 
+  // test get inventory
+  public function testGetInventory()
+  {
+    // initialize the API client
+    $api_client = new SwaggerClient\APIClient('http://petstore.swagger.io/v2');
+    $store_api = new SwaggerClient\StoreAPI($api_client);
+    // get inventory
+    $get_response = $store_api->getInventory();
+
+    $this->assertInternalType("int", $get_response['sold']);
+    $this->assertInternalType("int", $get_response['pending']);
+
+  }
+
 }
 
 ?>