diff --git a/.gitignore b/.gitignore index 772e5fe4..ed3bfd88 100644 --- a/.gitignore +++ b/.gitignore @@ -150,4 +150,8 @@ public/mal_mappings.json .is-dev -tmp \ No newline at end of file +tmp +tools/vendor/ +tools/phinx/vendor/ +/.php-cs-fixer.php +/.php-cs-fixer.cache \ No newline at end of file diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php new file mode 100644 index 00000000..5d9f3554 --- /dev/null +++ b/.php-cs-fixer.dist.php @@ -0,0 +1,534 @@ +in([ + __DIR__ . '/src', + __DIR__ . '/tests', + __DIR__ . '/tools', + ]) + ->exclude([ + 'vendor', + ]); + +return (new Config()) + ->setRiskyAllowed(TRUE) + ->setFinder($finder) + ->setIndent(' ') + ->setRules([ + 'align_multiline_comment' => false, + 'array_indentation' => true, + 'array_push' => true, + 'array_syntax' => ['syntax' => 'short'], + 'assign_null_coalescing_to_coalesce_equal' => true, + 'backtick_to_shell_exec' => true, + 'binary_operator_spaces' => [ + 'default' => 'single_space', + 'operators' => [ + '=' => NULL, + '&' => NULL, + ] + ], + 'blank_line_after_namespace' => true, + 'blank_line_after_opening_tag' => false, + 'blank_line_before_statement' => [ + 'statements' => [ + // 'case', + 'continue', + 'declare', + 'default', + 'do', + 'exit', + 'for', + 'foreach', + 'goto', + 'return', + 'switch', + 'throw', + 'try', + 'while', + 'yield', + 'yield_from', + ], + ], +// 'braces' => [ +// 'allow_single_line_anonymous_class_with_empty_body' => true, +// 'allow_single_line_closure' => true, +// 'position_after_anonymous_constructs' => 'same', +// 'position_after_control_structures' => 'next', +// 'position_after_functions_and_oop_constructs' => 'next', +// ], + 'cast_spaces' => ['space' => 'single'], + 'class_attributes_separation' => [ + 'elements' => [ + 'const' => 'none', + 'property' => 'none', + 'method' => 'one', + 'trait_import' => 'none', + ], + ], + 'class_definition' => [ + 'multi_line_extends_each_single_line' => true, + 'single_item_single_line' => true, + 'single_line' => true, + 'space_before_parenthesis' => true, + ], + 'class_reference_name_casing' => true, + 'clean_namespace' => true, + 'combine_consecutive_issets' => true, + 'combine_consecutive_unsets' => true, + 'combine_nested_dirname' => true, + 'comment_to_phpdoc' => [ + 'ignored_tags' => [ + 'todo', + 'codeCoverageIgnore', + 'codeCoverageIgnoreStart', + 'codeCoverageIgnoreEnd', + 'phpstan-ignore-line', + 'phpstan-ignore-next-line', + ], + ], + 'compact_nullable_typehint' => true, + 'concat_space' => ['spacing' => 'one'], + 'constant_case' => ['case' => 'upper'], + 'control_structure_braces' => true, + 'control_structure_continuation_position' => ['position' => 'next_line'], + 'curly_braces_position' => [ + 'allow_single_line_anonymous_functions' => true, + 'allow_single_line_empty_anonymous_classes' => true, + 'anonymous_functions_opening_brace' => 'same_line', + 'classes_opening_brace' => 'next_line_unless_newline_at_signature_end', + 'control_structures_opening_brace' => 'next_line_unless_newline_at_signature_end', + 'functions_opening_brace' => 'next_line_unless_newline_at_signature_end', + ], + 'date_time_immutable' => false, + 'declare_equal_normalize' => ['space' => 'none'], + 'declare_parentheses' => true, + 'declare_strict_types' => true, + 'dir_constant' => true, + 'doctrine_annotation_array_assignment' => false, + 'doctrine_annotation_braces' => false, + 'doctrine_annotation_indentation' => false, + 'doctrine_annotation_spaces' => false, + 'echo_tag_syntax' => [ + 'format' => 'short', + 'long_function' => 'echo', + 'shorten_simple_statements_only' => false, + ], + 'elseif' => false, + 'empty_loop_body' => ['style' => 'braces'], + 'empty_loop_condition' => ['style' => 'while'], + 'encoding' => true, + 'error_suppression' => [ + 'mute_deprecation_error' => true, + 'noise_remaining_usages' => false, + 'noise_remaining_usages_exclude' => [], + ], + 'escape_implicit_backslashes' => [ + 'double_quoted' => false, + 'heredoc_syntax' => false, + 'single_quoted' => false, + ], + 'explicit_indirect_variable' => false, + 'explicit_string_variable' => false, + 'final_class' => false, + 'final_internal_class' => [ + 'annotation_exclude' => ['@no-final'], + 'annotation_include' => ['@internal'], + 'consider_absent_docblock_as_internal_class' => false, + ], + 'final_public_method_for_abstract_class' => false, + 'fopen_flag_order' => true, + 'fopen_flags' => ['b_mode' => true], + 'full_opening_tag' => true, + 'fully_qualified_strict_types' => true, + 'function_declaration' => ['closure_function_spacing' => 'one'], + 'function_to_constant' => [ + 'functions' => [ + 'get_called_class', + 'get_class', + 'get_class_this', + 'php_sapi_name', + 'phpversion', + 'pi', + ], + ], + 'function_typehint_space' => true, + 'general_phpdoc_annotation_remove' => false, + 'general_phpdoc_tag_rename' => false, + 'get_class_to_class_keyword' => false, + 'global_namespace_import' => [ + 'import_constants' => true, + 'import_functions' => true, + 'import_classes' => true, + ], + 'group_import' => true, + 'header_comment' => false, // false by default + // 'heredoc_indentation' => ['indentation' => 'start_plus_one'], + 'heredoc_to_nowdoc' => true, + 'implode_call' => true, + 'include' => true, + 'increment_style' => ['style' => 'post'], + 'indentation_type' => true, + 'integer_literal_case' => true, + 'is_null' => true, + 'lambda_not_used_import' => true, + 'line_ending' => true, + 'linebreak_after_opening_tag' => false, + 'list_syntax' => ['syntax' => 'short'], + 'logical_operators' => true, + 'lowercase_cast' => true, + 'lowercase_keywords' => true, + 'lowercase_static_reference' => true, + 'magic_constant_casing' => true, + 'magic_method_casing' => true, + 'mb_str_functions' => false, + 'method_argument_space' => [ + 'after_heredoc' => false, + 'keep_multiple_spaces_after_comma' => false, + 'on_multiline' => 'ensure_fully_multiline', + ], + 'method_chaining_indentation' => true, + 'modernize_strpos' => false, // requires 8.0+ + 'modernize_types_casting' => true, + 'multiline_comment_opening_closing' => true, + 'multiline_whitespace_before_semicolons' => ['strategy' => 'no_multi_line'], + 'native_constant_invocation' => false, + 'native_function_casing' => true, + 'native_function_invocation' => false, + 'native_function_type_declaration_casing' => true, + 'new_with_braces' => true, + 'no_alias_functions' => ['sets' => ['@all']], + 'no_alias_language_construct_call' => true, + 'no_alternative_syntax' => ['fix_non_monolithic_code' => false], + 'no_binary_string' => true, + 'no_blank_lines_after_class_opening' => true, + 'no_blank_lines_after_phpdoc' => true, + 'no_blank_lines_before_namespace' => false, // conflicts with `single_blank_line_before_namespace` + 'no_break_comment' => ['comment_text' => 'no break'], + 'no_closing_tag' => true, + 'no_empty_comment' => true, + 'no_empty_phpdoc' => true, + 'no_empty_statement' => true, + 'no_extra_blank_lines' => ['tokens' => ['extra']], + 'no_homoglyph_names' => true, + 'no_leading_import_slash' => true, + 'no_leading_namespace_whitespace' => true, + 'no_mixed_echo_print' => ['use' => 'echo'], + 'no_multiline_whitespace_around_double_arrow' => true, + 'no_null_property_initialization' => true, + 'no_short_bool_cast' => true, + 'no_singleline_whitespace_before_semicolons' => true, + 'no_space_around_double_colon' => true, + 'no_spaces_after_function_name' => true, + 'no_spaces_around_offset' => ['positions' => ['inside', 'outside']], + 'no_spaces_inside_parenthesis' => true, + 'no_superfluous_elseif' => true, + 'no_superfluous_phpdoc_tags' => [ + 'allow_mixed' => true, + 'allow_unused_params' => true, + 'remove_inheritdoc' => false, + ], + 'no_trailing_comma_in_singleline' => true, + 'no_trailing_whitespace' => true, + 'no_trailing_whitespace_in_comment' => true, + 'no_trailing_whitespace_in_string' => true, + 'no_unneeded_control_parentheses' => [ + 'statements' => [ + 'break', + 'clone', + 'continue', + 'echo_print', + 'return', + 'switch_case', + 'yield', + ], + ], + 'no_unneeded_curly_braces' => ['namespaces' => true], + 'no_unneeded_final_method' => ['private_methods' => true], + 'no_unneeded_import_alias' => true, + 'no_unreachable_default_argument_value' => true, + 'no_unset_cast' => true, + 'no_unset_on_property' => false, + 'no_unused_imports' => true, + 'no_useless_else' => true, + 'no_useless_return' => true, + 'no_useless_sprintf' => true, + 'no_whitespace_before_comma_in_array' => ['after_heredoc' => true], + 'no_whitespace_in_blank_line' => true, + 'non_printable_character' => ['use_escape_sequences_in_strings' => true], + 'normalize_index_brace' => true, + 'not_operator_with_space' => true, + 'not_operator_with_successor_space' => true, + 'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => true], + 'object_operator_without_whitespace' => true, + 'operator_linebreak' => ['only_booleans' => true, 'position' => 'beginning'], + 'ordered_class_elements' => [ + 'order' => [ + 'use_trait', + 'case', + 'constant_public', + 'constant_protected', + 'constant_private', + 'property_public', + 'property_protected', + 'property_private', + 'construct', + 'destruct', + 'magic', + ], + 'sort_algorithm' => 'none', + ], + 'ordered_imports' => [ + 'sort_algorithm' => 'alpha', + 'imports_order' => ['class', 'function', 'const'], + ], + 'ordered_interfaces' => false, + 'ordered_traits' => false, + 'php_unit_construct' => [ + 'assertions' => [ + 'assertSame', + 'assertEquals', + 'assertNotEquals', + 'assertNotSame', + ], + ], + 'php_unit_dedicate_assert' => ['target' => 'newest'], + 'php_unit_dedicate_assert_internal_type' => ['target' => 'newest'], + 'php_unit_expectation' => ['target' => 'newest'], + 'php_unit_fqcn_annotation' => true, + 'php_unit_internal_class' => ['types' => ['final']], + 'php_unit_method_casing' => ['case' => 'camel_case'], + 'php_unit_mock' => ['target' => 'newest'], + 'php_unit_mock_short_will_return' => true, + 'php_unit_namespaced' => ['target' => 'newest'], + 'php_unit_no_expectation_annotation' => [ + 'target' => 'newest', + 'use_class_const' => true, + ], + 'php_unit_set_up_tear_down_visibility' => true, + 'php_unit_size_class' => false, +// 'php_unit_strict' => [ +// 'assertions' => [ +// 'assertAttributeEquals', +// 'assertAttributeNotEquals', +// 'assertEquals', +// 'assertNotEquals', +// ], +// ], + 'php_unit_test_annotation' => ['style' => 'prefix'], + 'php_unit_test_case_static_method_calls' => [ + 'call_type' => 'this', + 'methods' => [], + ], + 'php_unit_test_class_requires_covers' => false, + 'phpdoc_add_missing_param_annotation' => ['only_untyped' => true], + 'phpdoc_align' => [ + 'align' => 'left' + ], + 'phpdoc_annotation_without_dot' => false, + 'phpdoc_indent' => true, + 'phpdoc_inline_tag_normalizer' => [ + 'tags' => [ + 'example', + 'id', + 'internal', + 'inheritdoc', + 'inheritdocs', + 'link', + 'source', + 'toc', + 'tutorial', + ], + ], + 'phpdoc_line_span' => [ + 'const' => 'multi', + 'method' => 'multi', + 'property' => 'multi', + ], + 'phpdoc_no_access' => true, + 'phpdoc_no_empty_return' => false, + 'phpdoc_no_package' => false, + 'phpdoc_no_useless_inheritdoc' => true, + 'phpdoc_order' => true, + 'phpdoc_order_by_value' => [ + 'annotations' => [ + 'author', + 'covers', + 'coversNothing', + 'dataProvider', + 'depends', + 'group', + 'internal', + 'method', + 'property', + 'property-read', + 'property-write', + 'requires', + 'throws', + 'uses', + ], + ], + 'phpdoc_return_self_reference' => [ + 'replacements' => [ + 'this' => '$this', + '@this' => '$this', + '$self' => 'self', + '@self' => 'self', + '$static' => 'static', + '@static' => 'static', + ], + ], + 'phpdoc_scalar' => [ + 'types' => [ + 'boolean', + 'callback', + 'double', + 'integer', + 'real', + 'str', + ], + ], + 'phpdoc_separation' => false, + 'phpdoc_single_line_var_spacing' => true, + 'phpdoc_summary' => false, + 'phpdoc_tag_casing' => ['tags' => ['inheritDoc']], + 'phpdoc_tag_type' => ['tags' => ['inheritDoc' => 'inline']], + 'phpdoc_to_comment' => false, + 'phpdoc_to_param_type' => false, + 'phpdoc_to_property_type' => false, + 'phpdoc_to_return_type' => false, + 'phpdoc_trim' => true, + 'phpdoc_trim_consecutive_blank_line_separation' => true, + 'phpdoc_types' => ['groups' => ['simple', 'alias', 'meta']], + 'phpdoc_types_order' => [ + 'null_adjustment' => 'always_last', + 'sort_algorithm' => 'alpha', + ], + 'phpdoc_var_annotation_correct_order' => true, + 'phpdoc_var_without_name' => true, + 'pow_to_exponentiation' => true, + 'protected_to_private' => true, + 'psr_autoloading' => ['dir' => null], + 'random_api_migration' => [ + 'replacements' => [ + 'getrandmax' => 'mt_getrandmax', + 'rand' => 'mt_rand', + 'srand' => 'mt_srand', + ], + ], + 'regular_callable_call' => true, + 'return_assignment' => true, + 'return_type_declaration' => ['space_before' => 'none'], + 'self_accessor' => false, + 'self_static_accessor' => true, + 'semicolon_after_instruction' => false, + 'set_type_to_cast' => true, + 'short_scalar_cast' => true, + 'simple_to_complex_string_variable' => true, + 'simplified_if_return' => true, + 'simplified_null_return' => false, + 'single_blank_line_at_eof' => true, + 'single_blank_line_before_namespace' => true, + 'single_class_element_per_statement' => ['elements' => ['const', 'property']], + 'single_import_per_statement' => false, + 'single_line_after_imports' => true, + 'single_line_comment_style' => ['comment_types' => ['asterisk', 'hash']], + 'single_line_throw' => false, + 'single_quote' => ['strings_containing_single_quote_chars' => false], + 'single_space_around_construct' => [ + 'constructs_followed_by_a_single_space' => [ + 'abstract', + 'as', + 'attribute', + 'break', + 'case', + 'catch', + 'class', + 'clone', + 'comment', + 'const', + 'const_import', + 'continue', + 'do', + 'echo', + 'else', + 'elseif', + 'extends', + 'final', + 'finally', + 'for', + 'foreach', + 'function', + 'function_import', + 'global', + 'goto', + 'if', + 'implements', + 'include', + 'include_once', + 'instanceof', + 'insteadof', + 'interface', + 'match', + 'named_argument', + 'new', + 'open_tag_with_echo', + 'php_doc', + 'php_open', + 'print', + 'private', + 'protected', + 'public', + 'require', + 'require_once', + 'return', + 'static', + 'throw', + 'trait', + 'try', + 'use', + 'use_lambda', + 'use_trait', + 'var', + 'while', + 'yield', + 'yield_from', + ], + ], + 'single_trait_insert_per_statement' => true, + 'space_after_semicolon' => ['remove_in_empty_for_expressions' => true], + 'standardize_increment' => true, + 'standardize_not_equals' => true, + 'statement_indentation' => true, + 'static_lambda' => true, + 'strict_comparison' => true, + 'strict_param' => true, + 'string_length_to_empty' => true, + 'string_line_ending' => true, + 'switch_case_semicolon_to_colon' => true, + 'switch_case_space' => true, + 'switch_continue_to_break' => true, + 'ternary_operator_spaces' => true, + 'ternary_to_elvis_operator' => true, + 'ternary_to_null_coalescing' => true, + 'trailing_comma_in_multiline' => [ + 'after_heredoc' => true, + 'elements' => ['arrays'], + ], + 'trim_array_spaces' => true, + 'types_spaces' => ['space' => 'none'], + 'unary_operator_spaces' => false, + 'use_arrow_functions' => true, + 'visibility_required' => ['elements' => ['const', 'method', 'property']], + 'void_return' => false, // changes method signature + 'whitespace_after_comma_in_array' => true, + 'yoda_style' => [ + 'equal' => false, + 'identical' => null, + 'less_and_greater' => false, + 'always_move_variable' => false, + ], + ]); diff --git a/.travis.yml b/.travis.yml index 9b4749a9..b4fcd505 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,8 @@ install: - composer install --ignore-platform-reqs php: + - 8.0 + - 8.1 - nightly script: diff --git a/CHANGELOG.md b/CHANGELOG.md index 21bb4913..3e5d0e01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,12 @@ # Changelog +## Version 5.3 +* Update PHP requirement to 8.2 + ## Version 5.2 -* Updated PHP requirement to 8 +* Updated PHP requirement to 8.1 +* Updated to support PHP 8.2 +* Improve Anilist <-> Kitsu mappings to be more reliable ## Version 5.1 * Added session check, so when coming back to a page, if the session is expired, the page will refresh. diff --git a/Jenkinsfile b/Jenkinsfile index d873dd84..01020ede 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,10 +10,23 @@ pipeline { sh 'php composer.phar install --ignore-platform-reqs' } } - stage('PHP 8') { + stage('PHP 8.1') { agent { docker { - image 'php:8-cli-alpine' + image 'php:8.1-cli-alpine' + args '-u root --privileged' + } + } + steps { + sh 'apk add --no-cache git icu-dev' + sh 'docker-php-ext-configure intl && docker-php-ext-install intl' + sh 'php ./vendor/bin/phpunit --colors=never' + } + } + stage('PHP 8.2') { + agent { + docker { + image 'php:8.2-cli-alpine' args '-u root --privileged' } } @@ -36,16 +49,6 @@ pipeline { sh 'php ./vendor/bin/phpunit --colors=never' } } - stage('Code Cleanliness') { - agent any - steps { - sh "php ./vendor/bin/phpstan analyse -c phpstan.neon -n --no-progress --no-ansi --error-format=checkstyle | awk '{\$1=\$1;print}' > build/logs/phpstan.log" - recordIssues( - failOnError: false, - tools: [phpStan(reportEncoding: 'UTF-8', pattern: 'build/logs/phpstan.log')] - ) - } - } stage('Coverage') { agent any steps { diff --git a/README.md b/README.md index 062c4a97..ef249f9f 100644 --- a/README.md +++ b/README.md @@ -31,12 +31,18 @@ Update your anime/manga list on Kitsu.io and Anilist ### Requirements -* PHP 8 -* PDO SQLite or PDO PostgreSQL (For collection tab) -* GD extension for caching images +* PHP 8.2 + * ext-dom (For editing the DOM) + * ext-gd (For caching images) + * ext-intl (For time localization) + * ext-json + * ext-mbstring + * ext-pdo ### Highly Recommended + * Redis or Memcached for caching +* PDO SQLite or PDO PostgreSQL (For collection tab) ### Installation diff --git a/app/appConf/base_config.php b/app/appConf/base_config.php index f7adccca..55d5875f 100644 --- a/app/appConf/base_config.php +++ b/app/appConf/base_config.php @@ -57,4 +57,4 @@ return array_merge($tomlConfig, [ // Included config files 'routes' => require 'routes.php', -]); \ No newline at end of file +]); diff --git a/app/appConf/routes.php b/app/appConf/routes.php index f599c439..53fc576b 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 + SLUG_PATTERN, + NUM_PATTERN, }; // ------------------------------------------------------------------------- @@ -27,7 +27,7 @@ use const Aviat\AnimeClient\{ // // Maps paths to controllers and methods // ------------------------------------------------------------------------- -$routes = [ +$base_routes = [ // --------------------------------------------------------------------- // AJAX Routes // --------------------------------------------------------------------- @@ -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', @@ -291,7 +291,7 @@ $routes = [ 'action' => 'edit', 'tokens' => [ 'id' => SLUG_PATTERN, - 'status' => '([a-zA-Z\-_]|%20)+', + 'status' => SLUG_PATTERN, ], ], 'list' => [ @@ -314,15 +314,10 @@ $defaultMap = [ 'verb' => 'get', ]; -foreach ($routes as &$route) +$routes = []; +foreach ($base_routes as $name => $route) { - foreach($defaultMap as $key => $val) - { - if ( ! array_key_exists($key, $route)) - { - $route[$key] = $val; - } - } + $routes[$name] = array_merge($defaultMap, $route); } return $routes; diff --git a/app/bootstrap.php b/app/bootstrap.php index d9c88629..3ceb03e4 100644 --- a/app/bootstrap.php +++ b/app/bootstrap.php @@ -4,11 +4,9 @@ * * An API client for Kitsu to manage anime and manga watch lists * - * PHP version 8 + * PHP version 8.1 * - * @package HummingbirdAnimeClient - * @author Timothy J. Warren - * @copyright 2015 - 2021 Timothy J. Warren + * @copyright 2015 - 2023 Timothy J. Warren * @license http://www.opensource.org/licenses/mit-license.html MIT License * @version 5.2 * @link https://git.timshomepage.net/timw4mail/HummingBirdAnimeClient @@ -20,12 +18,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 +34,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 +70,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 +91,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 +104,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 +117,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; }); } @@ -140,11 +139,8 @@ return static function (array $configArray = []): Container { // Create session Object $container->set('session', static fn () => (new SessionFactory())->newInstance($_COOKIE)); - // Miscellaneous helper methods - $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 +154,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')); @@ -174,26 +171,29 @@ return static function (array $configArray = []): Container { return $model; }); - $container->set('anime-model', static fn ($container) => new Model\Anime($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; }); + $container->setSimple('anime-model', Model\Anime::class); + $container->setSimple('manga-model', Model\Manga::class); + $container->setSimple('anime-collection-model', Model\AnimeCollection::class); + // Miscellaneous Classes - $container->set('auth', static fn ($container) => new Kitsu\Auth($container)); - $container->set('url-generator', static fn ($container) => new UrlGenerator($container)); + $container->setSimple('util', Util::class); + $container->setSimple('auth', Kitsu\Auth::class); + $container->setSimple('url-generator', UrlGenerator::class); + $container->setSimple('render-helper', RenderHelper::class); // ------------------------------------------------------------------------- // Dispatcher // ------------------------------------------------------------------------- - $container->set('dispatcher', static fn ($container) => new Dispatcher($container)); + $container->setSimple('dispatcher', Dispatcher::class); return $container; }; -// End of bootstrap.php \ No newline at end of file +// End of bootstrap.php diff --git a/app/config/anilist.toml.example b/app/config/anilist.toml.example new file mode 100644 index 00000000..9cf0e997 --- /dev/null +++ b/app/config/anilist.toml.example @@ -0,0 +1,6 @@ +################################################################################ +# Anilist API # +################################################################################ +client_id = "your_client_id" +client_secret = "your_client_secret" +username = "user123" \ No newline at end of file diff --git a/app/config/config.toml.example b/app/config/config.toml.example index b185050b..4d2d086d 100644 --- a/app/config/config.toml.example +++ b/app/config/config.toml.example @@ -14,6 +14,9 @@ show_anime_collection = true # do you wish to show the manga collection? show_manga_collection = false +# what theme would you like to use? light, dark, or auto +theme = "auto" + ################################################################################ # Default views and paths ################################################################################ diff --git a/app/logs/.gitkeep b/app/logs/.gitkeep old mode 100644 new mode 100755 diff --git a/app/templates/anime-cover.php b/app/templates/anime-cover.php index 5715d0d2..900faac3 100644 --- a/app/templates/anime-cover.php +++ b/app/templates/anime-cover.php @@ -1,15 +1,16 @@
- isAuthenticated()): ?> + isAuthenticated()): ?> - picture("images/anime/{$item['anime']['id']}.webp") ?> + h->img($item['anime']['cover_image'], ['width' => 220, 'loading' => 'lazy']) ?>
- +
@@ -49,7 +50,7 @@ - img("/public/images/{$link['meta']['image']}", [ + h->img("/public/images/{$link['meta']['image']}", [ 'class' => 'streaming-logo', 'width' => 20, 'height' => 20, @@ -57,7 +58,7 @@ ]); ?> - img("/public/images/{$link['meta']['image']}", [ + h->img("/public/images/{$link['meta']['image']}", [ 'class' => 'streaming-logo', 'width' => 20, 'height' => 20, @@ -69,11 +70,11 @@
- isAuthenticated()): ?> + isAuthenticated()): ?>
-
html($item['anime']['show_type']) ?>
-
html($item['airing']['status']) ?>
-
html($item['anime']['age_rating']) ?>
+
escape->html($item['anime']['show_type']) ?>
+
escape->html($item['airing']['status']) ?>
+
escape->html($item['anime']['age_rating']) ?>
\ No newline at end of file diff --git a/app/templates/manga-cover.php b/app/templates/manga-cover.php index feb646bc..f1372c2e 100644 --- a/app/templates/manga-cover.php +++ b/app/templates/manga-cover.php @@ -1,26 +1,25 @@ \ No newline at end of file diff --git a/app/views/anime/add.php b/app/views/anime/add.php index d378f00a..7d52f8ae 100644 --- a/app/views/anime/add.php +++ b/app/views/anime/add.php @@ -1,4 +1,4 @@ -isAuthenticated()): ?> +isAuthenticated()): ?>

Add Anime to your List

diff --git a/app/views/anime/cover.php b/app/views/anime/cover.php index 96cdf359..ca1e049a 100644 --- a/app/views/anime/cover.php +++ b/app/views/anime/cover.php @@ -1,6 +1,6 @@
-isAuthenticated()): ?> -Add Item +isAuthenticated()): ?> +Add Item

There's nothing here!

@@ -11,16 +11,16 @@ $items): ?>
-

html($name) ?>

+

escape->html($name) ?>

There's nothing here!

-

html($name) ?>

+

escape->html($name) ?>

- isAuthenticated()) continue; ?> - animeCover($item) ?> + isAuthenticated()) continue; ?> + component->animeCover($item) ?>
diff --git a/app/views/anime/details.php b/app/views/anime/details.php index f7d4b313..754d78b7 100644 --- a/app/views/anime/details.php +++ b/app/views/anime/details.php @@ -1,13 +1,12 @@
-
+