From 7215178c5ec8aeeeb1786baaab9b2e3f327ea772 Mon Sep 17 00:00:00 2001 From: "Timothy J. Warren" Date: Thu, 3 Mar 2022 18:19:02 -0500 Subject: [PATCH] Reformat misc files --- app/appConf/routes.php | 26 +++++----- app/bootstrap.php | 37 +++++++------- index.php | 6 +-- migrations/20150616181750_first_migration.php | 9 ++-- migrations/20160404202433_cache_migration.php | 50 +++++++++---------- ...0018_reorganize_anime_collection_media.php | 6 ++- ...3646_anime_collection_refactor_cleanup.php | 5 +- ...0200430175135_anime_collection_cleanup.php | 2 +- tools/rector.php | 35 ++++--------- 9 files changed, 85 insertions(+), 91 deletions(-) diff --git a/app/appConf/routes.php b/app/appConf/routes.php index f599c439..85a3d5ca 100644 --- a/app/appConf/routes.php +++ b/app/appConf/routes.php @@ -16,10 +16,10 @@ use const Aviat\AnimeClient\{ ALPHA_SLUG_PATTERN, - NUM_PATTERN, - SLUG_PATTERN, + DEFAULT_CONTROLLER, DEFAULT_CONTROLLER_METHOD, - DEFAULT_CONTROLLER + NUM_PATTERN, + SLUG_PATTERN }; // ------------------------------------------------------------------------- @@ -190,14 +190,14 @@ $routes = [ 'character' => [ 'path' => '/character/{slug}', 'tokens' => [ - 'slug' => SLUG_PATTERN - ] + 'slug' => SLUG_PATTERN, + ], ], 'person' => [ 'path' => '/people/{slug}', 'tokens' => [ 'slug' => SLUG_PATTERN, - ] + ], ], 'default_user_info' => [ 'path' => '/me', @@ -209,8 +209,8 @@ $routes = [ 'controller' => 'user', 'action' => 'about', 'tokens' => [ - 'username' => '.*?' - ] + 'username' => '.*?', + ], ], // --------------------------------------------------------------------- // Default / Shared routes @@ -231,8 +231,8 @@ $routes = [ 'controller' => 'images', 'tokens' => [ 'type' => SLUG_PATTERN, - 'file' => '[a-z0-9\-]+\.[a-z]{3,4}' - ] + 'file' => '[a-z0-9\-]+\.[a-z]{3,4}', + ], ], 'settings' => [ 'path' => '/settings', @@ -259,8 +259,8 @@ $routes = [ 'controller' => 'history', 'path' => '/history/{type}', 'tokens' => [ - 'type' => SLUG_PATTERN - ] + 'type' => SLUG_PATTERN, + ], ], 'increment' => [ 'path' => '/{controller}/increment', @@ -316,7 +316,7 @@ $defaultMap = [ foreach ($routes as &$route) { - foreach($defaultMap as $key => $val) + foreach ($defaultMap as $key => $val) { if ( ! array_key_exists($key, $route)) { diff --git a/app/bootstrap.php b/app/bootstrap.php index d9c88629..abeb895f 100644 --- a/app/bootstrap.php +++ b/app/bootstrap.php @@ -20,12 +20,10 @@ use Aura\Html\HelperLocatorFactory; use Aura\Router\RouterContainer; use Aura\Session\SessionFactory; use Aviat\AnimeClient\API\{Anilist, Kitsu}; -use Aviat\AnimeClient\Component; -use Aviat\AnimeClient\Model; +use Aviat\AnimeClient\{Component, Model}; use Aviat\Banker\Teller; use Aviat\Ion\Config; -use Aviat\Ion\Di\Container; -use Aviat\Ion\Di\ContainerInterface; +use Aviat\Ion\Di\{Container, ContainerInterface}; use Laminas\Diactoros\ServerRequestFactory; use Monolog\Formatter\JsonFormatter; use Monolog\Handler\RotatingFileHandler; @@ -38,7 +36,7 @@ if ( ! defined('HB_APP_DIR')) { define('HB_APP_DIR', __DIR__); define('ROOT_DIR', dirname(HB_APP_DIR)); - define('TEMPLATE_DIR', _dir(HB_APP_DIR, 'templates')); + define('TEMPLATE_DIR', _dir(HB_APP_DIR, 'templates')); } // ----------------------------------------------------------------------------- @@ -74,18 +72,19 @@ return static function (array $configArray = []): Container { $container->set('config', static fn () => new Config($configArray)); // Create Cache Object - $container->set('cache', static function(ContainerInterface $container): CacheInterface { + $container->set('cache', static function (ContainerInterface $container): CacheInterface { $logger = $container->getLogger(); $config = $container->get('config')->get('cache'); + return new Teller($config, $logger); }); // Create Aura Router Object - $container->set('aura-router', static fn() => new RouterContainer); + $container->set('aura-router', static fn () => new RouterContainer()); // Create Html helpers - $container->set('html-helper', static function(ContainerInterface $container) { - $htmlHelper = (new HelperLocatorFactory)->newInstance(); + $container->set('html-helper', static function (ContainerInterface $container) { + $htmlHelper = (new HelperLocatorFactory())->newInstance(); $helpers = [ 'menu' => Helper\Menu::class, 'field' => Helper\Form::class, @@ -94,9 +93,10 @@ return static function (array $configArray = []): Container { foreach ($helpers as $name => $class) { - $htmlHelper->set($name, static function() use ($class, $container) { - $helper = new $class; + $htmlHelper->set($name, static function () use ($class, $container) { + $helper = new $class(); $helper->setContainer($container); + return $helper; }); } @@ -106,7 +106,7 @@ return static function (array $configArray = []): Container { // Create Component helpers $container->set('component-helper', static function (ContainerInterface $container) { - $helper = (new HelperLocatorFactory)->newInstance(); + $helper = (new HelperLocatorFactory())->newInstance(); $components = [ 'animeCover' => Component\AnimeCover::class, 'mangaCover' => Component\MangaCover::class, @@ -119,8 +119,9 @@ return static function (array $configArray = []): Container { foreach ($components as $name => $componentClass) { $helper->set($name, static function () use ($container, $componentClass) { - $helper = new $componentClass; + $helper = new $componentClass(); $helper->setContainer($container); + return $helper; }); } @@ -144,7 +145,7 @@ return static function (array $configArray = []): Container { $container->set('util', static fn ($container) => new Util($container)); // Models - $container->set('kitsu-model', static function(ContainerInterface $container): Kitsu\Model { + $container->set('kitsu-model', static function (ContainerInterface $container): Kitsu\Model { $requestBuilder = new Kitsu\RequestBuilder($container); $requestBuilder->setLogger($container->getLogger('kitsu-request')); @@ -158,9 +159,10 @@ return static function (array $configArray = []): Container { $cache = $container->get('cache'); $model->setCache($cache); + return $model; }); - $container->set('anilist-model', static function(ContainerInterface $container): Anilist\Model { + $container->set('anilist-model', static function (ContainerInterface $container): Anilist\Model { $requestBuilder = new Anilist\RequestBuilder($container); $requestBuilder->setLogger($container->getLogger('anilist-request')); @@ -178,9 +180,10 @@ return static function (array $configArray = []): Container { $container->set('manga-model', static fn ($container) => new Model\Manga($container)); $container->set('anime-collection-model', static fn ($container) => new Model\AnimeCollection($container)); $container->set('manga-collection-model', static fn ($container) => new Model\MangaCollection($container)); - $container->set('settings-model', static function($container) { + $container->set('settings-model', static function ($container) { $model = new Model\Settings($container->get('config')); $model->setContainer($container); + return $model; }); @@ -196,4 +199,4 @@ return static function (array $configArray = []): Container { return $container; }; -// End of bootstrap.php \ No newline at end of file +// End of bootstrap.php diff --git a/index.php b/index.php index 9d643332..1f8c9346 100644 --- a/index.php +++ b/index.php @@ -26,7 +26,7 @@ setlocale(LC_CTYPE, 'en_US'); require_once __DIR__ . '/vendor/autoload.php'; Debugger::$strictMode = E_ALL & ~E_DEPRECATED; // all errors except deprecated notices -Debugger::$showBar = false; +Debugger::$showBar = FALSE; Debugger::enable(Debugger::DEVELOPMENT, __DIR__ . '/app/logs'); // Define base directories @@ -59,7 +59,7 @@ if (is_array($checkedConfig) && array_key_exists('timezone', $checkedConfig) && { date_default_timezone_set($checkedConfig['timezone']); } -else if (is_string($timezone) && $timezone !== '') +elseif (is_string($timezone) && $timezone !== '') { date_default_timezone_set($timezone); } @@ -76,4 +76,4 @@ unset($APP_DIR, $CONF_DIR, $APPCONF_DIR); // ----------------------------------------------------------------------------- // Dispatch to the current route // ----------------------------------------------------------------------------- -$container->get('dispatcher')(); \ No newline at end of file +$container->get('dispatcher')(); diff --git a/migrations/20150616181750_first_migration.php b/migrations/20150616181750_first_migration.php index 361941c1..fdeff001 100644 --- a/migrations/20150616181750_first_migration.php +++ b/migrations/20150616181750_first_migration.php @@ -2,7 +2,8 @@ use Phinx\Migration\AbstractMigration; -class FirstMigration extends AbstractMigration { +class FirstMigration extends AbstractMigration +{ /** * Migrate up */ @@ -16,7 +17,7 @@ class FirstMigration extends AbstractMigration { // Add items to media table if ($this->hasTable('media')) { - foreach(['DVD & Blu-ray', 'Blu-ray', 'DVD', 'Bootleg DVD'] as $type) + foreach (['DVD & Blu-ray', 'Blu-ray', 'DVD', 'Bootleg DVD'] as $type) { $this->execute('INSERT INTO "media" ("type") VALUES (\'' . $type . '\')'); } @@ -25,11 +26,11 @@ class FirstMigration extends AbstractMigration { // Create anime_set table $anime_set = $this->table('anime_set', ['id' => FALSE, 'primary_key' => ['hummingbird_id']]); $anime_set->addColumn('hummingbird_id', 'biginteger') - ->addColumn('slug', 'string', ['comment' => "URL slug used for image caching and generating links"]) + ->addColumn('slug', 'string', ['comment' => 'URL slug used for image caching and generating links']) ->addColumn('title', 'string') ->addColumn('alternate_title', 'string', ['null' => TRUE]) ->addColumn('media_id', 'integer', ['default' => 3, 'null' => TRUE]) - ->addColumn('show_type', 'string', ['default' => 'TV', 'null' => TRUE, 'comment' => "TV Series/OVA/etc"]) + ->addColumn('show_type', 'string', ['default' => 'TV', 'null' => TRUE, 'comment' => 'TV Series/OVA/etc']) ->addColumn('age_rating', 'string', ['default' => 'PG13', 'null' => TRUE]) ->addColumn('cover_image', 'string', ['null' => TRUE]) ->addColumn('episode_count', 'integer', ['null' => TRUE]) diff --git a/migrations/20160404202433_cache_migration.php b/migrations/20160404202433_cache_migration.php index e1ba079d..8cc64c85 100644 --- a/migrations/20160404202433_cache_migration.php +++ b/migrations/20160404202433_cache_migration.php @@ -1,35 +1,35 @@ -table('cache', ['id' => FALSE, 'primary_key' => ['key']]); $cacheTable->addColumn('key', 'text') ->addColumn('value', 'text') ->create(); - } + } } diff --git a/migrations/20200422170018_reorganize_anime_collection_media.php b/migrations/20200422170018_reorganize_anime_collection_media.php index d09949c1..88f40a9f 100644 --- a/migrations/20200422170018_reorganize_anime_collection_media.php +++ b/migrations/20200422170018_reorganize_anime_collection_media.php @@ -1,4 +1,4 @@ -table('anime_set_media_link', [ 'id' => FALSE, - 'primary_key' => ['hummingbird_id', 'media_id'] + 'primary_key' => ['hummingbird_id', 'media_id'], ]); $newLinkTable->addColumn('hummingbird_id', 'biginteger') @@ -31,6 +31,7 @@ class ReorganizeAnimeCollectionMedia extends AbstractMigration foreach ($rows as $row) { $keys = array_keys($row); + foreach ($keys as $k) { if (is_numeric($k)) @@ -49,6 +50,7 @@ class ReorganizeAnimeCollectionMedia extends AbstractMigration // and replace those rows with the individual entries $linkRows = $this->fetchAll('SELECT hummingbird_id FROM anime_set_media_link WHERE media_id=1'); $insertRows = []; + foreach ($linkRows as $row) { $insertRows[] = [ diff --git a/migrations/20200423163646_anime_collection_refactor_cleanup.php b/migrations/20200423163646_anime_collection_refactor_cleanup.php index 026ea74b..8f7c39e6 100644 --- a/migrations/20200423163646_anime_collection_refactor_cleanup.php +++ b/migrations/20200423163646_anime_collection_refactor_cleanup.php @@ -1,4 +1,4 @@ -newMediaTypes as $id => $medium) { $moreMediaTypes[] = [ @@ -47,7 +48,7 @@ class AnimeCollectionRefactorCleanup extends AbstractMigration $this->execute("UPDATE media SET type='Bootleg DVD' WHERE id=4"); // Remove the new media types - $values = array_map(fn ($medium) => "'{$medium}'", $this->newMediaTypes); + $values = array_map(static fn ($medium) => "'{$medium}'", $this->newMediaTypes); $valueList = implode(',', $values); $this->execute("DELETE FROM media WHERE type IN ({$valueList})"); } diff --git a/migrations/20200430175135_anime_collection_cleanup.php b/migrations/20200430175135_anime_collection_cleanup.php index 0f4c5330..33d6d7c4 100644 --- a/migrations/20200430175135_anime_collection_cleanup.php +++ b/migrations/20200430175135_anime_collection_cleanup.php @@ -1,4 +1,4 @@ -parameters(); - $parameters->set(Option::AUTO_IMPORT_NAMES, false); - $parameters->set(Option::IMPORT_SHORT_CLASSES, false); + $parameters->set(Option::AUTO_IMPORT_NAMES, FALSE); + $parameters->set(Option::IMPORT_SHORT_CLASSES, FALSE); $parameters->set(Option::SKIP, [ ReadOnlyPropertyRector::class, RestoreDefaultNullToNullableTypePropertyRector::class,