Lots of style fixes and minor logic tweaks

This commit is contained in:
Timothy Warren 2018-01-18 16:21:45 -05:00
parent c67fbff9ed
commit dc9d7ab4e1
25 changed files with 170 additions and 173 deletions

View File

@ -16,17 +16,14 @@
use const Aviat\AnimeClient\{ use const Aviat\AnimeClient\{
DEFAULT_CONTROLLER_NAMESPACE,
DEFAULT_CONTROLLER_METHOD, DEFAULT_CONTROLLER_METHOD,
DEFAULT_CONTROLLER DEFAULT_CONTROLLER
}; };
use Aviat\AnimeClient\AnimeClient;
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
// Routing Config // Routing Config
// //
// Maps paths to controlers and methods // Maps paths to controllers and methods
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
return [ return [
// --------------------------------------------------------------------- // ---------------------------------------------------------------------

View File

@ -4,6 +4,7 @@
"license": "MIT", "license": "MIT",
"autoload": { "autoload": {
"files": [ "files": [
"src/constants.php",
"src/AnimeClient.php" "src/AnimeClient.php"
], ],
"psr-4": { "psr-4": {
@ -22,7 +23,7 @@
"aura/router": "^3.0", "aura/router": "^3.0",
"aura/session": "^2.0", "aura/session": "^2.0",
"aviat/banker": "^1.0.0", "aviat/banker": "^1.0.0",
"aviat/ion": "^2.2.0", "aviat/ion": "^2.3.0",
"maximebf/consolekit": "^1.0", "maximebf/consolekit": "^1.0",
"monolog/monolog": "^1.0", "monolog/monolog": "^1.0",
"psr/http-message": "~1.0", "psr/http-message": "~1.0",
@ -51,9 +52,16 @@
"build:css": "cd public && npm run build && cd ..", "build:css": "cd public && npm run build && cd ..",
"clean": "vendor/bin/robo clean", "clean": "vendor/bin/robo clean",
"coverage": "phpdbg -qrr -- vendor/bin/phpunit -c build", "coverage": "phpdbg -qrr -- vendor/bin/phpunit -c build",
"docs": "vendor/bin/phpdox", "phpstan": "phpstan analyse -l 4 -c phpstan.neon src tests ./console index.php",
"phpstan": "phpstan analyse -l 3 ./phpstan.neon src tests",
"watch:css": "cd public && npm run watch", "watch:css": "cd public && npm run watch",
"test": "vendor/bin/phpunit" "test": "vendor/bin/phpunit"
},
"scripts-descriptions": {
"build": "Generate the api docs",
"build:css": "Generate browser css",
"clean": "Remove documentation generation files and folders",
"coverage": "Generate a test coverage report",
"phpstan": "Run PHP Static analysis",
"test": "Run the unit tests"
} }
} }

35
console
View File

@ -2,30 +2,29 @@
<?php declare(strict_types=1); <?php declare(strict_types=1);
// Set up autoloader for third-party dependencies // Set up autoloader for third-party dependencies
require_once realpath(__DIR__ . '/vendor/autoload.php'); require_once __DIR__ . '/vendor/autoload.php';
use Aviat\AnimeClient\Command; use Aviat\AnimeClient\Command;
$_SERVER['HTTP_HOST'] = 'localhost'; $_SERVER['HTTP_HOST'] = 'localhost';
// Define base directories
$APP_DIR = __DIR__ . '/app/';
$SRC_DIR = __DIR__ . '/src/';
$CONF_DIR = realpath("${APP_DIR}/config/");
// Unset 'constants'
unset($APP_DIR);
unset($SRC_DIR);
unset($CONF_DIR);
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Start console script // Start console script
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
$console = new \ConsoleKit\Console([ try
'cache-prime' => Command\CachePrime::class, {
'cache-clear' => Command\CacheClear::class, (new \ConsoleKit\Console([
'clear-cache' => Command\CacheClear::class, 'cache:clear' => Command\CacheClear::class,
'sync-lists' => Command\SyncKitsuWithMal::class, 'cache:prime' => Command\CachePrime::class,
]); 'lists:sync' => Command\SyncKitsuWithMal::class,
'cache-prime' => Command\CachePrime::class,
'cache-clear' => Command\CacheClear::class,
'clear-cache' => Command\CacheClear::class,
'sync-lists' => Command\SyncKitsuWithMal::class,
]))->run();
}
catch (\Exception $e)
{
}
$console->run();

View File

@ -41,7 +41,7 @@ $CONF_DIR = _dir($APP_DIR, 'config');
// Dependency Injection setup // Dependency Injection setup
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
$base_config = require $APPCONF_DIR . '/base_config.php'; $base_config = require $APPCONF_DIR . '/base_config.php';
$di = require_once $APP_DIR . '/bootstrap.php'; $di = require $APP_DIR . '/bootstrap.php';
$config = loadToml($CONF_DIR); $config = loadToml($CONF_DIR);
$config_array = array_merge($base_config, $config); $config_array = array_merge($base_config, $config);

View File

@ -1,7 +1,9 @@
parameters: parameters:
autoload_files:
- %rootDir%/../../../tests/mocks.php
ignoreErrors: ignoreErrors:
- '#Access to an undefined property Aviat\\\Ion\\\Friend::\$[a-zA-Z0-9_]+#' - '#Access to an undefined property Aviat\\\Ion\\\Friend::\$[a-zA-Z0-9_]+#'
- '#Call to an undefined method Aviat\\\Ion\\\Friend:[a-zA-Z0-9_]+\(\)#' - '#Call to an undefined method Aviat\\\Ion\\\Friend::[a-zA-Z0-9_]+\(\)#'
- '#Call to an undefined method Aura\\\Html\\\HelperLocator:[a-zA-Z0-9_]+\(\)#' - '#Call to an undefined method Aura\\\Html\\\HelperLocator::[a-zA-Z0-9_]+\(\)#'
excludes_analyze: - '#Undefined variable: \$var#'
- %rootDir%/test_views/* - '#Property Amp\\Artax\\Internal\\RequestCycle::\$[a-zA-Z0-9_]+#'

View File

@ -55,7 +55,7 @@ class APIRequestBuilder {
protected $defaultHeaders = []; protected $defaultHeaders = [];
/** /**
* Valid HTTP request methos * Valid HTTP request methods
* @var array * @var array
*/ */
protected $validMethods = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS']; protected $validMethods = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'];

View File

@ -17,7 +17,6 @@
namespace Aviat\AnimeClient\API; namespace Aviat\AnimeClient\API;
use Aviat\Banker\Pool; use Aviat\Banker\Pool;
use Aviat\Ion\Di\ContainerAware;
/** /**
* Helper methods for dealing with the Cache * Helper methods for dealing with the Cache
@ -25,7 +24,7 @@ use Aviat\Ion\Di\ContainerAware;
trait CacheTrait { trait CacheTrait {
/** /**
* @var Aviat\Banker\Pool * @var Pool
*/ */
protected $cache; protected $cache;
@ -46,7 +45,7 @@ trait CacheTrait {
* *
* @return Pool * @return Pool
*/ */
public function getCache() public function getCache(): Pool
{ {
return $this->cache; return $this->cache;
} }
@ -54,20 +53,18 @@ trait CacheTrait {
/** /**
* Generate a hash as a cache key from the current method call * Generate a hash as a cache key from the current method call
* *
* @param object $object * @param mixed $object
* @param string $method * @param string $method
* @param array $args * @param array $args
* @return string * @return string
*/ */
public function getHashForMethodCall($object, string $method, array $args = []): string public function getHashForMethodCall($object, string $method, array $args = []): string
{ {
$classname = get_class($object);
$keyObj = [ $keyObj = [
'class' => $classname, 'class' => \get_class($object),
'method' => $method, 'method' => $method,
'args' => $args, 'args' => $args,
]; ];
$hash = sha1(json_encode($keyObj)); return sha1(json_encode($keyObj));
return $hash;
} }
} }

View File

@ -63,7 +63,7 @@ use function Amp\{
* @see Client * @see Client
*/ */
final class HummingbirdClient implements Client { final class HummingbirdClient implements Client {
const DEFAULT_USER_AGENT = 'Mozilla/5.0 (compatible; Artax)'; const DEFAULT_USER_AGENT = 'Hummingbird Anime Client/5.0';
private $cookieJar; private $cookieJar;
private $socketPool; private $socketPool;
@ -71,7 +71,7 @@ final class HummingbirdClient implements Client {
private $hasZlib; private $hasZlib;
private $options = [ private $options = [
self::OP_AUTO_ENCODING => true, self::OP_AUTO_ENCODING => true,
self::OP_TRANSFER_TIMEOUT => 15000, self::OP_TRANSFER_TIMEOUT => 60000,
self::OP_MAX_REDIRECTS => 5, self::OP_MAX_REDIRECTS => 5,
self::OP_AUTO_REFERER => true, self::OP_AUTO_REFERER => true,
self::OP_DISCARD_BODY => false, self::OP_DISCARD_BODY => false,
@ -89,7 +89,7 @@ final class HummingbirdClient implements Client {
$this->cookieJar = $cookieJar ?? new NullCookieJar; $this->cookieJar = $cookieJar ?? new NullCookieJar;
$this->tlsContext = $tlsContext ?? new ClientTlsContext; $this->tlsContext = $tlsContext ?? new ClientTlsContext;
$this->socketPool = $socketPool ?? new HttpSocketPool; $this->socketPool = $socketPool ?? new HttpSocketPool;
$this->hasZlib = extension_loaded('zlib'); $this->hasZlib = \extension_loaded('zlib');
} }
/** @inheritdoc */ /** @inheritdoc */

View File

@ -313,7 +313,7 @@ class JsonAPI {
foreach ($data['data'] as $item) foreach ($data['data'] as $item)
{ {
if (is_array($item) && array_key_exists('id', $item)) if (\is_array($item) && array_key_exists('id', $item))
{ {
$organized[$key][] = $item['id']; $organized[$key][] = $item['id'];
} }

View File

@ -177,7 +177,7 @@ trait KitsuTrait {
try try
{ {
return Json::decode(wait($response->getBody()), TRUE); return Json::decode(wait($response->getBody()));
} }
catch (JsonException $e) catch (JsonException $e)
{ {
@ -226,7 +226,7 @@ trait KitsuTrait {
$response = $this->getResponse('POST', ...$args); $response = $this->getResponse('POST', ...$args);
$validResponseCodes = [200, 201]; $validResponseCodes = [200, 201];
if ( ! in_array((int) $response->getStatus(), $validResponseCodes)) if ( ! \in_array((int) $response->getStatus(), $validResponseCodes, TRUE))
{ {
if ($logger) if ($logger)
{ {

View File

@ -31,7 +31,7 @@ class AnimeListTransformer extends AbstractTransformer {
* @param array $item API library item * @param array $item API library item
* @return array * @return array
*/ */
public function transform($item) public function transform($item): array
{ {
$included = $item['included']; $included = $item['included'];
$animeId = $item['relationships']['media']['data']['id']; $animeId = $item['relationships']['media']['data']['id'];
@ -41,7 +41,7 @@ class AnimeListTransformer extends AbstractTransformer {
sort($genres); sort($genres);
$rating = (int) $item['attributes']['rating'] !== 0 $rating = (int) $item['attributes']['rating'] !== 0
? (int) 2 * $item['attributes']['rating'] ? 2 * $item['attributes']['rating']
: '-'; : '-';
$total_episodes = array_key_exists('episodeCount', $anime) && (int) $anime['episodeCount'] !== 0 $total_episodes = array_key_exists('episodeCount', $anime) && (int) $anime['episodeCount'] !== 0
@ -97,7 +97,7 @@ class AnimeListTransformer extends AbstractTransformer {
'rewatching' => (bool) $item['attributes']['reconsuming'], 'rewatching' => (bool) $item['attributes']['reconsuming'],
'rewatched' => (int) $item['attributes']['reconsumeCount'], 'rewatched' => (int) $item['attributes']['reconsumeCount'],
'user_rating' => $rating, 'user_rating' => $rating,
'private' => (bool) $item['attributes']['private'] ?? FALSE, 'private' => $item['attributes']['private'] ?? FALSE,
]; ];
} }
@ -108,7 +108,7 @@ class AnimeListTransformer extends AbstractTransformer {
* @param array $item Transformed library item * @param array $item Transformed library item
* @return array API library item * @return array API library item
*/ */
public function untransform($item) public function untransform($item): array
{ {
$privacy = (array_key_exists('private', $item) && $item['private']); $privacy = (array_key_exists('private', $item) && $item['private']);
$rewatching = (array_key_exists('rewatching', $item) && $item['rewatching']); $rewatching = (array_key_exists('rewatching', $item) && $item['rewatching']);

View File

@ -33,7 +33,7 @@ class MangaListTransformer extends AbstractTransformer {
* @param array $item manga entry item * @param array $item manga entry item
* @return array * @return array
*/ */
public function transform($item) public function transform($item): array
{ {
$included = $item['included']; $included = $item['included'];
$mangaId = $item['relationships']['media']['data']['id']; $mangaId = $item['relationships']['media']['data']['id'];
@ -43,7 +43,7 @@ class MangaListTransformer extends AbstractTransformer {
sort($genres); sort($genres);
$rating = (int) $item['attributes']['rating'] !== 0 $rating = (int) $item['attributes']['rating'] !== 0
? (int) 2 * $item['attributes']['rating'] ? 2 * $item['attributes']['rating']
: '-'; : '-';
$totalChapters = ((int) $manga['chapterCount'] !== 0) $totalChapters = ((int) $manga['chapterCount'] !== 0)
@ -109,9 +109,9 @@ class MangaListTransformer extends AbstractTransformer {
* @param array $item * @param array $item
* @return array * @return array
*/ */
public function untransform($item) public function untransform($item): array
{ {
$rereading = (array_key_exists('rereading', $item)) && (bool)$item['rereading']; $rereading = array_key_exists('rereading', $item) && (bool)$item['rereading'];
$map = [ $map = [
'id' => $item['id'], 'id' => $item['id'],

View File

@ -18,21 +18,6 @@ namespace Aviat\AnimeClient;
use Yosymfony\Toml\Toml; use Yosymfony\Toml\Toml;
if ( ! \defined('SRC_DIR'))
{
\define('SRC_DIR', \realpath(__DIR__));
}
const SESSION_SEGMENT = 'Aviat\AnimeClient\Auth';
const DEFAULT_CONTROLLER = Controller\Index::class;
const DEFAULT_CONTROLLER_NAMESPACE = Controller::class;
const DEFAULT_LIST_CONTROLLER = Controller\Anime::class;
const DEFAULT_CONTROLLER_METHOD = 'index';
const NOT_FOUND_METHOD = 'notFound';
const ERROR_MESSAGE_METHOD = 'errorPage';
const SRC_DIR = SRC_DIR;
if ( ! \function_exists('Aviat\AnimeClient\loadToml')) if ( ! \function_exists('Aviat\AnimeClient\loadToml'))
{ {
/** /**

View File

@ -106,7 +106,7 @@ class Controller {
$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($this->baseData, [
'url' => $auraUrlGenerator, 'url' => $auraUrlGenerator,
'urlGenerator' => $urlGenerator, 'urlGenerator' => $urlGenerator,
'auth' => $container->get('auth'), 'auth' => $container->get('auth'),

View File

@ -232,9 +232,9 @@ class Anime extends BaseController {
$body = $this->request->getParsedBody(); $body = $this->request->getParsedBody();
$response = $this->model->deleteLibraryItem($body['id'], $body['mal_id']); $response = $this->model->deleteLibraryItem($body['id'], $body['mal_id']);
if ((bool)$response === TRUE) if ($response === TRUE)
{ {
$this->setFlashMessage("Successfully deleted anime.", 'success'); $this->setFlashMessage('Successfully deleted anime.', 'success');
$this->cache->clear(); $this->cache->clear();
} }
else else

View File

@ -36,12 +36,6 @@ class Manga extends Controller {
*/ */
protected $model; protected $model;
/**
* Data to ve sent to all routes in this controller
* @var array $baseData
*/
protected $baseData;
/** /**
* Constructor * Constructor
* *

View File

@ -78,15 +78,18 @@ class Dispatcher extends RoutingBase {
*/ */
public function getRoute() public function getRoute()
{ {
$logger = $this->container->getLogger('default'); $logger = $this->container->getLogger();
$rawRoute = $this->request->getUri()->getPath(); $rawRoute = $this->request->getUri()->getPath();
$routePath = '/' . trim($rawRoute, '/'); $routePath = '/' . trim($rawRoute, '/');
$logger->info('Dispatcher - Routing data from get_route method'); if ($logger !== NULL)
$logger->info(print_r([ {
'route_path' => $routePath $logger->info('Dispatcher - Routing data from get_route method');
], TRUE)); $logger->info(print_r([
'route_path' => $routePath
], TRUE));
}
return $this->matcher->match($this->request); return $this->matcher->match($this->request);
} }
@ -107,16 +110,19 @@ class Dispatcher extends RoutingBase {
* @param object|null $route * @param object|null $route
* @return void * @return void
*/ */
public function __invoke($route = NULL) public function __invoke($route = NULL): void
{ {
$logger = $this->container->getLogger('default'); $logger = $this->container->getLogger();
if (is_null($route)) if ($route === NULL)
{ {
$route = $this->getRoute(); $route = $this->getRoute();
$logger->info('Dispatcher - Route invoke arguments'); if ($logger !== NULL)
$logger->info(print_r($route, TRUE)); {
$logger->info('Dispatcher - Route invoke arguments');
$logger->info(print_r($route, TRUE));
}
} }
if ($route) if ($route)
@ -147,7 +153,7 @@ class Dispatcher extends RoutingBase {
* @throws \LogicException * @throws \LogicException
* @return array * @return array
*/ */
protected function processRoute($route) protected function processRoute($route): array
{ {
if (array_key_exists('controller', $route->attributes)) if (array_key_exists('controller', $route->attributes))
{ {
@ -155,7 +161,7 @@ class Dispatcher extends RoutingBase {
} }
else else
{ {
throw new \LogicException("Missing controller"); throw new \LogicException('Missing controller');
} }
// Get the full namespace for a controller if a short name is given // Get the full namespace for a controller if a short name is given
@ -181,8 +187,11 @@ class Dispatcher extends RoutingBase {
} }
} }
} }
$logger = $this->container->getLogger('default'); $logger = $this->container->getLogger();
$logger->info(json_encode($params)); if ($logger !== NULL)
{
$logger->info(json_encode($params));
}
return [ return [
'controller_name' => $controllerName, 'controller_name' => $controllerName,
@ -205,8 +214,11 @@ class Dispatcher extends RoutingBase {
$segments = explode('/', $path); $segments = explode('/', $path);
$controller = reset($segments); $controller = reset($segments);
$logger = $this->container->getLogger('default'); $logger = $this->container->getLogger();
$logger->info('Controller: ' . $controller); if ($logger !== NULL)
{
$logger->info('Controller: ' . $controller);
}
if (empty($controller)) if (empty($controller))
{ {
@ -234,7 +246,7 @@ class Dispatcher extends RoutingBase {
foreach ($classFiles as $file) foreach ($classFiles as $file)
{ {
$rawClassName = basename(str_replace(".php", "", $file)); $rawClassName = basename(str_replace('.php', '', $file));
$path = $this->string($rawClassName)->dasherize()->__toString(); $path = $this->string($rawClassName)->dasherize()->__toString();
$className = trim($defaultNamespace . '\\' . $rawClassName, '\\'); $className = trim($defaultNamespace . '\\' . $rawClassName, '\\');
@ -262,9 +274,12 @@ class Dispatcher extends RoutingBase {
$controller = new $controllerName($this->container); $controller = new $controllerName($this->container);
// Run the appropriate controller method // Run the appropriate controller method
$logger->debug('Dispatcher - controller arguments', $params); if ($logger !== NULL)
{
$logger->debug('Dispatcher - controller arguments', $params);
}
call_user_func_array([$controller, $method], $params); \call_user_func_array([$controller, $method], $params);
} }
catch (FailedResponseException $e) catch (FailedResponseException $e)
{ {
@ -285,11 +300,14 @@ class Dispatcher extends RoutingBase {
*/ */
protected function getErrorParams() protected function getErrorParams()
{ {
$logger = $this->container->getLogger('default'); $logger = $this->container->getLogger();
$failure = $this->matcher->getFailedRoute(); $failure = $this->matcher->getFailedRoute();
$logger->info('Dispatcher - failed route'); if ($logger !== NULL)
$logger->info(print_r($failure, TRUE)); {
$logger->info('Dispatcher - failed route');
$logger->info(print_r($failure, TRUE));
}
$actionMethod = ERROR_MESSAGE_METHOD; $actionMethod = ERROR_MESSAGE_METHOD;
@ -354,9 +372,9 @@ class Dispatcher extends RoutingBase {
$route['controller'] = $controllerClass; $route['controller'] = $controllerClass;
// Select the appropriate router method based on the http verb // Select the appropriate router method based on the http verb
$add = (array_key_exists('verb', $route)) $add = array_key_exists('verb', $route)
? strtolower($route['verb']) ? strtolower($route['verb'])
: "get"; : 'get';
// Add the route to the router object // Add the route to the router object
if ( ! array_key_exists('tokens', $route)) if ( ! array_key_exists('tokens', $route))

View File

@ -16,10 +16,13 @@
namespace Aviat\AnimeClient\Model; namespace Aviat\AnimeClient\Model;
use Aviat\Ion\StringWrapper;
/** /**
* Base model for api interaction * Base model for api interaction
*/ */
class API extends AbstractModel { class API {
use StringWrapper;
/** /**
* Whether to use the MAL api * Whether to use the MAL api

View File

@ -16,9 +16,7 @@
namespace Aviat\AnimeClient\Model; namespace Aviat\AnimeClient\Model;
use Aviat\AnimeClient\API\Kitsu;
use Aviat\Ion\Di\ContainerInterface; use Aviat\Ion\Di\ContainerInterface;
use Aviat\Ion\Json;
use PDO; use PDO;
/** /**
@ -48,7 +46,7 @@ class AnimeCollection extends Collection {
* *
* @return array * @return array
*/ */
public function getCollection() public function getCollection(): array
{ {
$rawCollection = $this->getCollectionFromDatabase(); $rawCollection = $this->getCollectionFromDatabase();
@ -74,7 +72,7 @@ class AnimeCollection extends Collection {
* *
* @return array * @return array
*/ */
public function getMediaTypeList() public function getMediaTypeList(): array
{ {
$output = []; $output = [];
@ -93,13 +91,13 @@ class AnimeCollection extends Collection {
/** /**
* Get item from collection for editing * Get item from collection for editing
* *
* @param int $id * @param string $id
* @return array * @return array
*/ */
public function getCollectionEntry($id) public function getCollectionEntry($id): array
{ {
$query = $this->db->from('anime_set') $query = $this->db->from('anime_set')
->where('hummingbird_id', (int)$id) ->where('hummingbird_id', $id)
->get(); ->get();
return $query->fetch(PDO::FETCH_ASSOC); return $query->fetch(PDO::FETCH_ASSOC);
@ -110,7 +108,7 @@ class AnimeCollection extends Collection {
* *
* @return array * @return array
*/ */
private function getCollectionFromDatabase() private function getCollectionFromDatabase(): array
{ {
if ( ! $this->validDatabase) if ( ! $this->validDatabase)
{ {
@ -134,7 +132,7 @@ class AnimeCollection extends Collection {
* @param array $data * @param array $data
* @return void * @return void
*/ */
public function add($data) public function add($data): void
{ {
$anime = (object)$this->animeModel->getAnimeById($data['id']); $anime = (object)$this->animeModel->getAnimeById($data['id']);
$this->db->set([ $this->db->set([
@ -160,7 +158,7 @@ class AnimeCollection extends Collection {
* @param array $data * @param array $data
* @return void * @return void
*/ */
public function update($data) public function update($data): void
{ {
// If there's no id to update, don't update // If there's no id to update, don't update
if ( ! array_key_exists('hummingbird_id', $data)) if ( ! array_key_exists('hummingbird_id', $data))
@ -182,7 +180,7 @@ class AnimeCollection extends Collection {
* @param array $data * @param array $data
* @return void * @return void
*/ */
public function delete($data) public function delete($data): void
{ {
// If there's no id to update, don't delete // If there's no id to update, don't delete
if ( ! array_key_exists('hummingbird_id', $data)) if ( ! array_key_exists('hummingbird_id', $data))
@ -203,7 +201,7 @@ class AnimeCollection extends Collection {
* @param int $kitsuId * @param int $kitsuId
* @return array * @return array
*/ */
public function get($kitsuId) public function get($kitsuId): array
{ {
$query = $this->db->from('anime_set') $query = $this->db->from('anime_set')
->where('hummingbird_id', $kitsuId) ->where('hummingbird_id', $kitsuId)
@ -215,13 +213,14 @@ class AnimeCollection extends Collection {
/** /**
* Update genre information for selected anime * Update genre information for selected anime
* *
* @param int $animeId The current anime * @param string $animeId The current anime
* @return void * @return void
*/ */
private function updateGenre($animeId) private function updateGenre($animeId): void
{ {
$genreInfo = $this->getGenreData(); $genreInfo = $this->getGenreData();
extract($genreInfo, \EXTR_SKIP); $genres = $genreInfo['genres'];
$links = $genreInfo['links'];
// Get api information // Get api information
$anime = $this->animeModel->getAnimeById($animeId); $anime = $this->animeModel->getAnimeById($animeId);
@ -229,7 +228,7 @@ class AnimeCollection extends Collection {
foreach ($anime['genres'] as $genre) foreach ($anime['genres'] as $genre)
{ {
// Add genres that don't currently exist // Add genres that don't currently exist
if ( ! in_array($genre, $genres)) if ( ! \in_array($genre, $genres, TRUE))
{ {
$this->db->set('genre', $genre) $this->db->set('genre', $genre)
->insert('genres'); ->insert('genres');
@ -248,7 +247,7 @@ class AnimeCollection extends Collection {
if (array_key_exists($animeId, $links)) if (array_key_exists($animeId, $links))
{ {
if ( ! in_array($flippedGenres[$genre], $links[$animeId])) if ( ! \in_array($flippedGenres[$genre], $links[$animeId], TRUE))
{ {
$this->db->set($insertArray)->insert('genre_anime_set_link'); $this->db->set($insertArray)->insert('genre_anime_set_link');
} }
@ -265,7 +264,7 @@ class AnimeCollection extends Collection {
* *
* @return array * @return array
*/ */
private function getGenreData() private function getGenreData(): array
{ {
$genres = []; $genres = [];
$links = []; $links = [];

View File

@ -16,8 +16,7 @@
namespace Aviat\AnimeClient\Model; namespace Aviat\AnimeClient\Model;
use Aviat\AnimeClient\Model\DB; use Aviat\Ion\Di\ContainerInterface;
use Aviat\Ion\Di\{ContainerAware, ContainerInterface};
use PDO; use PDO;
use PDOException; use PDOException;
@ -26,8 +25,6 @@ use PDOException;
*/ */
class Collection extends DB { class Collection extends DB {
use ContainerAware;
/** /**
* Whether the database is valid for querying * Whether the database is valid for querying
* @var boolean * @var boolean
@ -47,11 +44,7 @@ class Collection extends DB {
{ {
$this->db = \Query($this->dbConfig['collection']); $this->db = \Query($this->dbConfig['collection']);
} }
catch (PDOException $e) catch (PDOException $e) {}
{
//$this->validDatabase = FALSE;
//return FALSE;
}
// Is database valid? If not, set a flag so the // Is database valid? If not, set a flag so the
// app can be run without a valid database // app can be run without a valid database
@ -81,7 +74,7 @@ class Collection extends DB {
* @param array $filter * @param array $filter
* @return array * @return array
*/ */
public function getGenreList($filter = []) public function getGenreList(array $filter = []): array
{ {
$this->db->select('hummingbird_id, genre') $this->db->select('hummingbird_id, genre')
->from('genre_anime_set_link gl') ->from('genre_anime_set_link gl')
@ -112,7 +105,7 @@ class Collection extends DB {
if (array_key_exists($id, $output)) if (array_key_exists($id, $output))
{ {
array_push($output[$id], $genre); $output[$id][] = $genre;
} }
else else
{ {

View File

@ -17,16 +17,19 @@
namespace Aviat\AnimeClient\Model; namespace Aviat\AnimeClient\Model;
use Aviat\Ion\Di\{ContainerAware, ContainerInterface}; use Aviat\Ion\Di\{ContainerAware, ContainerInterface};
use Aviat\Ion\{ArrayWrapper, StringWrapper};
/** /**
* Base model for database interaction * Base model for database interaction
*/ */
class DB extends AbstractModel { class DB {
use ArrayWrapper;
use ContainerAware; use ContainerAware;
use StringWrapper;
/** /**
* The query builder object * The query builder object
* @var \Query\Query_Builder_Interface $db * @var \Query\Query_Builder_Interface
*/ */
protected $db; protected $db;

View File

@ -16,9 +16,7 @@
namespace Aviat\AnimeClient\Model; namespace Aviat\AnimeClient\Model;
use Aviat\AnimeClient\API\Kitsu;
use Aviat\Ion\Di\ContainerInterface; use Aviat\Ion\Di\ContainerInterface;
use Aviat\Ion\Json;
use PDO; use PDO;
/** /**
@ -48,7 +46,7 @@ class MangaCollection extends Collection {
* *
* @return array * @return array
*/ */
public function getCollection() public function getCollection(): array
{ {
$rawCollection = $this->getCollectionFromDatabase(); $rawCollection = $this->getCollectionFromDatabase();
@ -74,7 +72,7 @@ class MangaCollection extends Collection {
* *
* @return array * @return array
*/ */
public function getMediaTypeList() public function getMediaTypeList(): array
{ {
$output = []; $output = [];
@ -96,10 +94,10 @@ class MangaCollection extends Collection {
* @param int $id * @param int $id
* @return array * @return array
*/ */
public function getCollectionEntry($id) public function getCollectionEntry($id): array
{ {
$query = $this->db->from('anime_set') $query = $this->db->from('anime_set')
->where('hummingbird_id', (int)$id) ->where('hummingbird_id', $id)
->get(); ->get();
return $query->fetch(PDO::FETCH_ASSOC); return $query->fetch(PDO::FETCH_ASSOC);
@ -110,7 +108,7 @@ class MangaCollection extends Collection {
* *
* @return array * @return array
*/ */
private function getCollectionFromDatabase() private function getCollectionFromDatabase(): array
{ {
if ( ! $this->validDatabase) if ( ! $this->validDatabase)
{ {
@ -134,7 +132,7 @@ class MangaCollection extends Collection {
* @param array $data * @param array $data
* @return void * @return void
*/ */
public function add($data) public function add($data): void
{ {
$anime = (object)$this->mangaModel->getMangaById($data['id']); $anime = (object)$this->mangaModel->getMangaById($data['id']);
$this->db->set([ $this->db->set([
@ -160,7 +158,7 @@ class MangaCollection extends Collection {
* @param array $data * @param array $data
* @return void * @return void
*/ */
public function update($data) public function update($data): void
{ {
// If there's no id to update, don't update // If there's no id to update, don't update
if ( ! array_key_exists('hummingbird_id', $data)) if ( ! array_key_exists('hummingbird_id', $data))
@ -182,7 +180,7 @@ class MangaCollection extends Collection {
* @param array $data * @param array $data
* @return void * @return void
*/ */
public function delete($data) public function delete($data): void
{ {
// If there's no id to update, don't delete // If there's no id to update, don't delete
if ( ! array_key_exists('hummingbird_id', $data)) if ( ! array_key_exists('hummingbird_id', $data))
@ -200,10 +198,10 @@ class MangaCollection extends Collection {
/** /**
* Get the details of a collection item * Get the details of a collection item
* *
* @param int $kitsuId * @param string $kitsuId
* @return array * @return array
*/ */
public function get($kitsuId) public function get($kitsuId): array
{ {
$query = $this->db->from('manga_set') $query = $this->db->from('manga_set')
->where('hummingbird_id', $kitsuId) ->where('hummingbird_id', $kitsuId)
@ -215,13 +213,14 @@ class MangaCollection extends Collection {
/** /**
* Update genre information for selected manga * Update genre information for selected manga
* *
* @param int $mangaId The current manga * @param string $mangaId The current manga
* @return void * @return void
*/ */
private function updateGenre($mangaId) private function updateGenre($mangaId): void
{ {
$genreInfo = $this->getGenreData(); $genreInfo = $this->getGenreData();
extract($genreInfo, EXTR_SKIP); $genres = $genreInfo['genres'];
$links = $genreInfo['links'];
// Get api information // Get api information
$manga = $this->mangaModel->getMangaById($mangaId); $manga = $this->mangaModel->getMangaById($mangaId);
@ -229,7 +228,7 @@ class MangaCollection extends Collection {
foreach ($manga['genres'] as $genre) foreach ($manga['genres'] as $genre)
{ {
// Add genres that don't currently exist // Add genres that don't currently exist
if ( ! in_array($genre, $genres)) if ( ! \in_array($genre, $genres, TRUE))
{ {
$this->db->set('genre', $genre) $this->db->set('genre', $genre)
->insert('genres'); ->insert('genres');
@ -248,7 +247,7 @@ class MangaCollection extends Collection {
if (array_key_exists($mangaId, $links)) if (array_key_exists($mangaId, $links))
{ {
if ( ! in_array($flippedGenres[$genre], $links[$mangaId])) if ( ! \in_array($flippedGenres[$genre], $links[$mangaId], TRUE))
{ {
$this->db->set($insertArray)->insert('genre_manga_set_link'); $this->db->set($insertArray)->insert('genre_manga_set_link');
} }
@ -265,7 +264,7 @@ class MangaCollection extends Collection {
* *
* @return array * @return array
*/ */
private function getGenreData() private function getGenreData(): array
{ {
$genres = []; $genres = [];
$links = []; $links = [];

View File

@ -14,13 +14,13 @@
* @link https://git.timshomepage.net/timw4mail/HummingBirdAnimeClient * @link https://git.timshomepage.net/timw4mail/HummingBirdAnimeClient
*/ */
namespace Aviat\AnimeClient\Model; namespace Aviat\AnimeClient;
use Aviat\Ion\StringWrapper; const DEFAULT_CONTROLLER = Controller\Index::class;
const DEFAULT_CONTROLLER_METHOD = 'index';
/** const DEFAULT_CONTROLLER_NAMESPACE = Controller::class;
* Base class for Models const DEFAULT_LIST_CONTROLLER = Controller\Anime::class;
*/ const ERROR_MESSAGE_METHOD = 'errorPage';
abstract class AbstractModel { const NOT_FOUND_METHOD = 'notFound';
use StringWrapper; const SESSION_SEGMENT = 'Aviat\AnimeClient\Auth';
} const SRC_DIR = __DIR__;

View File

@ -59,30 +59,30 @@ class ControllerTest extends AnimeClientTestCase {
$this->container->setInstance('config', $config); $this->container->setInstance('config', $config);
$this->assertInstanceOf( $this->assertInstanceOf(
'Aviat\AnimeClient\Controller', Controller::class,
new AnimeController($this->container) new AnimeController($this->container)
); );
$this->assertInstanceOf( $this->assertInstanceOf(
'Aviat\AnimeClient\Controller', Controller::class,
new MangaController($this->container) new MangaController($this->container)
); );
$this->assertInstanceOf( $this->assertInstanceOf(
'Aviat\AnimeClient\Controller', Controller::class,
new CharacterController($this->container) new CharacterController($this->container)
); );
$this->assertInstanceOf( $this->assertInstanceOf(
'Aviat\AnimeClient\Controller', Controller::class,
new AnimeCollectionController($this->container) new AnimeCollectionController($this->container)
); );
$this->assertInstanceOf( $this->assertInstanceOf(
'Aviat\AnimeClient\Controller', Controller::class,
new MangaCollectionController($this->container) new MangaCollectionController($this->container)
); );
} }
public function testBaseControllerSanity() public function testBaseControllerSanity()
{ {
$this->assertTrue(is_object($this->BaseController)); $this->assertTrue(\is_object($this->BaseController));
} }
public function testFormatTitle() public function testFormatTitle()

View File

@ -72,7 +72,7 @@ class TestTransformer extends AbstractTransformer {
} }
trait MockViewOutputTrait { trait MockViewOutputTrait {
protected function output() { protected function output(): void {
$reflect = new ReflectionClass($this); $reflect = new ReflectionClass($this);
$properties = $reflect->getProperties(); $properties = $reflect->getProperties();
$props = []; $props = [];
@ -102,8 +102,8 @@ class MockUtil {
} }
class TestView extends View { class TestView extends View {
public function send() {} public function send(): void {}
protected function output() protected function output(): void
{ {
/*$content =& $this->response->content; /*$content =& $this->response->content;
$content->set($this->output); $content->set($this->output);