|
@@ -12,7 +12,13 @@ class Type_ApiRequest {
|
|
|
$request->url = trim($url, '/ ');
|
|
$request->url = trim($url, '/ ');
|
|
|
$urlParts = explode('?', $request->url);
|
|
$urlParts = explode('?', $request->url);
|
|
|
$request->path = $urlParts[0];
|
|
$request->path = $urlParts[0];
|
|
|
- $request->query = (count($urlParts) > 1)? $urlParts[1] : '';
|
|
|
|
|
|
|
+ $request->query = [];
|
|
|
|
|
+ $query = (count($urlParts) > 1)? $urlParts[1] : null;
|
|
|
|
|
+ if (!empty($query)) {
|
|
|
|
|
+ $queryArgs = array();
|
|
|
|
|
+ parse_str($request->query, $queryArgs);
|
|
|
|
|
+ $request->query = $queryArgs;
|
|
|
|
|
+ }
|
|
|
$request->args = $_REQUEST;
|
|
$request->args = $_REQUEST;
|
|
|
$segments = array_filter(explode('/', $request->path), function ($part) {
|
|
$segments = array_filter(explode('/', $request->path), function ($part) {
|
|
|
return (!empty($part));
|
|
return (!empty($part));
|
|
@@ -35,12 +41,6 @@ class Type_ApiRequest {
|
|
|
// throw new Exception("{$request->apiRouterName} API Version not supported ({$request->version})", 400);
|
|
// throw new Exception("{$request->apiRouterName} API Version not supported ({$request->version})", 400);
|
|
|
// }
|
|
// }
|
|
|
|
|
|
|
|
- if (!empty($request->query)) {
|
|
|
|
|
- $queryArgs = array();
|
|
|
|
|
- parse_str($request->query, $queryArgs);
|
|
|
|
|
- $request->query = $queryArgs;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
return $request;
|
|
return $request;
|
|
|
}
|
|
}
|
|
|
|
|
|