merged

Author: fehguy

samples/client/petstore/php/Swagger.php

@@ -228,6 +228,7 @@ public static function deserialize($data, $class)
       $deserialized = $values;
     } elseif (substr($class, 0, 6) == 'array[') {
       $subClass = substr($class, 6, -1);
+      $values = array();
       foreach ($data as $key => $value) {
         $values[] = self::deserialize($value, $subClass);
       }

samples/html/index.html

@@ -417,6 +417,12 @@ <h3 class="field-label">Return type</h3>
 
     <h3 class="field-label">Parameters</h3>
     <div class="field-items">
+<<<<<<< HEAD
+=======
+      <div class="param">petId (required)</div>
+
+      <div class="param-desc"><span class="param-type">Path Parameter</span> &mdash; ID of pet to update </div>
+>>>>>>> master
       <div class="param">additionalMetadata (optional)</div>
 
       <div class="param-desc"><span class="param-type">Form Parameter</span> &mdash; Additional data to pass to server </div>