Skip to content

fix baseUrl and an simple fix for multiple types in an param (in v2\explorer) #653

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

Closed
wants to merge 6 commits into from
Closed

fix baseUrl and an simple fix for multiple types in an param (in v2\explorer) #653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0d49196
bugfix for use of baseUrl and multiple types of an param
Jun 7, 2021
8598ab4
remove the debug var_dump's
Jun 7, 2021
db19b33
Merge branch 'Luracast:master' into master
timmit-nl Jul 16, 2021
1520953
only use host if it isset
Jul 16, 2021
6f9d5ad
clean the path from domain
Jul 16, 2021
3a92485
Merge branch 'master' of https://github.com/timmit-nl/Restler
Jul 16, 2021
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
29 changes: 23 additions & 6 deletions src/Explorer/v2/Explorer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,11 @@ public function get()
) {
$filename .= '.js';
}
PassThrough::file(__DIR__ . '/client/' . (empty($filename) ? 'index.html' : $filename), false,
0); //60 * 60 * 24);
PassThrough::file(
__DIR__ . '/client/' . (empty($filename) ? 'index.html' : $filename),
false,
0
); //60 * 60 * 24);
}

/**
Expand All @@ -190,7 +193,10 @@ public function swagger()
$r->swagger = static::SWAGGER;

$info = parse_url($this->restler->getBaseUrl());
$r->host = $info['host'];
$r->host = '';
if (isset($info['host'])) {
$r->host = $info['host'];
}
if (isset($info['port'])) {
$r->host .= ':' . $info['port'];
}
Expand Down Expand Up @@ -456,8 +462,17 @@ private function model($type, array $children)

private function setType(&$object, ValidationInfo $info)
{
// TEMP FIX: for multiple types, pick first one if not null
$type = $info->type;
if (is_array($info->type)) {
foreach ($info->type as $type) {
if (strtolower($type) != 'null') {
break;
}
}
}
//TODO: proper type management
$type = Util::getShortName($info->type);
$type = Util::getShortName($type);
if ($info->type === 'array') {
$object->type = 'array';
if ($info->children) {
Expand All @@ -478,8 +493,10 @@ private function setType(&$object, ValidationInfo $info)
)
));
} elseif ($info->contentType && $info->contentType != 'indexed') {
if (is_string($info->contentType) && $t = Util::nestedValue(static::$dataTypeAlias,
strtolower($info->contentType))) {
if (is_string($info->contentType) && $t = Util::nestedValue(
static::$dataTypeAlias,
strtolower($info->contentType)
)) {
if (is_array($t)) {
$object->items = (object)array(
'type' => $t[0],
Expand Down
Loading