timw4mail/HummingBirdAnimeClient
1
1
Fork 1
Code Issues 5 Pull Requests Projects 1 Releases Wiki Activity

Version 5.1 - All the GraphQL #32

Closed
timw4mail wants to merge 1160 commits from develop into master
pull from: develop
merge into: timw4mail:master
Conversation 0 Commits 1160 Files Changed 547 +73 -30
1 changed files with 73 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9c73ab928c - Show all commits

103
src/Aviat/AnimeClient/Dispatcher.php
View File

@ -96,7 +96,6 @@ class Dispatcher extends RoutingBase {
$error_handler = $this->container->get('error-handler'); $error_handler = $this->container->get('error-handler');
$controller_name = AnimeClient::DEFAULT_CONTROLLER; $controller_name = AnimeClient::DEFAULT_CONTROLLER;
$action_method = AnimeClient::NOT_FOUND_METHOD; $action_method = AnimeClient::NOT_FOUND_METHOD;
$params = [];
if (is_null($route)) if (is_null($route))
{ {
@ -106,31 +105,16 @@ class Dispatcher extends RoutingBase {
if ( ! $route) if ( ! $route)
{ {
$failure = $this->router->getFailedRoute(); // If not route was matched, return an appropriate http
$error_handler->addDataTable('failed_route', (array)$failure); // error message
$action_method = AnimeClient::ERROR_MESSAGE_METHOD; $error_route = $this->get_error_params();
$params = $error_route['params'];
switch(TRUE) $action_method = $error_route['action_method'];
{
case $failure->failedMethod():
$params['http_code'] = 405;
$params['title'] = '405 Method Not Allowed';
$params['message'] = 'Invalid HTTP Verb';
break;
case $failure->failedAccept():
$params['http_code'] = 406;
$params['title'] = '406 Not Acceptable';
$params['message'] = 'Unacceptable content type';
break;
default:
$action_method = AnimeClient::NOT_FOUND_METHOD;
break;
}
} }
else else
{ {
$params = (isset($route->params['params'])) ? $route->params['params'] : [];
if (isset($route->params['controller'])) if (isset($route->params['controller']))
{ {
$controller_name = $route->params['controller']; $controller_name = $route->params['controller'];
@ -146,14 +130,13 @@ class Dispatcher extends RoutingBase {
throw new \LogicException("Missing controller"); throw new \LogicException("Missing controller");
} }
// Get the full namespace for a controller if a short name is given
if (strpos($controller_name, '\\') === FALSE) if (strpos($controller_name, '\\') === FALSE)
{ {
$map = $this->get_controller_list(); $map = $this->get_controller_list();
$controller_name = $map[$controller_name]; $controller_name = $map[$controller_name];
} }
$params = (isset($route->params['params'])) ? $route->params['params'] : [];
if ( ! empty($route->tokens)) if ( ! empty($route->tokens))
{ {
foreach ($route->tokens as $key => $v) foreach ($route->tokens as $key => $v)
@ -166,11 +149,8 @@ class Dispatcher extends RoutingBase {
} }
} }
$controller = new $controller_name($this->container); // Actually instantiate the controller
$this->call($controller_name, $method, $params);
// Run the appropriate controller method
$error_handler->addDataTable('controller_args', $params);
call_user_func_array([$controller, $action_method], $params);
} }
/** /**
@ -222,6 +202,69 @@ class Dispatcher extends RoutingBase {
return $controllers; return $controllers;
} }
/**
* Create the controller object and call the appropriate
* method
*
* @param string $controller_name - The full namespace of the controller class
* @param string $method
* @param array $params
* @return void
*/
protected function call($controller_name, $method, array $params)
{
$error_handler = $this->container->get('error-handler');
$controller = new $controller_name($this->container);
// Run the appropriate controller method
$error_handler->addDataTable('controller_args', $params);
call_user_func_array([$controller, $action_method], $params);
}
/**
* Get the appropriate params for the error page
* pased on the failed route
*
* @return array|false
*/
protected function get_error_params()
{
$failure = $this->router->getFailedRoute();
$error_handler = $this->container->get('error-handler');
$error_handler->addDataTable('failed_route', (array)$failure);
$action_method = AnimeClient::ERROR_MESSAGE_METHOD;
$params = [];
if ($failure->failedMethod())
{
$params = [
'http_code' => 405,
'title' => '405 Method Not Allowed',
'message' => 'Invalid HTTP Verb'
];
}
else if($failure->failedAccept())
{
$params = [
'http_code' => 406,
'title' => '406 Not Acceptable',
'message' => 'Unacceptable content type'
];
}
else
{
// Fall back to a 404 message
$action_method = AnimeClient::NOT_FOUND_METHOD;
}
return [
'params' => $params,
'action_method' => $action_method
];
}
/** /**
* Select controller based on the current url, and apply its relevent routes * Select controller based on the current url, and apply its relevent routes
* *