Reformat misc files

app/appConf/routes.php

@@ -16,10 +16,10 @@
 
 use const Aviat\AnimeClient\{
 	ALPHA_SLUG_PATTERN,
-	NUM_PATTERN,
+	DEFAULT_CONTROLLER,
-	SLUG_PATTERN,
 	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))
 		{

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\{Component, Model};
-use Aviat\AnimeClient\Model;
 use Aviat\Banker\Teller;
 use Aviat\Ion\Config;
-use Aviat\Ion\Di\Container;
+use Aviat\Ion\Di\{Container, ContainerInterface};
-use Aviat\Ion\Di\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) {
+	$container->set('html-helper', static function (ContainerInterface $container) {
-		$htmlHelper = (new HelperLocatorFactory)->newInstance();
+		$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) {
+			$htmlHelper->set($name, static function () use ($class, $container) {
-				$helper = new $class;
+				$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;
 	});
 

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);
 }

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])

migrations/20160404202433_cache_migration.php

@@ -1,35 +1,35 @@
-<?php
+<?php declare(strict_types=1);
 
 use Phinx\Migration\AbstractMigration;
 
 class CacheMigration extends AbstractMigration
 {
-    /**
+	/**
-     * Change Method.
+	 * Change Method.
-     *
+	 *
-     * Write your reversible migrations using this method.
+	 * Write your reversible migrations using this method.
-     *
+	 *
-     * More information on writing migrations is available here:
+	 * More information on writing migrations is available here:
-     * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
+	 * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
-     *
+	 *
-     * The following commands can be used in this method and Phinx will
+	 * The following commands can be used in this method and Phinx will
-     * automatically reverse them when rolling back:
+	 * automatically reverse them when rolling back:
-     *
+	 *
-     *    createTable
+	 *    createTable
-     *    renameTable
+	 *    renameTable
-     *    addColumn
+	 *    addColumn
-     *    renameColumn
+	 *    renameColumn
-     *    addIndex
+	 *    addIndex
-     *    addForeignKey
+	 *    addForeignKey
-     *
+	 *
-     * Remember to call "create()" or "update()" and NOT "save()" when working
+	 * Remember to call "create()" or "update()" and NOT "save()" when working
-     * with the Table class.
+	 * with the Table class.
-     */
+	 */
-    public function change()
+	public function change()
-    {
+	{
 		$cacheTable = $this->table('cache', ['id' => FALSE, 'primary_key' => ['key']]);
 		$cacheTable->addColumn('key', 'text')
 			->addColumn('value', 'text')
 			->create();
-    }
+	}
 }

migrations/20200422170018_reorganize_anime_collection_media.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 use Phinx\Migration\AbstractMigration;
 
