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 +8 -12
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f3df8f1588 - Show all commits

3
src/Controller.php
View File

@ -47,7 +47,7 @@ class Controller {
$this->config = $container->get('config'); $this->config = $container->get('config');
$this->request = $container->get('request'); $this->request = $container->get('request');
$this->response = $container->get('response'); $this->response = $container->get('response');
$this->baseData = array_merge((array)$this->baseData, [ $this->baseData = array_merge((array)$this->baseData, [
'url' => $auraUrlGenerator, 'url' => $auraUrlGenerator,
'urlGenerator' => $urlGenerator, 'urlGenerator' => $urlGenerator,
@ -94,7 +94,6 @@ class Controller {
/** /**
* Show the login form * Show the login form
* *
* @codeCoverageIgnore
* @param string $status * @param string $status
* @return void * @return void
*/ */

13
src/ControllerTrait.php
View File

@ -26,7 +26,7 @@ use Aviat\Ion\View\{HtmlView, HttpView, JsonView};
use InvalidArgumentException; use InvalidArgumentException;
trait ControllerTrait { trait ControllerTrait {
use ContainerAware; use ContainerAware;
/** /**
@ -80,7 +80,7 @@ trait ControllerTrait {
'other_type' => 'manga', 'other_type' => 'manga',
'menu_name' => '' 'menu_name' => ''
]; ];
/** /**
* Redirect to the default controller/url from an empty path * Redirect to the default controller/url from an empty path
* *
@ -228,7 +228,7 @@ trait ControllerTrait {
$view->appendOutput($this->loadPartial($view, $template, $data)); $view->appendOutput($this->loadPartial($view, $template, $data));
$view->appendOutput($this->loadPartial($view, 'footer', $data)); $view->appendOutput($this->loadPartial($view, 'footer', $data));
} }
/** /**
* 404 action * 404 action
* *
@ -270,17 +270,17 @@ trait ControllerTrait {
public function setFlashMessage($message, $type = "info") public function setFlashMessage($message, $type = "info")
{ {
static $messages; static $messages;
if ( ! $messages) if ( ! $messages)
{ {
$messages = []; $messages = [];
} }
$messages[] = [ $messages[] = [
'message_type' => $type, 'message_type' => $type,
'message' => $message 'message' => $message
]; ];
$this->session->setFlash('message', $messages); $this->session->setFlash('message', $messages);
} }
@ -300,7 +300,6 @@ trait ControllerTrait {
/** /**
* Add a message box to the page * Add a message box to the page
* *
* @codeCoverageIgnore
* @param HtmlView $view * @param HtmlView $view
* @param string $type * @param string $type
* @param string $message * @param string $message

3
src/Dispatcher.php
View File

@ -106,7 +106,6 @@ class Dispatcher extends RoutingBase {
/** /**
* Handle the current route * Handle the current route
* *
* @codeCoverageIgnore
* @param object|null $route * @param object|null $route
* @return void * @return void
*/ */
@ -262,7 +261,7 @@ class Dispatcher extends RoutingBase {
// Run the appropriate controller method // Run the appropriate controller method
$logger->debug('Dispatcher - controller arguments'); $logger->debug('Dispatcher - controller arguments');
$logger->debug(print_r($params, TRUE)); $logger->debug(print_r($params, TRUE));
call_user_func_array([$controller, $method], $params); call_user_func_array([$controller, $method], $params);
} }

1
src/Model/API.php
View File

@ -24,7 +24,6 @@ class API extends AbstractModel {
/** /**
* Sort the list entries by their title * Sort the list entries by their title
* *
* @codeCoverageIgnore
* @param array $array * @param array $array
* @param string $sortKey * @param string $sortKey
* @return void * @return void