renamed resolveEndpoint to resolveClassName. Take $request as param instead of string

This commit is contained in:
Sander Hagenaars 2019-07-11 08:14:27 +02:00
parent 25e102407e
commit 35ad956b92

View File

@ -186,7 +186,7 @@ class RestfulServer extends Controller
*/ */
public function index(HTTPRequest $request) public function index(HTTPRequest $request)
{ {
$className = $this->resolveEndpoint($request->param('ClassName')); $className = $this->resolveClassName($request);
$id = $request->param('ID') ?: null; $id = $request->param('ID') ?: null;
$relation = $request->param('Relation') ?: null; $relation = $request->param('Relation') ?: null;
@ -397,7 +397,7 @@ class RestfulServer extends Controller
$accept = $this->request->getHeader('Accept'); $accept = $this->request->getHeader('Accept');
$mimetypes = $this->request->getAcceptMimetypes(); $mimetypes = $this->request->getAcceptMimetypes();
if (!$className) { if (!$className) {
$className = $this->unsanitiseClassName($this->resolveEndpoint($this->request->param('ClassName'))); $className = $this->unsanitiseClassName($this->resolveClassName($this->request));
} }
// get formatter // get formatter
@ -902,11 +902,12 @@ class RestfulServer extends Controller
/** /**
* Checks if given $endpoint maps to an object in endpoint_aliases, else simply return $endpoint as is * Checks if given $endpoint maps to an object in endpoint_aliases, else simply return $endpoint as is
* *
* @param string $className * @param HTTPRequest $request
* @return string * @return string
*/ */
protected function resolveEndpoint(string $className): string protected function resolveClassName(HTTPRequest $request): string
{ {
$className = $request->param('ClassName');
$aliases = self::config()->get('endpoint_aliases'); $aliases = self::config()->get('endpoint_aliases');
return $aliases[$className] ?? $this->unsanitiseClassName($className); return $aliases[$className] ?? $this->unsanitiseClassName($className);