@@ -11,7 +11,7 @@ class ReorganizeAnimeCollectionMedia extends AbstractMigration
 		{
 			$newLinkTable = $this->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[] = [

migrations/20200423163646_anime_collection_refactor_cleanup.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 use Phinx\Migration\AbstractMigration;
 
@@ -18,6 +18,7 @@ class AnimeCollectionRefactorCleanup extends AbstractMigration
 	{
 		// Add some new media types
 		$moreMediaTypes = [];
+
 		foreach ($this->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})");
 	}

migrations/20200430175135_anime_collection_cleanup.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 use Phinx\Migration\AbstractMigration;
 

tools/rector.php

@@ -2,41 +2,27 @@
 
 use Rector\CodeQuality\Rector\BooleanNot\SimplifyDeMorganBinaryRector;
 use Rector\CodeQuality\Rector\Class_\CompleteDynamicPropertiesRector;
-use Rector\CodeQuality\Rector\For_\ForRepeatedCountToOwnVariableRector;
+use Rector\CodeQuality\Rector\For_\{ForRepeatedCountToOwnVariableRector, ForToForeachRector};
-use Rector\CodeQuality\Rector\For_\ForToForeachRector;
+use Rector\CodeQuality\Rector\If_\{ConsecutiveNullCompareReturnsToNullCoalesceQueueRector, SimplifyIfElseToTernaryRector, SimplifyIfReturnBoolRector};
-use Rector\CodeQuality\Rector\If_\ConsecutiveNullCompareReturnsToNullCoalesceQueueRector;
+use Rector\CodeQuality\Rector\Ternary\{SimplifyDuplicatedTernaryRector, SimplifyTautologyTernaryRector, SwitchNegatedTernaryRector};
-use Rector\CodeQuality\Rector\If_\SimplifyIfElseToTernaryRector;
-use Rector\CodeQuality\Rector\If_\SimplifyIfReturnBoolRector;
-use Rector\CodeQuality\Rector\Ternary\SimplifyDuplicatedTernaryRector;
-use Rector\CodeQuality\Rector\Ternary\SimplifyTautologyTernaryRector;
-use Rector\CodeQuality\Rector\Ternary\SwitchNegatedTernaryRector;
 use Rector\CodingStyle\Rector\Class_\AddArrayDefaultToArrayPropertyRector;
 use Rector\CodingStyle\Rector\ClassConst\RemoveFinalFromConstRector;
 use Rector\CodingStyle\Rector\ClassMethod\NewlineBeforeNewAssignSetRector;
 use Rector\CodingStyle\Rector\Encapsed\WrapEncapsedVariableInCurlyBracesRector;
-use Rector\CodingStyle\Rector\FuncCall\CallUserFuncArrayToVariadicRector;
+use Rector\CodingStyle\Rector\FuncCall\{CallUserFuncArrayToVariadicRector, CallUserFuncToMethodCallRector, CountArrayToEmptyArrayComparisonRector};
-use Rector\CodingStyle\Rector\FuncCall\CallUserFuncToMethodCallRector;
-use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
 use Rector\CodingStyle\Rector\Stmt\NewlineAfterStatementRector;
 use Rector\Core\Configuration\Option;
-use Rector\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector;
+use Rector\DeadCode\Rector\ClassMethod\{RemoveUselessParamTagRector, RemoveUselessReturnTagRector};
-use Rector\DeadCode\Rector\ClassMethod\RemoveUselessReturnTagRector;
 use Rector\DeadCode\Rector\Foreach_\RemoveUnusedForeachKeyRector;
 use Rector\DeadCode\Rector\Property\RemoveUselessVarTagRector;
 use Rector\DeadCode\Rector\Switch_\RemoveDuplicatedCaseInSwitchRector;
-use Rector\Doctrine\Set\DoctrineSetList;
 use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector;
-use Rector\EarlyReturn\Rector\If_\ChangeIfElseValueAssignToEarlyReturnRector;
+use Rector\EarlyReturn\Rector\If_\{ChangeIfElseValueAssignToEarlyReturnRector, RemoveAlwaysElseRector};
-use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector;
 use Rector\Php74\Rector\Property\RestoreDefaultNullToNullableTypePropertyRector;
 use Rector\Php81\Rector\Property\ReadOnlyPropertyRector;
 use Rector\Restoration\Rector\Property\MakeTypedPropertyNullableIfCheckedRector;
 use Rector\Set\ValueObject\LevelSetList;
-use Rector\TypeDeclaration\Rector\ClassMethod\AddArrayParamDocTypeRector;
+use Rector\TypeDeclaration\Rector\ClassMethod\{AddArrayParamDocTypeRector, AddArrayReturnDocTypeRector, AddMethodCallBasedStrictParamTypeRector, ParamTypeByMethodCallTypeRector, ParamTypeByParentCallTypeRector};
-use Rector\TypeDeclaration\Rector\ClassMethod\AddArrayReturnDocTypeRector;
-use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
-use Rector\TypeDeclaration\Rector\ClassMethod\ParamTypeByMethodCallTypeRector;
-use Rector\TypeDeclaration\Rector\ClassMethod\ParamTypeByParentCallTypeRector;
 use Rector\TypeDeclaration\Rector\Closure\AddClosureReturnTypeRector;
 use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
@@ -45,7 +31,8 @@ if ( ! function_exists('walk_array'))
 {
 	function walk_array(callable $method, array $items): void
 	{
-		foreach ($items as $item) {
+		foreach ($items as $item)
+		{
 			$method($item);
 		}
 	}
@@ -53,8 +40,8 @@ if ( ! function_exists('walk_array'))
 
 return static function (ContainerConfigurator $config): void {
 	$parameters = $config->parameters();
-	$parameters->set(Option::AUTO_IMPORT_NAMES, false);
+	$parameters->set(Option::AUTO_IMPORT_NAMES, FALSE);
-	$parameters->set(Option::IMPORT_SHORT_CLASSES, false);
+	$parameters->set(Option::IMPORT_SHORT_CLASSES, FALSE);
 	$parameters->set(Option::SKIP, [
 		ReadOnlyPropertyRector::class,
 		RestoreDefaultNullToNullableTypePropertyRector::class,