loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

replace httpHeader with httpHeaders in php object serializer

Browse Source
This commit is contained in:
wing328 2016-01-08 14:04:10 +08:00
parent 61e6cbef66
commit a8f5809370
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/swagger-codegen/src/main/resources/php/ObjectSerializer.mustache
View File

@ -199,11 +199,11 @@ class ObjectSerializer
* *
* @param mixed $data object or primitive to be deserialized * @param mixed $data object or primitive to be deserialized
* @param string $class class name is passed as a string * @param string $class class name is passed as a string
* @param string $httpHeader HTTP headers * @param string $httpHeaders HTTP headers
* *
* @return object an instance of $class * @return object an instance of $class
*/ */
public function deserialize($data, $class, $httpHeader=null) public function deserialize($data, $class, $httpHeaders=null)
{ {
if (null === $data) { if (null === $data) {
$deserialized = null; $deserialized = null;
@ -231,7 +231,7 @@ class ObjectSerializer
$deserialized = $data; $deserialized = $data;
} elseif ($class === '\SplFileObject') { } elseif ($class === '\SplFileObject') {
// determine file name // determine file name
if (array_key_exists('Content-Disposition', $httpHeader) && preg_match('/inline; filename=[\'"]?([^\'"\s]+)[\'"]?$/i', $httpHeader['Content-Disposition'], $match)) { if (array_key_exists('Content-Disposition', $httpHeaders) && preg_match('/inline; filename=[\'"]?([^\'"\s]+)[\'"]?$/i', $httpHeaders['Content-Disposition'], $match)) {
$filename = Configuration::getDefaultConfiguration()->getTempFolderPath().$match[1]; $filename = Configuration::getDefaultConfiguration()->getTempFolderPath().$match[1];
} else { } else {
$filename = tempnam(Configuration::getDefaultConfiguration()->getTempFolderPath(), ''); $filename = tempnam(Configuration::getDefaultConfiguration()->getTempFolderPath(), '');

5
samples/client/petstore/android/default/src/test/java/io/swagger/petstore/test/PetApiTest.java
View File

@ -72,6 +72,11 @@ public class PetApiTest {
} }
@Test @Test
@Ignore
/* ignoring the findPetByTags test below as it's very similar to
* testFindPetsByStatus and testFindPetsByTags sometimes got 500
* due to server issue, which makes the test unstable.
*/
public void testFindPetsByTags() throws Exception { public void testFindPetsByTags() throws Exception {
Pet pet = createRandomPet(); Pet pet = createRandomPet();
pet.setName("monster"); pet.setName("monster");