Skip to content

Throw exception for unsupported form field types #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Throw exception for unsupported form field types #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b00bed7
Add gitignore file
Aug 31, 2017
e9a57f7
Throw exception if we come across a doc form field (tab) type that we…
Aug 31, 2017
7c16479
Remove extra space
Aug 31, 2017
a5509c9
Apply patch from https://github.com/docusign/docusign-php-client/pull/41
Sep 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.idea/
16 changes: 12 additions & 4 deletions src/ObjectSerializer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public static function sanitizeForSerialization($data)
*
* @return string the sanitized filename
*/
public function sanitizeFilename($filename)
public static function sanitizeFilename($filename)
{
if (preg_match("/.*[\/\\\\](.*)$/", $filename, $match)) {
return $match[1];
Expand Down Expand Up @@ -251,14 +251,17 @@ public static function deserialize($data, $class, $httpHeaders = null)
} else {
return null;
}
} elseif (in_array($class, ['DateTime', 'bool', 'boolean', 'byte', 'double', 'float', 'int', 'integer', 'mixed', 'number', 'object', 'string', 'void'], true)) {
} elseif ($class === 'DateTime' || in_array(strtolower($class), ['bool', 'boolean', 'byte', 'double', 'float', 'int', 'integer', 'mixed', 'number', 'object', 'string', 'void'], true)) {
if ($class !== 'DateTime') {
$class = strtolower($class);
}
settype($data, $class);
return $data;
} elseif ($class === '\SplFileObject') {
// determine file name
if (array_key_exists('Content-Disposition', $httpHeaders) &&
preg_match('/inline; filename=[\'"]?([^\'"\s]+)[\'"]?$/i', $httpHeaders['Content-Disposition'], $match)) {
$filename = Configuration::getDefaultConfiguration()->getTempFolderPath() . sanitizeFilename($match[1]);
$filename = Configuration::getDefaultConfiguration()->getTempFolderPath() . self::sanitizeFilename($match[1]);
} else {
$filename = tempnam(Configuration::getDefaultConfiguration()->getTempFolderPath(), '');
}
Expand All @@ -269,7 +272,7 @@ public static function deserialize($data, $class, $httpHeaders = null)
}

return $deserialized;
} else {
} elseif (class_exists($class)) {
// If a discriminator is defined and points to a valid subclass, use it.
$discriminator = $class::DISCRIMINATOR;
if (!empty($discriminator) && isset($data->{$discriminator}) && is_string($data->{$discriminator})) {
Expand All @@ -292,6 +295,11 @@ public static function deserialize($data, $class, $httpHeaders = null)
}
}
return $instance;
} else {
throw new ApiException(
"Invalid form field type `" . $class . "` found.",
400
);
}
}
}