mirror of
https://github.com/openclassify/openclassify.git
synced 2026-02-10 15:26:10 -06:00
fixed messy
This commit is contained in:
parent
b69caea84f
commit
685e258be8
@ -32,24 +32,21 @@ class appendRequestURL
|
|||||||
{
|
{
|
||||||
|
|
||||||
$request = $this->removeParameters($this->request);
|
$request = $this->removeParameters($this->request);
|
||||||
|
$count_newParameters = count($this->new_parameters);
|
||||||
|
$count_request = count($this->request);
|
||||||
|
|
||||||
if (count($this->new_parameters) === 0 && count($request) === 0) {
|
if ($count_newParameters > 0) {
|
||||||
return $this->url;
|
return ($count_request > 0) ? $this->createURL(array_merge($request, $this->new_parameters)) : $this->createURL($this->new_parameters);
|
||||||
} elseif (count($this->new_parameters) > 0 && count($request) > 0) {
|
} else {
|
||||||
return $this->url
|
return ($count_request > 0) ? $this->createURL($request) : $this->url;
|
||||||
. (Str::contains($this->url, '?') ? '&' : '?')
|
|
||||||
. Arr::query($this->appends(array_merge($request, $this->new_parameters)));
|
|
||||||
} elseif (count($this->new_parameters) > 0 && count($request) === 0) {
|
|
||||||
return $this->url
|
|
||||||
. (Str::contains($this->url, '?') ? '&' : '?')
|
|
||||||
. Arr::query($this->appends($this->new_parameters));
|
|
||||||
} elseif (count($this->new_parameters) === 0 && count($request) > 0) {
|
|
||||||
return $this->url
|
|
||||||
. (Str::contains($this->url, '?') ? '&' : '?')
|
|
||||||
. Arr::query($this->appends($request));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function createURL($append)
|
||||||
|
{
|
||||||
|
return $this->url . (Str::contains($this->url, '?') ? '&' : '?') . Arr::query($this->appends($append));
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $key
|
* @param $key
|
||||||
* @param null $value
|
* @param null $value
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user