Update frontend minification config and dependencies

Reviewed-on: #43

.gitignore

@@ -146,4 +146,12 @@ public/images/manga/**
 public/images/characters/**
 public/images/people/**
 public/mal_mappings.json
-.phpunit.result.cache
+.phpunit.result.cache
+
+.is-dev
+
+tmp
+tools/vendor/
+tools/phinx/vendor/
+/.php-cs-fixer.php
+/.php-cs-fixer.cache

.php-cs-fixer.dist.php

@@ -0,0 +1,534 @@
+<?php declare(strict_types=1);
+
+use Nexus\CsConfig\Factory;
+use PhpCsFixer\{Config, Finder};
+
+$finder = Finder::create()
+	->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,
+		],
+	]);

.travis.yml

@@ -4,21 +4,14 @@ install:
   - composer install --ignore-platform-reqs
 
 php:
-  - 7.3
-  - 7.4
+  - 8.0
+  - 8.1
   - nightly
 
 script:
   - mkdir -p build/logs
   - php vendor/bin/phpunit -c build
 
-#after_script:
-#    - CODECLIMATE_REPO_TOKEN=2cbddcebcb9256b3402867282e119dbe61de0b31039325356af3c7d72ed6d058 vendor/bin/test-reporter
-
-matrix:
-  allow_failures:
-    - php: nightly
-
-#addons:
-#    code_climate:
-#        repo_token: 2cbddcebcb9256b3402867282e119dbe61de0b31039325356af3c7d72ed6d058
+#matrix:
+#  allow_failures:
+#    - php: nightly

CHANGELOG.md

@@ -1,8 +1,28 @@
 # Changelog
 
+## Version 5.3
+* Update PHP requirement to 8.2
+
+## Version 5.2
+* 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.
+* Updated logging config so that much fewer, much smaller files are generated.
+* Updated Kitsu integration to use GraphQL API, reducing a lot of internal complexity.
+
+## Version 5
+* Updated PHP requirement to 7.4
+* Added anime watching history view
+* Added manga reading history view
+* Updated anime collection to have more media types
+
 ## Version 4.2
 * Updated dependencies
 * Updated PHP requirement to 7.3
+* Added option to automatically set dark mode based on the OS  setting
 
 ## Version 4.1
 * Added optional dark theme

Jenkinsfile

@@ -10,39 +10,42 @@ pipeline {
 				sh 'php composer.phar install --ignore-platform-reqs'
 			}
  		}
-		stage('PHP 7.3') {
+		stage('PHP 8.1') {
 			agent {
 				docker {
-					image 'php:7.3-alpine'
+					image 'php:8.1-cli-alpine'
 					args '-u root --privileged'
 				}
 			}
 			steps {
-				sh 'apk add --no-cache git'
+				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 7.4') {
+		stage('PHP 8.2') {
 			agent {
 				docker {
-					image 'php:7.4-alpine'
+					image 'php:8.2-cli-alpine'
 					args '-u root --privileged'
 				}
 			}
 			steps {
-				sh 'apk add --no-cache git'
+				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('Latest PHP') {
 			agent {
 				docker {
-					image 'php:alpine'
+					image 'php:cli-alpine'
 					args '-u root --privileged'
 				}
 			}
 			steps {
-				sh 'apk add --no-cache git'
+				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'
 			}
 		}
@@ -55,6 +58,7 @@ pipeline {
 					cloverReportDir: '',
 					cloverReportFileName: 'build/logs/clover.xml',
 				])
+				junit 'build/logs/junit.xml'
 			}
 		}
  	}

README.md

@@ -1,9 +1,9 @@
 # Hummingbird Anime Client
 
-Update your anime/manga list on Kitsu.io and MyAnimeList.net
+Update your anime/manga list on Kitsu.io and Anilist
 
-[![Build Status](https://travis-ci.org/timw4mail/HummingBirdAnimeClient.svg?branch=master)](https://travis-ci.org/timw4mail/HummingBirdAnimeClient)
-[![Build Status](https://jenkins.timshomepage.net/buildStatus/icon?job=timw4mail/HummingBirdAnimeClient/develop)](https://jenkins.timshomepage.net/job/timw4mail/HummingBirdAnimeClient/develop)
+[![Build Status](https://travis-ci.com/timw4mail/HummingBirdAnimeClient.svg?branch=master)](https://travis-ci.com/github/timw4mail/HummingBirdAnimeClient)
+[![Build Status](https://jenkins.timshome.page/buildStatus/icon?job=timw4mail/HummingBirdAnimeClient/develop)](https://jenkins.timshome.page/job/timw4mail/job/HummingBirdAnimeClient/job/develop/)
 
 [[Hosted Example](https://list.timshomepage.net)]
 
@@ -31,12 +31,18 @@ Update your anime/manga list on Kitsu.io and MyAnimeList.net
 
 ### Requirements
 
-* PHP 7.3+
-* 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
 

RoboFile.php

@@ -1,316 +0,0 @@
-<?php declare(strict_types=1);
-
-use Robo\Tasks;
-
-if ( ! function_exists('glob_recursive'))
-{
-	// Does not support flag GLOB_BRACE
-	function glob_recursive($pattern, $flags = 0)
-	{
-		$files = glob($pattern, $flags);
-
-		foreach (glob(dirname($pattern).'/*', GLOB_ONLYDIR|GLOB_NOSORT) as $dir)
-		{
-			$files = array_merge($files, glob_recursive($dir.'/'.basename($pattern), $flags));
-		}
-
-		return $files;
-	}
-}
-
-/**
- * This is project's console commands configuration for Robo task runner.
- *
- * @see http://robo.li/
- */
-class RoboFile extends Tasks {
-
-	/**
-	 * Directories used by analysis tools
-	 *
-	 * @var array
-	 */
-	protected $taskDirs = [
-		'build/logs',
-		'build/pdepend',
-		'build/phpdox',
-	];
-
-	/**
-	 * Directories to remove with the clean task
-	 *
-	 * @var array
-	 */
-	protected $cleanDirs = [
-		'coverage',
-		'docs',
-		'phpdoc',
-		'build/logs',
-		'build/phpdox',
-		'build/pdepend'
-	];
-
-
-	/**
-	 * Do static analysis tasks
-	 */
-	public function analyze(): void
-	{
-		$this->prepare();
-		$this->lint();
-		$this->phploc(TRUE);
-		$this->phpcs(TRUE);
-		$this->phpmd(TRUE);
-		$this->dependencyReport();
-		$this->phpcpdReport();
-	}
-
-	/**
-	 * Run all tests, generate coverage, generate docs, generate code statistics
-	 */
-	public function build(): void
-	{
-		$this->analyze();
-		$this->coverage();
-		$this->docs();
-	}
-
-	/**
-	 * Cleanup temporary files
-	 */
-	public function clean(): void
-	{
-		$cleanFiles = [
-			'build/humbug.json',
-			'build/humbug-log.txt',
-		];
-		array_map(static function ($file) {
-			@unlink($file);
-		}, $cleanFiles);
-
-		// So the task doesn't complain,
-		// make any 'missing' dirs to cleanup
-		array_map(static function ($dir) {
-			if ( ! is_dir($dir))
-			{
-				`mkdir -p {$dir}`;
-			}
-		}, $this->cleanDirs);
-
-		$this->_cleanDir($this->cleanDirs);
-		$this->_deleteDir($this->cleanDirs);
-	}
-
-	/**
-	 * Run unit tests and generate coverage reports
-	 */
-	public function coverage(): void
-	{
-		$this->_run(['phpdbg -qrr -- vendor/bin/phpunit -c build']);
-	}
-
-	/**
-	 * Generate documentation with phpdox
-	 */
-	public function docs(): void
-	{
-		$cmd_parts = [
-			'vendor/bin/phpdox',
-		];
-		$this->_run($cmd_parts, ' && ');
-	}
-
-	/**
-	 * Verify that source files are valid
-	 */
-	public function lint(): void
-	{
-		$files = $this->getAllSourceFiles();
-
-		$chunks = array_chunk($files, (int)shell_exec('getconf _NPROCESSORS_ONLN'));
-
-		foreach($chunks as $chunk)
-		{
-			$this->parallelLint($chunk);
-		}
-	}
-
-	/**
-	 * Run the phpcs tool
-	 *
-	 * @param bool $report - if true, generates reports instead of direct output
-	 */
-	public function phpcs($report = FALSE): void
-	{
-		$report_cmd_parts = [
-			'vendor/bin/phpcs',
-			'--standard=./build/phpcs.xml',
-			'--report-checkstyle=./build/logs/phpcs.xml',
-		];
-
-		$normal_cmd_parts = [
-			'vendor/bin/phpcs',
-			'--standard=./build/phpcs.xml',
-		];
-
-		$cmd_parts = ($report) ? $report_cmd_parts : $normal_cmd_parts;
-
-		$this->_run($cmd_parts);
-	}
-
-	public function phpmd($report = FALSE): void
-	{
-		$report_cmd_parts = [
-			'vendor/bin/phpmd',
-			'./src',
-			'xml',
-			'cleancode,codesize,controversial,design,naming,unusedcode',
-			'--exclude ParallelAPIRequest',
-			'--reportfile ./build/logs/phpmd.xml'
-		];
-
-		$normal_cmd_parts = [
-			'vendor/bin/phpmd',
-			'./src',
-			'ansi',
-			'cleancode,codesize,controversial,design,naming,unusedcode',
-			'--exclude ParallelAPIRequest'
-		];
-
-		$cmd_parts = ($report) ? $report_cmd_parts : $normal_cmd_parts;
-
-		$this->_run($cmd_parts);
-	}
-
-	/**
-	 * Run the phploc tool
-	 *
-	 * @param bool $report - if true, generates reports instead of direct output
-	 */
-	public function phploc($report = FALSE): void
-	{
-		// Command for generating reports
-		$report_cmd_parts = [
-			'vendor/bin/phploc',
-			'--count-tests',
-			'--log-csv=build/logs/phploc.csv',
-			'--log-xml=build/logs/phploc.xml',
-			'src',
-			'tests'
-		];
-
-		// Command for generating direct output
-		$normal_cmd_parts = [
-			'vendor/bin/phploc',
-			'--count-tests',
-			'src',
-			'tests'
-		];
-
-		$cmd_parts = ($report) ? $report_cmd_parts : $normal_cmd_parts;
-
-		$this->_run($cmd_parts);
-	}
-
-	/**
-	 * Create temporary directories
-	 */
-	public function prepare(): void
-	{
-		array_map([$this, '_mkdir'], $this->taskDirs);
-	}
-
-	/**
-	 * Lint php files and run unit tests
-	 */
-	public function test(): void
-	{
-		$this->lint();
-
-		$this->_run(['phpunit']);
-	}
-
-	/**
-	 * Create pdepend reports
-	 */
-	protected function dependencyReport(): void
-	{
-		$cmd_parts = [
-			'vendor/bin/pdepend',
-			'--jdepend-xml=build/logs/jdepend.xml',
-			'--jdepend-chart=build/pdepend/dependencies.svg',
-			'--overview-pyramid=build/pdepend/overview-pyramid.svg',
-			'src'
-		];
-		$this->_run($cmd_parts);
-	}
-
-	/**
-	 * Get the total list of source files, including tests
-	 *
-	 * @return array
-	 */
-	protected function getAllSourceFiles(): array
-	{
-		$files = array_merge(
-			glob_recursive('build/*.php'),
-			glob_recursive('src/*.php'),
-			glob_recursive('src/**/*.php'),
-			glob_recursive('tests/*.php'),
-			glob_recursive('tests/**/*.php'),
-			glob('*.php')
-		);
-
-		$files = array_filter($files, static function(string $value) {
-			return strpos($value, '__snapshots__') === FALSE;
-		});
-
-		sort($files);
-
-		return $files;
-	}
-
-	/**
-	 * Run php's linter in one parallel task for the passed chunk
-	 *
-	 * @param array $chunk
-	 */
-	protected function parallelLint(array $chunk): void
-	{
-		$task = $this->taskParallelExec()
-			->timeout(5)
-			->printed(FALSE);
-
-		foreach($chunk as $file)
-		{
-			$task = $task->process("php -l {$file}");
-		}
-
-		$task->run();
-	}
-
-	/**
-	 * Generate copy paste detector report
-	 */
-	protected function phpcpdReport(): void
-	{
-		$cmd_parts = [
-			'vendor/bin/phpcpd',
-			'--log-pmd build/logs/pmd-cpd.xml',
-			'src'
-		];
-		$this->_run($cmd_parts);
-	}
-
-	/**
-	 * Shortcut for joining an array of command arguments
-	 * and then running it
-	 *
-	 * @param array $cmd_parts - command arguments
-	 * @param string $join_on - what to join the command arguments with
-	 */
-	protected function _run(array $cmd_parts, $join_on = ' '): void
-	{
-		$this->taskExec(implode($join_on, $cmd_parts))->run();
-	}
-}

app/appConf/base_config.php

@@ -2,31 +2,32 @@
 /**
  * Hummingbird Anime List Client
  *
- * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ * An API client for Kitsu to manage anime and manga watch lists
  *
- * PHP version 7
+ * PHP version 8
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2017  Timothy J. Warren
+ * @copyright   2015 - 2021  Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     4.0
- * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ * @version     5.2
+ * @link        https://git.timshomepage.net/timw4mail/HummingBirdAnimeClient
  */
 
-use function Aviat\AnimeClient\loadToml;
+use function Aviat\AnimeClient\loadConfig;
 
 // ----------------------------------------------------------------------------
 // Lower level configuration
 //
 // You shouldn't generally need to change anything below this line
 // ----------------------------------------------------------------------------
-$APP_DIR = realpath(__DIR__ . '/../');
-$ROOT_DIR = realpath("{$APP_DIR}/../");
+$APP_DIR = dirname(__DIR__);
+$ROOT_DIR = dirname($APP_DIR);
 
-$tomlConfig = loadToml(__DIR__);
+$tomlConfig = loadConfig(__DIR__);
 
 return array_merge($tomlConfig, [
+	'root' => $ROOT_DIR,
 	'asset_dir' => "{$ROOT_DIR}/public",
 	'base_config_dir' => __DIR__,
 	'config_dir' => "{$APP_DIR}/config",
@@ -56,4 +57,4 @@ return array_merge($tomlConfig, [
 
 	// Included config files
 	'routes' => require 'routes.php',
-]);
+]);

app/appConf/menus.toml

@@ -1,19 +1,21 @@
 [anime_list]
-	route_prefix = "/anime"
+	route_prefix = ""
 	[anime_list.items]
-		watching = '/watching'
-		plan_to_watch = '/plan_to_watch'
-		on_hold = '/on_hold'
-		dropped = '/dropped'
-		completed = '/completed'
-		all = '/all'
+		watch_history = '/history/anime'
+		watching = '/anime/watching'
+		plan_to_watch = '/anime/plan_to_watch'
+		on_hold = '/anime/on_hold'
+		dropped = '/anime/dropped'
+		completed = '/anime/completed'
+		all = '/anime/all'
 
 [manga_list]
-	route_prefix = "/manga"
+	route_prefix = ""
 	[manga_list.items]
-		reading = '/reading'
-		plan_to_read = '/plan_to_read'
-		on_hold = '/on_hold'
-		dropped = '/dropped'
-		completed = '/completed'
-		all = '/all'
+		reading_history = '/history/manga'
+		reading = '/manga/reading'
+		plan_to_read = '/manga/plan_to_read'
+		on_hold = '/manga/on_hold'
+		dropped = '/manga/dropped'
+		completed = '/manga/completed'
+		all = '/manga/all'

app/appConf/routes.php

@@ -2,24 +2,24 @@
 /**
  * Hummingbird Anime List Client
  *
- * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ * An API client for Kitsu to manage anime and manga watch lists
  *
- * PHP version 7
+ * PHP version 8
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018  Timothy J. Warren
+ * @copyright   2015 - 2021  Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     4.0
+ * @version     5.2
  * @link        https://git.timshomepage.net/timw4mail/HummingBirdAnimeClient
  */
 
 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,18 @@ use const Aviat\AnimeClient\{
 //
 // Maps paths to controllers and methods
 // -------------------------------------------------------------------------
-$routes = [
+$base_routes = [
+	// ---------------------------------------------------------------------
+	// AJAX Routes
+	// ---------------------------------------------------------------------
+	'cache_purge' => [
+		'path' => '/cache_purge',
+		'action' => 'clearCache',
+	],
+	'heartbeat' => [
+		'path' => '/heartbeat',
+		'action' => 'heartbeat',
+	],
 	// ---------------------------------------------------------------------
 	// Anime List Routes
 	// ---------------------------------------------------------------------
@@ -40,6 +51,10 @@ $routes = [
 		'action' => 'add',
 		'verb' => 'post',
 	],
+	'anime.random' => [
+		'path' => '/anime/details/random',
+		'action' => 'random',
+	],
 	'anime.details' => [
 		'path' => '/anime/details/{id}',
 		'action' => 'details',
@@ -73,6 +88,10 @@ $routes = [
 		'action' => 'delete',
 		'verb' => 'post',
 	],
+	'manga.random' => [
+		'path' => '/manga/details/random',
+		'action' => 'random',
+	],
 	'manga.details' => [
 		'path' => '/manga/details/{id}',
 		'action' => 'details',
@@ -171,14 +190,14 @@ $routes = [
 	'character' => [
 		'path' => '/character/{slug}',
 		'tokens' => [
-			'slug' => SLUG_PATTERN
-		]
+			'slug' => SLUG_PATTERN,
+		],
 	],
 	'person' => [
-		'path' => '/people/{id}',
+		'path' => '/people/{slug}',
 		'tokens' => [
-			'id' => SLUG_PATTERN
-		]
+			'slug' => SLUG_PATTERN,
+		],
 	],
 	'default_user_info' => [
 		'path' => '/me',
@@ -190,8 +209,8 @@ $routes = [
 		'controller' => 'user',
 		'action' => 'about',
 		'tokens' => [
-			'username' => '.*?'
-		]
+			'username' => '.*?',
+		],
 	],
 	// ---------------------------------------------------------------------
 	// Default / Shared routes
@@ -212,12 +231,8 @@ $routes = [
 		'controller' => 'images',
 		'tokens' => [
 			'type' => SLUG_PATTERN,
-			'file' => '[a-z0-9\-]+\.[a-z]{3,4}'
-		]
-	],
-	'cache_purge' => [
-		'path' => '/cache_purge',
-		'action' => 'clearCache',
+			'file' => '[a-z0-9\-]+\.[a-z]{3,4}',
+		],
 	],
 	'settings' => [
 		'path' => '/settings',
@@ -240,6 +255,13 @@ $routes = [
 		'path' => '/logout',
 		'action' => 'logout',
 	],
+	'history' => [
+		'controller' => 'history',
+		'path' => '/history/{type}',
+		'tokens' => [
+			'type' => SLUG_PATTERN,
+		],
+	],
 	'increment' => [
 		'path' => '/{controller}/increment',
 		'action' => 'increment',
@@ -269,13 +291,13 @@ $routes = [
 		'action' => 'edit',
 		'tokens' => [
 			'id' => SLUG_PATTERN,
-			'status' => '([a-zA-Z\-_]|%20)+',
+			'status' => SLUG_PATTERN,
 		],
 	],
 	'list' => [
-		'path' => '/{controller}/{type}{/view}',
+		'path' => '/{controller}/{status}{/view}',
 		'tokens' => [
-			'type' => ALPHA_SLUG_PATTERN,
+			'status' => ALPHA_SLUG_PATTERN,
 			'view' => ALPHA_SLUG_PATTERN,
 		],
 	],
@@ -292,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;

app/bootstrap.php

@@ -4,13 +4,11 @@
  *
  * An API client for Kitsu to manage anime and manga watch lists
  *
- * PHP version 7.3
+ * PHP version 8.1
  *
- * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2020  Timothy J. Warren
+ * @copyright   2015 - 2023  Timothy J. Warren <tim@timshome.page>
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     4.2
+ * @version     5.2
  * @link        https://git.timshomepage.net/timw4mail/HummingBirdAnimeClient
  */
 
@@ -19,114 +17,131 @@ namespace Aviat\AnimeClient;
 use Aura\Html\HelperLocatorFactory;
 use Aura\Router\RouterContainer;
 use Aura\Session\SessionFactory;
-use Aviat\AnimeClient\API\{
-	Anilist,
-	Kitsu,
-	Kitsu\KitsuRequestBuilder
-};
-use Aviat\AnimeClient\Model;
-use Aviat\Banker\Pool;
+use Aviat\AnimeClient\API\{Anilist, Kitsu};
+use Aviat\AnimeClient\{Component, Model};
+use Aviat\Banker\Teller;
 use Aviat\Ion\Config;
-use Aviat\Ion\Di\Container;
+use Aviat\Ion\Di\{Container, ContainerInterface};
+use Laminas\Diactoros\ServerRequestFactory;
+use Monolog\Formatter\JsonFormatter;
 use Monolog\Handler\RotatingFileHandler;
 use Monolog\Logger;
-use Zend\Diactoros\{Response, ServerRequestFactory};
+use Psr\SimpleCache\CacheInterface;
+
+use function Aviat\Ion\_dir;
+
+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'));
+}
 
 // -----------------------------------------------------------------------------
 // Setup DI container
 // -----------------------------------------------------------------------------
-return static function ($configArray = []) {
+return static function (array $configArray = []): Container {
 	$container = new Container();
 
 	// -------------------------------------------------------------------------
 	// Logging
 	// -------------------------------------------------------------------------
+	$LOG_DIR = _dir(HB_APP_DIR, 'logs');
 
 	$appLogger = new Logger('animeclient');
-	$appLogger->pushHandler(new RotatingFileHandler(__DIR__ . '/logs/app.log', Logger::NOTICE));
-
-	$anilistRequestLogger = new Logger('anilist-request');
-	$anilistRequestLogger->pushHandler(new RotatingFileHandler(__DIR__ . '/logs/anilist_request.log', Logger::NOTICE));
-
-	$kitsuRequestLogger = new Logger('kitsu-request');
-	$kitsuRequestLogger->pushHandler(new RotatingFileHandler(__DIR__ . '/logs/kitsu_request.log', Logger::NOTICE));
-
+	$appLogger->pushHandler(new RotatingFileHandler(_dir($LOG_DIR, 'app.log'), 2, Logger::WARNING));
 	$container->setLogger($appLogger);
-	$container->setLogger($anilistRequestLogger, 'anilist-request');
-	$container->setLogger($kitsuRequestLogger, 'kitsu-request');
+
+	foreach (['anilist-request', 'kitsu-request', 'kitsu-graphql'] as $channel)
+	{
+		$logger = new Logger($channel);
+		$handler = new RotatingFileHandler(_dir($LOG_DIR, "{$channel}.log"), 2, Logger::WARNING);
+		$handler->setFormatter(new JsonFormatter());
+		$logger->pushHandler($handler);
+
+		$container->setLogger($logger, $channel);
+	}
 
 	// -------------------------------------------------------------------------
 	// Injected Objects
 	// -------------------------------------------------------------------------
 
 	// Create Config Object
-	$container->set('config', static function() use ($configArray) {
-		return new Config($configArray);
-	});
+	$container->set('config', static fn () => new Config($configArray));
 
 	// Create Cache Object
-	$container->set('cache', static function($container): Pool {
+	$container->set('cache', static function (ContainerInterface $container): CacheInterface {
 		$logger = $container->getLogger();
 		$config = $container->get('config')->get('cache');
-		return new Pool($config, $logger);
-	});
 
-	// Create List Cache
+		return new Teller($config, $logger);
+	});
 
 	// Create Aura Router Object
-	$container->set('aura-router', static function() {
-		return new RouterContainer;
-	});
+	$container->set('aura-router', static fn () => new RouterContainer());
 
-	// Create Html helper Object
-	$container->set('html-helper', static function($container) {
-		$htmlHelper = (new HelperLocatorFactory)->newInstance();
-		$htmlHelper->set('menu', static function() use ($container) {
-			$menuHelper = new Helper\Menu();
-			$menuHelper->setContainer($container);
-			return $menuHelper;
-		});
-		$htmlHelper->set('field', static function() use ($container) {
-			$formHelper = new Helper\Form();
-			$formHelper->setContainer($container);
-			return $formHelper;
-		});
-		$htmlHelper->set('picture', static function() use ($container) {
-			$pictureHelper = new Helper\Picture();
-			$pictureHelper->setContainer($container);
-			return $pictureHelper;
-		});
+	// Create Html helpers
+	$container->set('html-helper', static function (ContainerInterface $container) {
+		$htmlHelper = (new HelperLocatorFactory())->newInstance();
+		$helpers = [
+			'menu' => Helper\Menu::class,
+			'field' => Helper\Form::class,
+			'picture' => Helper\Picture::class,
+		];
+
+		foreach ($helpers as $name => $class)
+		{
+			$htmlHelper->set($name, static function () use ($class, $container) {
+				$helper = new $class();
+				$helper->setContainer($container);
+
+				return $helper;
+			});
+		}
 
 		return $htmlHelper;
 	});
 
-	// Create Request/Response Objects
-	$container->set('request', static function() {
-		return ServerRequestFactory::fromGlobals(
-			$_SERVER,
-			$_GET,
-			$_POST,
-			$_COOKIE,
-			$_FILES
-		);
-	});
-	$container->set('response', static function() {
-		return new Response;
+	// Create Component helpers
+	$container->set('component-helper', static function (ContainerInterface $container) {
+		$helper = (new HelperLocatorFactory())->newInstance();
+		$components = [
+			'animeCover' => Component\AnimeCover::class,
+			'mangaCover' => Component\MangaCover::class,
+			'character' => Component\Character::class,
+			'media' => Component\Media::class,
+			'tabs' => Component\Tabs::class,
+			'verticalTabs' => Component\VerticalTabs::class,
+		];
+
+		foreach ($components as $name => $componentClass)
+		{
+			$helper->set($name, static function () use ($container, $componentClass) {
+				$helper = new $componentClass();
+				$helper->setContainer($container);
+
+				return $helper;
+			});
+		}
+
+		return $helper;
 	});
 
+	// Create Request Object
+	$container->set('request', static fn () => ServerRequestFactory::fromGlobals(
+		$GLOBALS['_SERVER'],
+		$_GET,
+		$_POST,
+		$_COOKIE,
+		$_FILES
+	));
+
 	// Create session Object
-	$container->set('session', static function() {
-		return (new SessionFactory())->newInstance($_COOKIE);
-	});
-
-	// Miscellaneous helper methods
-	$container->set('util', static function($container): Util {
-		return new Util($container);
-	});
+	$container->set('session', static fn () => (new SessionFactory())->newInstance($_COOKIE));
 
 	// Models
-	$container->set('kitsu-model', static function($container): Kitsu\Model {
-		$requestBuilder = new KitsuRequestBuilder();
+	$container->set('kitsu-model', static function (ContainerInterface $container): Kitsu\Model {
+		$requestBuilder = new Kitsu\RequestBuilder($container);
 		$requestBuilder->setLogger($container->getLogger('kitsu-request'));
 
 		$listItem = new Kitsu\ListItem();
@@ -139,10 +154,11 @@ return static function ($configArray = []) {
 
 		$cache = $container->get('cache');
 		$model->setCache($cache);
+
 		return $model;
 	});
-	$container->set('anilist-model', static function($container): Anilist\Model {
-		$requestBuilder = new Anilist\AnilistRequestBuilder();
+	$container->set('anilist-model', static function (ContainerInterface $container): Anilist\Model {
+		$requestBuilder = new Anilist\RequestBuilder($container);
 		$requestBuilder->setLogger($container->getLogger('anilist-request'));
 
 		$listItem = new Anilist\ListItem();
@@ -155,41 +171,29 @@ return static function ($configArray = []) {
 
 		return $model;
 	});
-
-	$container->set('anime-model', static function($container) {
-		return new Model\Anime($container);
-	});
-	$container->set('manga-model', static function($container) {
-		return new Model\Manga($container);
-	});
-	$container->set('anime-collection-model', static function($container) {
-		return new Model\AnimeCollection($container);
-	});
-	$container->set('manga-collection-model', static function($container) {
-		return new Model\MangaCollection($container);
-	});
-	$container->set('settings-model', static function($container) {
-		$model =  new Model\Settings($container->get('config'));
+	$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 function($container) {
-		return new Kitsu\Auth($container);
-	});
-	$container->set('url-generator', static function($container) {
-		return 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 function($container) {
-		return new Dispatcher($container);
-	});
+	$container->setSimple('dispatcher', Dispatcher::class);
 
 	return $container;
 };
 
-// End of bootstrap.php
+// End of bootstrap.php

app/config/anilist.toml.example

@@ -0,0 +1,6 @@
+################################################################################
+#                                 Anilist API                                  #
+################################################################################
+client_id = "your_client_id"
+client_secret = "your_client_secret"
+username = "user123"

app/config/cache.toml.example

@@ -4,7 +4,7 @@
 
 # See https://git.timshomepage.net/aviat/banker for more information
 
-# Available drivers are apcu, memcache, memcached, redis or null
+# Available drivers are memcached, redis or null
 # Null cache driver means no caching
 driver = "redis"
 

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
 ################################################################################

app/templates/anime-cover.php

@@ -1,15 +1,16 @@
 <article
 	class="media"
- 	data-kitsu-id="<?= $item['id'] ?>"
- 	data-mal-id="<?= $item['mal_id'] ?>"
+	data-kitsu-id="<?= $item['id'] ?>"
+	data-anilist-id="<?= $item['anilist_id'] ?>"
+	data-mal-id="<?= $item['mal_id'] ?>"
 >
-	<?php if ($auth->isAuthenticated()): ?>
+	<?php if ($_->isAuthenticated()): ?>
 		<button title="Increment episode count" class="plus-one" hidden>+1 Episode</button>
 	<?php endif ?>
-	<?= $helper->picture("images/anime/{$item['anime']['id']}.webp") ?>
+	<?= $_->h->img($item['anime']['cover_image'], ['width' => 220, 'loading' => 'lazy']) ?>
 
 	<div class="name">
-		<a href="<?= $url->generate('anime.details', ['id' => $item['anime']['slug']]) ?>">
+		<a href="<?= $_->urlFromRoute('anime.details', ['id' => $item['anime']['slug']]) ?>">
 			<span class="canonical"><?= $item['anime']['title'] ?></span>
 			<?php foreach ($item['anime']['titles'] as $title): ?>
 				<br/>
@@ -18,7 +19,7 @@
 		</a>
 	</div>
 	<div class="table">
-		<?php if ($item['private'] || $item['rewatching']): ?>
+		<?php if (isset($item['private']) || isset($item['rewatching'])): ?>
 			<div class="row">
 				<?php foreach (['private', 'rewatching'] as $attr): ?>
 					<?php if ($item[$attr]): ?>
@@ -30,7 +31,15 @@
 
 		<?php if ($item['rewatched'] > 0): ?>
 			<div class="row">
-				<div>Rewatched <?= $item['rewatched'] ?> time(s)</div>
+				<?php if ($item['rewatched'] == 1): ?>
+					<div>Rewatched once</div>
+				<?php elseif ($item['rewatched'] == 2): ?>
+					<div>Rewatched twice</div>
+				<?php elseif ($item['rewatched'] == 3): ?>
+					<div>Rewatched thrice</div>
+				<?php else: ?>
+					<div>Rewatched <?= $item['rewatched'] ?> times</div>
+				<?php endif ?>
 			</div>
 		<?php endif ?>
 
@@ -41,7 +50,7 @@
 						<?php if ($link['meta']['link']): ?>
 							<a href="<?= $link['link'] ?>"
 							   title="Stream '<?= $item['anime']['title'] ?>' on <?= $link['meta']['name'] ?>">
-								<?= $helper->img("/public/images/{$link['meta']['image']}", [
+								<?= $_->h->img("/public/images/{$link['meta']['image']}", [
 									'class' => 'streaming-logo',
 									'width' => 20,
 									'height' => 20,
@@ -49,7 +58,7 @@
 								]); ?>
 							</a>
 						<?php else: ?>
-							<?= $helper->img("/public/images/{$link['meta']['image']}", [
+							<?= $_->h->img("/public/images/{$link['meta']['image']}", [
 								'class' => 'streaming-logo',
 								'width' => 20,
 								'height' => 20,
@@ -61,11 +70,11 @@
 			</div>
 		<?php endif ?>
 
-		<?php if ($auth->isAuthenticated()): ?>
+		<?php if ($_->isAuthenticated()): ?>
 			<div class="row">
 				<span class="edit">
 					<a class="bracketed" title="Edit information about this anime" href="<?=
-					$url->generate('edit', [
+					$_->urlFromRoute('edit', [
 						'controller' => 'anime',
 						'id' => $item['id'],
 						'status' => $item['watching_status']
@@ -83,9 +92,9 @@
 			</div>
 		</div>
 		<div class="row">
-			<div class="media_type"><?= $escape->html($item['anime']['show_type']) ?></div>
-			<div class="airing-status"><?= $escape->html($item['airing']['status']) ?></div>
-			<div class="age-rating"><?= $escape->html($item['anime']['age_rating']) ?></div>
+			<div class="media_type"><?= $_->escape->html($item['anime']['show_type']) ?></div>
+			<div class="airing-status"><?= $_->escape->html($item['airing']['status']) ?></div>
+			<div class="age-rating"><?= $_->escape->html($item['anime']['age_rating']) ?></div>
 		</div>
 	</div>
 </article>

app/templates/character.php

@@ -0,0 +1,6 @@
+<article class="<?= $className ?>">
+	<div class="name">
+		<a href="<?= $link ?>"><?= $name ?></a>
+	</div>
+	<a href="<?= $link ?>"><?= $picture ?></a>
+</article>

app/templates/manga-cover.php

@@ -0,0 +1,68 @@
+<article class="media" data-kitsu-id="<?= $item['id'] ?>" data-mal-id="<?= $item['mal_id'] ?>">
+	<?php if ($_->isAuthenticated()): ?>
+		<div class="edit-buttons" hidden>
+			<button class="plus-one-chapter">+1 Chapter</button>
+		</div>
+	<?php endif ?>
+	<?= $_->h->img($item['manga']['image'], ['width' => 220, 'loading' => 'lazy']) ?>
+	<div class="name">
+		<a href="<?= $_->urlFromRoute('manga.details', ['id' => $item['manga']['slug']]) ?>">
+			<?= $_->escape->html($item['manga']['title']) ?>
+			<?php foreach($item['manga']['titles'] as $title): ?>
+				<br /><small><?= $title ?></small>
+			<?php endforeach ?>
+		</a>
+	</div>
+	<div class="table">
+		<?php if ($_->isAuthenticated()): ?>
+			<div class="row">
+							<span class="edit">
+								<a class="bracketed"
+								   title="Edit information about this manga"
+								   href="<?= $_->urlFromRoute('edit', [
+									   'controller' => 'manga',
+									   'id' => $item['id'],
+									   'status' => $name
+								   ]) ?>">
+									Edit
+								</a>
+							</span>
+			</div>
+		<?php endif ?>
+		<div class="row">
+			<div><?= $item['manga']['type'] ?></div>
+			<div class="user-rating">Rating: <?= $item['user_rating'] ?> / 10</div>
+		</div>
+
+		<?php if ($item['rereading']): ?>
+			<div class="row">
+				<?php foreach(['rereading'] as $attr): ?>
+					<?php if($item[$attr]): ?>
+						<span class="item-<?= $attr ?>"><?= ucfirst($attr) ?></span>
+					<?php endif ?>
+				<?php endforeach ?>
+			</div>
+		<?php endif ?>
+
+		<?php if ($item['reread'] > 0): ?>
+			<div class="row">
+				<?php if ($item['reread'] == 1): ?>
+					<div>Reread once</div>
+				<?php elseif ($item['reread'] == 2): ?>
+					<div>Reread twice</div>
+				<?php elseif ($item['reread'] == 3): ?>
+					<div>Reread thrice</div>
+				<?php else: ?>
+					<div>Reread <?= $item['reread'] ?> times</div>
+				<?php endif ?>
+			</div>
+		<?php endif ?>
+
+		<div class="row">
+			<div class="chapter_completion">
+				Chapters: <span class="chapters_read"><?= $item['chapters']['read'] ?></span> /
+				<span class="chapter_count"><?= $item['chapters']['total'] ?></span>
+			</div>
+		</div>
+	</div>
+</article>

app/templates/media.php

@@ -0,0 +1,12 @@
+<article class="<?= $className ?>">
+	<a href="<?= $link ?>"><?= $picture ?></a>
+	<div class="name">
+		<a href="<?= $link ?>">
+			<?= array_shift($titles) ?>
+			<?php foreach ($titles as $title): ?>
+				<br />
+				<small><?= $title ?></small>
+			<?php endforeach ?>
+		</a>
+	</div>
+</article>

app/templates/single-tab.php

@@ -0,0 +1,5 @@
+<section class="<?= $className ?>">
+	<?php foreach ($data as $tabName => $tabData): ?>
+	<?= $callback($tabData, $tabName) ?>
+	<?php endforeach ?>
+</section>

app/templates/tabs.php

@@ -0,0 +1,32 @@
+<div class="tabs">
+	<?php $i = 0; foreach ($data as $tabName => $tabData): ?>
+		<?php if ( ! empty($tabData)): ?>
+			<?php $id = "{$name}-{$i}"; ?>
+			<input
+				role='tab'
+				aria-controls="_<?= $id ?>"
+				type="radio"
+				name="<?= $name ?>"
+				id="<?= $id ?>"
+				<?= ($i === 0) ? 'checked="checked"' : '' ?>
+			/>
+			<label for="<?= $id ?>"><?= ucfirst($tabName) ?></label>
+
+			<?php if ($hasSectionWrapper): ?>
+			<div class="content full-height">
+			<?php endif ?>
+
+			<section
+				id="_<?= $id ?>"
+				role="tabpanel"
+				class="<?= $className ?>"
+			>
+				<?= $callback($tabData, $tabName) ?>
+			</section>
+
+			<?php if ($hasSectionWrapper): ?>
+			</div>
+			<?php endif ?>
+		<?php endif ?>
+	<?php $i++; endforeach ?>
+</div>

app/templates/vertical-tabs.php

@@ -0,0 +1,25 @@
+<div class="vertical-tabs">
+	<?php $i = 0; ?>
+	<?php foreach ($data as $tabName => $tabData): ?>
+		<?php $id = "{$name}-{$i}" ?>
+		<div class="tab">
+			<input
+				type="radio"
+				role='tab'
+				aria-controls="_<?= $id ?>"
+				name="<?= $name ?>"
+				id="<?= $id ?>"
+				<?= $i === 0 ? 'checked="checked"' : '' ?>
+			/>
+			<label for="<?= $id ?>"><?= $tabName ?></label>
+			<section
+				id='_<?= $id ?>'
+				role="tabpanel"
+				class="<?= $className ?>"
+			>
+				<?= $callback($tabData, $tabName) ?>
+			</section>
+		</div>
+		<?php $i++; ?>
+	<?php endforeach ?>
+</div>

app/views/anime/add.php

@@ -1,7 +1,8 @@
-<?php if ($auth->isAuthenticated()): ?>
+<?php if ($_->isAuthenticated()): ?>
 <main>
 	<h2>Add Anime to your List</h2>
 	<form action="<?= $action_url ?>" method="post">
+		<?php include realpath(__DIR__ . '/../js-warning.php') ?>
 		<section>
 			<div class="cssload-loader" hidden="hidden">
 				<div class="cssload-inner cssload-one"></div>

app/views/anime/cover.php

@@ -1,6 +1,6 @@
 <main class="media-list">
-<?php if ($auth->isAuthenticated()): ?>
-<a class="bracketed" href="<?= $url->generate('anime.add.get') ?>">Add Item</a>
+<?php if ($_->isAuthenticated()): ?>
+<a class="bracketed" href="<?= $_->urlFromRoute('anime.add.get') ?>">Add Item</a>
 <?php endif ?>
 <?php if (empty($sections)): ?>
 <h3>There's nothing here!</h3>
@@ -11,16 +11,16 @@
 	<?php foreach ($sections as $name => $items): ?>
 	<?php if (empty($items)): ?>
 		<section class="status">
-			<h2><?= $escape->html($name) ?></h2>
+			<h2><?= $_->escape->html($name) ?></h2>
 			<h3>There's nothing here!</h3>
 		</section>
 	<?php else: ?>
 		<section class="status">
-			<h2><?= $escape->html($name) ?></h2>
+			<h2><?= $_->escape->html($name) ?></h2>
 			<section class="media-wrap">
 				<?php foreach($items as $item): ?>
-				<?php if ($item['private'] && ! $auth->isAuthenticated()) continue; ?>
-					<?php include __DIR__ . '/cover-item.php' ?>
+				<?php if ($item['private'] && ! $_->isAuthenticated()) continue; ?>
+					<?= $_->component->animeCover($item) ?>
 				<?php endforeach ?>
 			</section>
 		</section>

app/views/anime/details.php

@@ -1,8 +1,12 @@
-<?php use function Aviat\AnimeClient\getLocalImg; ?>
+<?php
+
+use function Aviat\AnimeClient\friendlyTime;
+
+?>
 <main class="details fixed">
 	<section class="flex">
 		<aside class="info">
-			<?= $helper->picture("images/anime/{$data['id']}-original.webp") ?>
+			<?= $_->h->img($data['cover_image'], ['width' => '390']) ?>
 
 			<br />
 
@@ -11,20 +15,40 @@
 					<td class="align-right">Airing Status</td>
 					<td><?= $data['status'] ?></td>
 				</tr>
+
+				<?php if ( ! empty($data['airDate'])): ?>
+				<tr>
+					<td>Original Airing</td>
+					<td><?= $data['airDate'] ?></td>
+				</tr>
+				<?php endif ?>
+
 				<tr>
 					<td>Show Type</td>
-					<td><?= $data['show_type'] ?></td>
+					<td><?= (strlen($data['show_type']) > 3) ? ucfirst(strtolower($data['show_type'])) : $data['show_type'] ?></td>
 				</tr>
-				<tr>
-					<td>Episode Count</td>
-					<td><?= $data['episode_count'] ?? '-' ?></td>
-				</tr>
-				<?php if ( ! empty($data['episode_length'])): ?>
+
+				<?php if ($data['episode_count'] !== 1): ?>
 					<tr>
-						<td>Episode Length</td>
-						<td><?= $data['episode_length'] ?> minutes</td>
+						<td>Episode Count</td>
+						<td><?= $data['episode_count'] ?? '-' ?></td>
 					</tr>
 				<?php endif ?>
+
+				<?php if (( ! empty($data['episode_length'])) && $data['episode_count'] !== 1): ?>
+					<tr>
+						<td>Episode Length</td>
+						<td><?= friendlyTime($data['episode_length']) ?></td>
+					</tr>
+				<?php endif ?>
+
+				<?php if (isset($data['total_length'], $data['episode_count']) && $data['total_length'] > 0): ?>
+					<tr>
+						<td>Total Length</td>
+						<td><?= friendlyTime($data['total_length']) ?></td>
+					</tr>
+				<?php endif ?>
+
 				<?php if ( ! empty($data['age_rating'])): ?>
 					<tr>
 						<td>Age Rating</td>
@@ -32,6 +56,18 @@
 						</td>
 					</tr>
 				<?php endif ?>
+
+				<?php if (count($data['links']) > 0): ?>
+					<tr>
+						<td>External Links</td>
+						<td>
+								<?php foreach ($data['links'] as $urlName => $externalUrl): ?>
+									<a rel='external' href="<?= $externalUrl ?>"><?= $urlName ?></a><br />
+								<?php endforeach ?>
+						</td>
+					</tr>
+				<?php endif ?>
+
 				<tr>
 					<td>Genres</td>
 					<td>
@@ -40,12 +76,14 @@
 				</tr>
 			</table>
 
+
+
 			<br />
 
 		</aside>
 		<article class="text">
-			<h2 class="toph"><a rel="external" href="<?= $data['url'] ?>"><?= $data['title'] ?></a></h2>
-			<?php foreach ($data['titles'] as $title): ?>
+			<h2 class="toph"><?= $data['title'] ?></h2>
+			<?php foreach ($data['titles_more'] as $title): ?>
 				<h3><?= $title ?></h3>
 			<?php endforeach ?>
 			<br />
@@ -72,7 +110,7 @@
 										href="<?= $link['link'] ?>"
 										title="Stream '<?= $data['title'] ?>' on <?= $link['meta']['name'] ?>"
 									>
-										<?= $helper->img("/public/images/{$link['meta']['image']}", [
+										<?= $_->h->img("/public/images/{$link['meta']['image']}", [
 											'class' => 'streaming-logo',
 											'width' => 50,
 											'height' => 50,
@@ -81,7 +119,7 @@
 										&nbsp;&nbsp;<?= $link['meta']['name'] ?>
 									</a>
 								<?php else: ?>
-									<?= $helper->img("/public/images/{$link['meta']['image']}", [
+									<?= $_->h->img("/public/images/{$link['meta']['image']}", [
 										'class' => 'streaming-logo',
 										'width' => 50,
 										'height' => 50,
@@ -90,8 +128,8 @@
 									&nbsp;&nbsp;<?= $link['meta']['name'] ?>
 								<?php endif ?>
 							</td>
-							<td><?= implode(', ', $link['subs']) ?></td>
-							<td><?= implode(', ', $link['dubs']) ?></td>
+							<td><?= implode(', ', array_map(fn ($sub) => Locale::getDisplayLanguage($sub, 'en'), $link['subs'])) ?></td>
+							<td><?= implode(', ', array_map(fn ($dub) => Locale::getDisplayLanguage($dub, 'en'), $link['dubs'])) ?></td>
 						</tr>
 					<?php endforeach ?>
 					</tbody>
@@ -99,81 +137,69 @@
 			<?php endif ?>
 			<?php if ( ! empty($data['trailer_id'])): ?>
 				<div class="responsive-iframe">
-				<h4>Trailer</h4>
-				<iframe
-					width="560"
-					height="315"
-					src="https://www.youtube.com/embed/<?= $data['trailer_id'] ?>"
-					frameborder="0"
-					allow="autoplay; encrypted-media"
-					allowfullscreen
-				></iframe>
+					<h4>Trailer</h4>
+					<iframe
+						width="560"
+						height="315"
+						role='img'
+						src="https://www.youtube.com/embed/<?= $data['trailer_id'] ?>"
+						allow="autoplay; encrypted-media"
+						allowfullscreen
+						tabindex='0'
+						title="<?= $data['title'] ?> trailer video"
+					></iframe>
 				</div>
 			<?php endif ?>
 		</article>
 	</section>
 
 	<?php if (count($data['characters']) > 0): ?>
-	<section>
-		<h2>Characters</h2>
+		<section>
+			<h2>Characters</h2>
 
-		<div class="tabs">
-			<?php $i = 0 ?>
-			<?php foreach ($data['characters'] as $role => $list): ?>
-				<input
-					type="radio" name="character-types"
-					id="character-types-<?= $i ?>" <?= ($i === 0) ? 'checked' : '' ?> />
-				<label for="character-types-<?= $i ?>"><?= ucfirst($role) ?></label>
-				<section class="content media-wrap flex flex-wrap flex-justify-start">
-					<?php foreach ($list as $id => $char): ?>
-						<?php if ( ! empty($char['image']['original'])): ?>
-							<article class="<?= $role === 'supporting' ? 'small-' : '' ?>character">
-								<?php $link = $url->generate('character', ['slug' => $char['slug']]) ?>
-								<div class="name">
-									<?= $helper->a($link, $char['name']); ?>
-								</div>
-								<a href="<?= $link ?>">
-									<?= $helper->picture("images/characters/{$id}.webp") ?>
-								</a>
-							</article>
-						<?php endif ?>
-					<?php endforeach ?>
-				</section>
-				<?php $i++; ?>
-			<?php endforeach ?>
-		</div>
-	</section>
+			<?= $_->component->tabs('character-types', $data['characters'], static function ($characterList, $role)
+			use ($_) {
+				$rendered = [];
+				foreach ($characterList as $id => $character):
+					if (empty($character['image']))
+					{
+						continue;
+					}
+					$rendered[] = $_->component->character(
+						$character['name'],
+						$_->urlFromRoute('character', ['slug' => $character['slug']]),
+						$_->h->img($character['image']),
+						(strtolower($role) !== 'main') ? 'small-character' : 'character'
+					);
+				endforeach;
+
+				return implode('', array_map('mb_trim', $rendered));
+			}) ?>
+		</section>
 	<?php endif ?>
 
 	<?php if (count($data['staff']) > 0): ?>
-	<section>
-		<h2>Staff</h2>
+		<section>
+			<h2>Staff</h2>
 
-		<div class="vertical-tabs">
-			<?php $i = 0; ?>
-			<?php foreach ($data['staff'] as $role => $people): ?>
-				<div class="tab">
-					<input type="radio" name="staff-roles" id="staff-role<?= $i ?>" <?= $i === 0 ? 'checked' : '' ?> />
-					<label for="staff-role<?= $i ?>"><?= $role ?></label>
-					<section class='content media-wrap flex flex-wrap flex-justify-start'>
-						<?php foreach ($people as $pid => $person): ?>
-							<article class='character small-person'>
-								<?php $link = $url->generate('person', ['id' => $person['id']]) ?>
-								<div class="name">
-									<a href="<?= $link ?>">
-										<?= $person['name'] ?>
-									</a>
-								</div>
-								<a href="<?= $link ?>">
-									<?= $helper->picture(getLocalImg($person['image']['original'] ?? NULL)) ?>
-								</a>
-							</article>
-						<?php endforeach ?>
-					</section>
-				</div>
-				<?php $i++; ?>
-			<?php endforeach ?>
-		</div>
-	</section>
+			<?= $_->component->verticalTabs('staff-role', $data['staff'], static function ($staffList)
+			use ($_) {
+				$rendered = [];
+				foreach ($staffList as $id => $person):
+					if (empty($person['image']))
+					{
+						continue;
+					}
+					$rendered[] = $_ ->component->character(
+						$person['name'],
+						$_->urlFromRoute('person', ['slug' => $person['slug']]),
+						$_->h->img($person['image']),
+						'character small-person',
+					);
+				endforeach;
+
+				return implode('', array_map('mb_trim', $rendered));
+			}) ?>
+		</section>
 	<?php endif ?>
 </main>

app/views/anime/edit.php

@@ -1,4 +1,4 @@
-<?php if ($auth->isAuthenticated()): ?>
+<?php if ($_->isAuthenticated()): ?>
 	<main>
 		<h2>Edit Anime List Item</h2>
 		<form action="<?= $action ?>" method="post">
@@ -6,9 +6,9 @@
 				<thead>
 					<tr>
 						<th>
-							<h3><?= $escape->html($item['anime']['title']) ?></h3>
+							<h3><?= $_->escape->html($item['anime']['title']) ?></h3>
 							<?php foreach($item['anime']['titles'] as $title): ?>
-							<h4><?= $escape->html($title) ?></h4>
+							<h4><?= $_->escape->html($title) ?></h4>
 							<?php endforeach ?>
 						</th>
 					</tr>
@@ -16,7 +16,7 @@
 				<tbody>
 					<tr>
 						<td rowspan="9">
-							<?= $helper->picture("images/anime/{$item['anime']['id']}-original.webp", "jpg", [], ["width" => "390"]) ?>
+							<?= $_->h->img($item['anime']['cover_image']) ?>
 						</td>
 					</tr>
 					<tr>
@@ -32,7 +32,7 @@
 						<td>
 							<select name="watching_status" id="watching_status">
 							<?php foreach($statuses as $status_key => $status_title): ?>
-								<option <?php if($item['watching_status'] === $status_key): ?>selected="selected"<?php endif ?>
+								<option <?php if(strtolower($item['watching_status']) === $status_key): ?>selected="selected"<?php endif ?>
 									value="<?= $status_key ?>"><?= $status_title ?></option>
 							<?php endforeach ?>
 							</select>
@@ -70,7 +70,7 @@
 					<tr>
 						<td><label for="notes">Notes</label></td>
 						<td>
-							<textarea name="notes" id="notes"><?= $escape->html($item['notes']) ?></textarea>
+							<textarea name="notes" id="notes"><?= $_->escape->html($item['notes']) ?></textarea>
 						</td>
 					</tr>
 					<tr>
@@ -87,7 +87,7 @@
 				</tbody>
 			</table>
 		</form>
-		<form class="js-delete" action="<?= $url->generate('anime.delete') ?>" method="post">
+		<form class="js-delete" action="<?= $_->urlFromRoute('anime.delete') ?>" method="post">
 			<fieldset>
 				<legend>Danger Zone</legend>
 				<table class="form invisible">

app/views/anime/list.php

@@ -1,6 +1,7 @@
+<?php use function Aviat\AnimeClient\colNotEmpty; ?>
 <main class="media-list">
-<?php if ($auth->isAuthenticated()): ?>
-<a class="bracketed" href="<?= $url->generate('anime.add.get') ?>">Add Item</a>
+<?php if ($_->isAuthenticated()): ?>
+<a class="bracketed" href="<?= $_->urlFromRoute('anime.add.get') ?>">Add Item</a>
 <?php endif ?>
 <?php if (empty($sections)): ?>
 <h3>There's nothing here!</h3>
@@ -13,30 +14,32 @@
 	<?php if (empty($items)): ?>
 		<h3>There's nothing here!</h3>
 	<?php else: ?>
+		<?php
+			$hasNotes = colNotEmpty($items, 'notes');
+		?>
 		<table class='media-wrap'>
 			<thead>
 				<tr>
-					<?php if($auth->isAuthenticated()): ?>
+					<?php if($_->isAuthenticated()): ?>
 					<td class="no-border">&nbsp;</td>
 					<?php endif ?>
 					<th>Title</th>
 					<th>Airing Status</th>
-					<th>Score</th>
+					<th class='numeric'>Score</th>
 					<th>Type</th>
-					<th>Progress</th>
-					<th>Rated</th>
-					<th colspan="2">Attributes</th>
-					<th>Notes</th>
-					<th>Genres</th>
+					<th class='numeric'>Progress</th>
+					<th class='rating'>Age Rating</th>
+					<th>Attributes</th>
+					<?php if($hasNotes): ?><th>Notes</th><?php endif ?>
 				</tr>
 			</thead>
 			<tbody>
 				<?php foreach($items as $item): ?>
-				<?php if ($item['private'] && ! $auth->isAuthenticated()) continue; ?>
+				<?php if ($item['private'] && ! $_->isAuthenticated()) continue; ?>
 				<tr id="a-<?= $item['id'] ?>">
-					<?php if ($auth->isAuthenticated()): ?>
+					<?php if ($_->isAuthenticated()): ?>
 					<td>
-						<a class="bracketed" href="<?= $url->generate('edit', [
+						<a class="bracketed" href="<?= $_->urlFromRoute('edit', [
 							'controller' => 'anime',
 							'id' => $item['id'],
 							'status' => $item['watching_status']
@@ -44,12 +47,11 @@
 					</td>
 					<?php endif ?>
 					<td class="align-left justify">
-						<a href="<?= $url->generate('anime.details', ['id' => $item['anime']['slug']]) ?>">
+						<a href="<?= $_->urlFromRoute('anime.details', ['id' => $item['anime']['slug']]) ?>">
 							<?= $item['anime']['title'] ?>
 						</a>
-						<?php foreach ($item['anime']['titles'] as $title): ?>
-							<br/><?= $title ?>
-						<?php endforeach ?>
+						<br />
+						<?= implode('<br />', $item['anime']['titles']) ?>
 					</td>
 					<td><?= $item['airing']['status'] ?></td>
 					<td><?= $item['user_rating'] ?> / 10 </td>
@@ -60,45 +62,46 @@
 					</td>
 					<td><?= $item['anime']['age_rating'] ?></td>
 					<td>
-	                    <ul>
-						<?php if ($item['rewatched'] > 0): ?>
-	                        <li>Rewatched <?= $item['rewatched'] ?> time(s)</li>
-						<?php endif ?>
-						<?php foreach(['private','rewatching'] as $attr): ?>
-							<?php if($item[$attr]): ?>
-	                            <li><?= ucfirst($attr); ?></li>
-							<?php endif ?>
-						<?php endforeach ?>
-	                    </ul>
-					</td>
-					<td>
 						<?php foreach($item['anime']['streaming_links'] as $link): ?>
 							<?php if ($link['meta']['link'] !== FALSE): ?>
 								<a href="<?= $link['link'] ?>" title="Stream '<?= $item['anime']['title'] ?>' on <?= $link['meta']['name'] ?>">
-									<?= $helper->picture("images/{$link['meta']['image']}", 'svg', [
-										'class' => 'streaming-logo',
-										'width' => 50,
-										'height' => 50,
-										'alt' => "{$link['meta']['name']} logo",
-									]); ?>
+									<?= $_->h->img("/public/images/{$link['meta']['image']}", [
+											'class' => 'small-streaming-logo',
+											'width' => 25,
+											'height' => 25,
+											'alt' => "{$link['meta']['name']} logo",
+									]) ?>
 								</a>
 							<?php else: ?>
-								<?= $helper->picture("images/{$link['meta']['image']}", 'svg', [
-									'class' => 'streaming-logo',
-									'width' => 50,
-									'height' => 50,
-									'alt' => "{$link['meta']['name']} logo",
-								]); ?>
+								<?= $_->h->img("/public/images/{$link['meta']['image']}", [
+										'class' => 'small-streaming-logo',
+										'width' => 25,
+										'height' => 25,
+										'alt' => "{$link['meta']['name']} logo",
+								]) ?>
 							<?php endif ?>
 						<?php endforeach ?>
+
+						<br />
+
+	                    <ul>
+						<?php if ($item['rewatched'] > 0): ?>
+							<?php if ($item['rewatched'] == 1): ?>
+							<li>Rewatched once</li>
+							<?php elseif ($item['rewatched'] == 2): ?>
+							<li>Rewatched twice</li>
+							<?php elseif ($item['rewatched'] == 3): ?>
+							<li>Rewatched thrice</li>
+							<?php else: ?>
+							<li>Rewatched <?= $item['rewatched'] ?> times</li>
+							<?php endif ?>
+						<?php endif ?>
+						<?php foreach(['private','rewatching'] as $attr): ?>
+							<?php if($item[$attr]): ?><li><?= ucfirst($attr); ?></li><?php endif ?>
+						<?php endforeach ?>
+	                    </ul>
 					</td>
-					<td>
-						<p><?= $escape->html($item['notes']) ?></p>
-					</td>
-					<td class="align-left">
-						<?php sort($item['anime']->genres) ?>
-						<?= implode(', ', $item['anime']->genres) ?>
-					</td>
+					<?php if ($hasNotes): ?><td><p><?= $_->escape->html($item['notes']) ?></p></td><?php endif ?>
 				</tr>
 				<?php endforeach ?>
 			</tbody>
@@ -107,4 +110,4 @@
 	<?php endforeach ?>
 <?php endif ?>
 </main>
-<script defer="defer" src="<?= $urlGenerator->assetUrl('js/tables.min.js') ?>"></script>
+<script defer="defer" src="<?= $_->assetUrl('js/tables.min.js') ?>"></script>

app/views/character/details.php

@@ -1,13 +1,13 @@
 <?php
 
 use function Aviat\AnimeClient\getLocalImg;
-use Aviat\AnimeClient\API\Kitsu;
+use Aviat\AnimeClient\Kitsu;
 
 ?>
 <main class="character-page details fixed">
 	<section class="flex flex-no-wrap">
 		<aside>
-			<?= $helper->picture("images/characters/{$data['id']}-original.webp") ?>
+			<?= $_->h->img($data['image']) ?>
 		</aside>
 		<div>
 			<h2 class="toph"><?= $data['name'] ?></h2>
@@ -26,70 +26,27 @@ use Aviat\AnimeClient\API\Kitsu;
 			<br />
 			<hr />
 			<div class="description">
-				<p><?= str_replace("\n", '</p><p>', $data['description']) ?></p>
+				<p><?= nl2br($data['description']) ?></p>
 			</div>
 		</div>
 	</section>
 
 	<?php if ( ! (empty($data['media']['anime']) || empty($data['media']['manga']))): ?>
 		<h3>Media</h3>
-		<div class="tabs">
-			<?php if ( ! empty($data['media']['anime'])): ?>
-				<input checked="checked" type="radio" id="media-anime" name="media-tabs" />
-				<label for="media-anime">Anime</label>
 
-				<section class="media-wrap content">
-					<?php foreach ($data['media']['anime'] as $id => $anime): ?>
-						<article class="media">
-							<?php
-							$link = $url->generate('anime.details', ['id' => $anime['attributes']['slug']]);
-							$titles = Kitsu::filterTitles($anime['attributes']);
-							?>
-							<a href="<?= $link ?>">
-								<?= $helper->picture("images/anime/{$id}.webp") ?>
-							</a>
-							<div class="name">
-								<a href="<?= $link ?>">
-									<?= array_shift($titles) ?>
-									<?php foreach ($titles as $title): ?>
-										<br />
-										<small><?= $title ?></small>
-									<?php endforeach ?>
-								</a>
-							</div>
-						</article>
-					<?php endforeach ?>
-				</section>
-			<?php endif ?>
+		<?= $_->component->tabs('character-media', $data['media'], static function ($media, $mediaType) use ($_) {
+			$rendered = [];
+			foreach ($media as $id => $item)
+			{
+				$rendered[] = $_->component->media(
+					array_merge([$item['title']], $item['titles']),
+					$_->urlFromRoute("{$mediaType}.details", ['id' => $item['slug']]),
+					$_->h->img(Kitsu::getPosterImage($item), ['width' => 220, 'loading' => 'lazy']),
+				);
+			}
 
-			<?php if ( ! empty($data['media']['manga'])): ?>
-				<input type="radio" id="media-manga" name="media-tabs" />
-				<label for="media-manga">Manga</label>
-
-				<section class="media-wrap content">
-					<?php foreach ($data['media']['manga'] as $id => $manga): ?>
-						<article class="media">
-							<?php
-							$link = $url->generate('manga.details', ['id' => $manga['attributes']['slug']]);
-							$titles = Kitsu::filterTitles($manga['attributes']);
-							?>
-							<a href="<?= $link ?>">
-								<?= $helper->picture("images/manga/{$id}.webp") ?>
-							</a>
-							<div class="name">
-								<a href="<?= $link ?>">
-									<?= array_shift($titles) ?>
-									<?php foreach ($titles as $title): ?>
-										<br />
-										<small><?= $title ?></small>
-									<?php endforeach ?>
-								</a>
-							</div>
-						</article>
-					<?php endforeach ?>
-				</section>
-			<?php endif ?>
-		</div>
+			return implode('', array_map('mb_trim', $rendered));
+		}, 'media-wrap content') ?>
 	<?php endif ?>
 
 	<section>
@@ -115,10 +72,10 @@ use Aviat\AnimeClient\API\Kitsu;
 								<td>
 									<article class="character">
 										<?php
-										$link = $url->generate('person', ['id' => $c['person']['id']]);
+										$link = $_->urlFromRoute('person', ['id' => $c['person']['id']]);
 										?>
 										<a href="<?= $link ?>">
-											<?= $helper->picture(getLocalImg($c['person']['image'], TRUE)) ?>
+											<?= $_->h->img($c['person']['image']) ?>
 											<div class="name">
 												<?= $c['person']['name'] ?>
 											</div>
@@ -130,11 +87,11 @@ use Aviat\AnimeClient\API\Kitsu;
 										<?php foreach ($c['series'] as $series): ?>
 											<article class="media">
 												<?php
-												$link = $url->generate('anime.details', ['id' => $series['attributes']['slug']]);
+												$link = $_->urlFromRoute('anime.details', ['id' => $series['attributes']['slug']]);
 												$titles = Kitsu::filterTitles($series['attributes']);
 												?>
 												<a href="<?= $link ?>">
-													<?= $helper->picture(getLocalImg($series['attributes']['posterImage']['small'], TRUE)) ?>
+													<?= $_->h->img(Kitsu::getPosterImage($series['attributes'])) ?>
 												</a>
 												<div class="name">
 													<a href="<?= $link ?>">
@@ -158,66 +115,47 @@ use Aviat\AnimeClient\API\Kitsu;
 			<?php if ( ! empty($vas)): ?>
 				<h4>Voice Actors</h4>
 
-				<div class="tabs">
-					<?php $i = 0; ?>
+				<?= $_->component->tabs('character-vas', $vas, static function ($casting) use ($_) {
+					$castings = [];
+					foreach ($casting as $id => $c):
+						$person = $_->component->character(
+							$c['person']['name'],
+							$_->urlFromRoute('person', ['slug' => $c['person']['slug']]),
+							$_->h->img($c['person']['image']['original']['url']),
+						);
+						$medias = array_map(fn ($series) => $_->component->media(
+							array_merge([$series['title']], $series['titles']),
+							$_->urlFromRoute('anime.details', ['id' => $series['slug']]),
+							$_->h->img(Kitsu::getPosterImage($series)),
+						), $c['series']);
+						$media = implode('', array_map('mb_trim', $medias));
 
-					<?php foreach ($vas as $language => $casting): ?>
-						<input <?= $i === 0 ? 'checked="checked"' : '' ?> type="radio" id="character-va<?= $i ?>"
-							name="character-vas"
-						/>
-						<label for="character-va<?= $i ?>"><?= $language ?></label>
-						<section class="content">
-							<table class="borderless max-table">
-								<tr>
-									<th>Cast Member</th>
-									<th>Series</th>
-								</tr>
-								<?php foreach ($casting as $cid => $c): ?>
-									<tr>
-										<td>
-											<article class="character">
-												<?php
-												$link = $url->generate('person', ['id' => $c['person']['id']]);
-												?>
-												<a href="<?= $link ?>">
-													<?= $helper->picture(getLocalImg($c['person']['image'])) ?>
-													<div class="name">
-														<?= $c['person']['name'] ?>
-													</div>
-												</a>
-											</article>
-										</td>
-										<td width="75%">
-											<section class="align-left media-wrap-flex">
-												<?php foreach ($c['series'] as $series): ?>
-													<article class="media">
-														<?php
-														$link = $url->generate('anime.details', ['id' => $series['attributes']['slug']]);
-														$titles = Kitsu::filterTitles($series['attributes']);
-														?>
-														<a href="<?= $link ?>">
-															<?= $helper->picture(getLocalImg($series['attributes']['posterImage']['small'], TRUE)) ?>
-														</a>
-														<div class="name">
-															<a href="<?= $link ?>">
-																<?= array_shift($titles) ?>
-																<?php foreach ($titles as $title): ?>
-																	<br />
-																	<small><?= $title ?></small>
-																<?php endforeach ?>
-															</a>
-														</div>
-													</article>
-												<?php endforeach ?>
-											</section>
-										</td>
-									</tr>
-								<?php endforeach ?>
-							</table>
-						</section>
-						<?php $i++ ?>
-					<?php endforeach ?>
-				</div>
+						$castings[] = <<<HTML
+							<tr>
+								<td>{$person}</td>
+								<td width="75%">
+									<section class="align-left media-wrap-flex">
+										{$media}
+									</section>
+								</td>
+							</tr>
+HTML;
+					endforeach;
+
+					$languages = implode('', array_map('mb_trim', $castings));
+
+					return <<<HTML
+						<table class="borderless max-table">
+							<thead>
+							<tr>
+								<th>Cast Member</th>
+								<th>Series</th>
+							</tr>
+							</thead>
+							<tbody>{$languages}</tbody>
+						</table>
+HTML;
+				}, 'content') ?>
 			<?php endif ?>
 		<?php endif ?>
 	</section>

app/views/collection/add.php

@@ -1,14 +1,15 @@
-<?php if ($auth->isAuthenticated()): ?>
+<?php if ($_->isAuthenticated()): ?>
 <main>
 	<h2>Add <?= ucfirst($collection_type) ?> to your Collection</h2>
 	<form action="<?= $action_url ?>" method="post">
+		<?php include realpath(__DIR__ . '/../js-warning.php') ?>
 		<section>
 			<div class="cssload-loader" hidden="hidden">
 				<div class="cssload-inner cssload-one"></div>
 				<div class="cssload-inner cssload-two"></div>
 				<div class="cssload-inner cssload-three"></div>
 			</div>
-			<label for="search">Search for <?= $collection_type ?> by name:&nbsp;&nbsp;&nbsp;&nbsp;<input type="search" id="search" name="search" /></label>
+			<label for="search-anime-collection">Search for <?= $collection_type ?> by name:&nbsp;&nbsp;&nbsp;&nbsp;<input type="search" id="search-anime-collection" name="search" /></label>
 			<section id="series-list" class="media-wrap">
 			</section>
 		</section>
@@ -16,13 +17,9 @@
 		<table class="invisible form">
 			<tbody>
 				<tr>
-					<td><label for="media_id">Media</label></td>
-					<td>
-						<select name="media_id" id="media_id">
-						<?php foreach($media_items as $id => $name): ?>
-							<option value="<?= $id ?>"><?= $name ?></option>
-						<?php endforeach ?>
-						</select>
+					<td class="align-right"><label for="media_id">Media</label></td>
+					<td class='align-left'>
+						<?php include 'media-select-list.php' ?>
 					</td>
 				</tr>
 				<tr>

app/views/collection/cover-item.php

@@ -1,24 +1,26 @@
 <article class="media" id="a-<?= $item['hummingbird_id'] ?>">
-	<?= $helper->picture("images/anime/{$item['hummingbird_id']}.webp") ?>
+	<?= $_->h->picture("images/anime/{$item['hummingbird_id']}.webp") ?>
 	<div class="name">
-		<a href="<?= $url->generate('anime.details', ['id' => $item['slug']]) ?>">
+		<a href="<?= $_->urlFromRoute('anime.details', ['id' => $item['slug']]) ?>">
 			<?= $item['title'] ?>
 			<?= ($item['alternate_title'] != "") ? "<small><br />{$item['alternate_title']}</small>" : ""; ?>
 		</a>
 	</div>
 	<div class="table">
-		<?php if ($auth->isAuthenticated()): ?>
+		<?php if ($_->isAuthenticated()): ?>
 		<div class="row">
 			<span class="edit">
 				<a class="bracketed"
-				   href="<?= $url->generate($collection_type . '.collection.edit.get', [
+				   href="<?= $_->urlFromRoute($collection_type . '.collection.edit.get', [
 					   'id' => $item['hummingbird_id']
 				   ]) ?>">Edit</a>
 			</span>
 		</div>
 		<?php endif ?>
 		<div class="row">
+			<?php if ($item['episode_count'] > 1): ?>
 			<div class="completion">Episodes: <?= $item['episode_count'] ?></div>
+			<?php endif ?>
 			<div class="media_type"><?= $item['show_type'] ?></div>
 			<div class="age-rating"><?= $item['age_rating'] ?></div>
 		</div>

app/views/collection/cover.php

@@ -1,6 +1,7 @@
+<?php use function Aviat\AnimeClient\renderTemplate; ?>
 <main class="media-list">
-<?php if ($auth->isAuthenticated()): ?>
-<a class="bracketed" href="<?= $url->generate($collection_type . '.collection.add.get') ?>">Add Item</a>
+<?php if ($_->isAuthenticated()): ?>
+<a class="bracketed" href="<?= $_->urlFromRoute($collection_type . '.collection.add.get') ?>">Add Item</a>
 <?php endif ?>
 <?php if (empty($sections)): ?>
 <h3>There's nothing here!</h3>
@@ -8,33 +9,18 @@
 	<br />
 	<label>Filter: <input type='text' class='media-filter' /></label>
 	<br />
-	<div class="tabs">
-	<?php $i = 0; ?>
-	<?php foreach ($sections as $name => $items): ?>
-		<input <?= $i === 0 ? 'checked="checked"' : '' ?> type="radio" id="collection-tab-<?= $i ?>" name="collection-tabs" />
-		<label for="collection-tab-<?= $i ?>"><h2><?= $name ?></h2></label>
-		<div class="content full-height">
-			<section class="media-wrap">
-				<?php foreach ($items as $item): ?>
-					<?php include __DIR__ . '/cover-item.php'; ?>
-				<?php endforeach ?>
-			</section>
-		</div>
-		<?php $i++; ?>
-	<?php endforeach ?>
-	<!-- All Tab -->
-	<input type='radio' id='collection-tab-<?= $i ?>' name='collection-tabs' />
-	<label for='collection-tab-<?= $i ?>'><h2>All</h2></label>
-	<div class='content full-height'>
-	<?php foreach ($sections as $name => $items): ?>
-		<h3><?= $name ?></h3>
-		<section class="media-wrap">
-			<?php foreach ($items as $item): ?>
-				<?php include __DIR__ . '/cover-item.php'; ?>
-			<?php endforeach ?>
-		</section>
-	<?php endforeach ?>
-	</div>
-	</div>
+	<?= $_->component->tabs('collection-tab', $sections, static function ($items) use ($_, $collection_type) {
+		$rendered = [];
+		foreach ($items as $item)
+		{
+			$rendered[] = renderTemplate(__DIR__ . '/cover-item.php', [
+					'_' => $_,
+					'collection_type' => $collection_type,
+					'item' => $item,
+			]);
+		}
+
+		return implode('', array_map('mb_trim', $rendered));
+	}, 'media-wrap', true) ?>
 <?php endif ?>
 </main>

app/views/collection/edit.php

@@ -1,4 +1,5 @@
-<?php if ($auth->isAuthenticated()): ?>
+<?php use function Aviat\AnimeClient\renderTemplate ?>
+<?php if ($_->isAuthenticated()): ?>
 <main>
 	<h2>Edit Anime Collection Item</h2>
 	<form action="<?= $action_url ?>" method="post">
@@ -6,7 +7,7 @@
 			<tbody>
 				<tr>
 					<td rowspan="6" class="align-center">
-						<?= $helper->picture("images/anime/{$item['hummingbird_id']}-original.webp", "jpg", [], ["width" => "390"]) ?>
+						<?= $_->h->picture("images/anime/{$item['hummingbird_id']}-original.webp", "jpg", [], ["width" => "390"]) ?>
 					</td>
 				</tr>
 				<tr>
@@ -24,16 +25,12 @@
 				<tr>
 					<td class="align-right"><label for="media_id">Media</label></td>
 					<td class="align-left">
-						<select name="media_id" id="media_id">
-						<?php foreach($media_items as $id => $name): ?>
-							<option <?= $item['media_id'] === $id ? 'selected="selected"' : '' ?> value="<?= $id ?>"><?= $name ?></option>
-						<?php endforeach ?>
-						</select>
+						<?php include 'media-select-list.php' ?>
 					</td>
 				</tr>
 				<tr>
 					<td><label for="notes">Notes</label></td>
-					<td><textarea id="notes" name="notes"><?= $escape->html($item['notes']) ?></textarea></td>
+					<td><textarea id="notes" name="notes"><?= $_->escape->html($item['notes']) ?></textarea></td>
 				</tr>
 				<tr>
 					<td>&nbsp;</td>
@@ -47,7 +44,7 @@
 			</tbody>
 		</table>
 	</form>
-	<form class="js-delete" action="<?= $url->generate($collection_type . '.collection.delete') ?>" method="post">
+	<form class="js-delete" action="<?= $_->urlFromRoute($collection_type . '.collection.delete') ?>" method="post">
 		<fieldset>
 			<legend>Danger Zone</legend>
 			<table class="form invisible">

app/views/collection/list-item.php

@@ -1,20 +1,23 @@
 <tr>
-	<?php if ($auth->isAuthenticated()): ?>
+	<?php if ($_->isAuthenticated()): ?>
 		<td>
 			<a class="bracketed"
-			   href="<?= $url->generate($collection_type . '.collection.edit.get', ['id' => $item['hummingbird_id']]) ?>">Edit</a>
+			   href="<?= $_->urlFromRoute($collection_type . '.collection.edit.get', ['id' => $item['hummingbird_id']]) ?>">Edit</a>
 		</td>
 	<?php endif ?>
 	<td class="align-left">
-		<a href="<?= $url->generate('anime.details', ['id' => $item['slug']]) ?>">
+		<a href="<?= $_->urlFromRoute('anime.details', ['id' => $item['slug']]) ?>">
 			<?= $item['title'] ?>
 		</a>
 		<?= ! empty($item['alternate_title']) ? ' <br /><small> ' . $item['alternate_title'] . '</small>' : '' ?>
 	</td>
-	<td><?= $item['episode_count'] ?></td>
+	<?php if ($hasMedia): ?>
+	<td><?= implode(', ', $item['media']) ?></td>
+	<?php endif ?>
+	<td><?= ($item['episode_count'] > 1) ? $item['episode_count'] : '-'  ?></td>
 	<td><?= $item['episode_length'] ?></td>
 	<td><?= $item['show_type'] ?></td>
 	<td><?= $item['age_rating'] ?></td>
+	<?php if ($hasNotes): ?><td class="align-left"><?= nl2br($item['notes'] ?? '', TRUE) ?></td><?php endif ?>
 	<td class="align-left"><?= implode(', ', $item['genres']) ?></td>
-	<td class="align-left"><?= $item['notes'] ?></td>
 </tr>

app/views/collection/list.php

@@ -1,6 +1,7 @@
+<?php use function Aviat\AnimeClient\{colNotEmpty, renderTemplate}; ?>
 <main>
-	<?php if ($auth->isAuthenticated()): ?>
-		<a class="bracketed" href="<?= $url->generate($collection_type . '.collection.add.get') ?>">Add Item</a>
+	<?php if ($_->isAuthenticated()): ?>
+		<a class="bracketed" href="<?= $_->urlFromRoute($collection_type . '.collection.add.get') ?>">Add Item</a>
 	<?php endif ?>
 	<?php if (empty($sections)): ?>
 		<h3>There's nothing here!</h3>
@@ -8,67 +9,47 @@
 		<br />
 		<label>Filter: <input type='text' class='media-filter' /></label>
 		<br />
-		<?php $i = 0; ?>
-		<div class="tabs">
-			<?php foreach ($sections as $name => $items): ?>
-				<input <?= $i === 0 ? 'checked="checked"' : '' ?> type="radio" id="collection-tab-<?= $i ?>"
-																  name="collection-tabs"/>
-				<label for="collection-tab-<?= $i ?>"><h2><?= $name ?></h2></label>
-				<div class="content full-height">
-					<table class="full-width media-wrap">
-						<thead>
-						<tr>
-							<?php if ($auth->isAuthenticated()): ?>
-								<td>Actions</td>
-							<?php endif ?>
-							<th>Title</th>
-							<th>Episode Count</th>
-							<th>Episode Length</th>
-							<th>Show Type</th>
-							<th>Age Rating</th>
-							<th>Genres</th>
-							<th>Notes</th>
-						</tr>
-						</thead>
-						<tbody>
-						<?php foreach ($items as $item): ?>
-							<?php include __DIR__ . '/list-item.php' ?>
-						<?php endforeach ?>
-						</tbody>
-					</table>
-				</div>
-				<?php $i++ ?>
-			<?php endforeach ?>
-			<!-- All -->
-			<input type='radio' id='collection-tab-<?= $i ?>' name='collection-tabs' />
-			<label for='collection-tab-<?= $i ?>'><h2>All</h2></label>
-			<div class="content full-height">
-				<?php foreach ($sections as $name => $items): ?>
-				<h3><?= $name ?></h3>
+		<?= $_->component->tabs('collection-tab', $sections, static function ($items, $section) use ($_, $helper, $collection_type) {
+			$hasNotes = colNotEmpty($items, 'notes');
+			$hasMedia = $section === 'All';
+			$firstTh = ($_->isAuthenticated()) ? '<td>&nbsp;</td>' : '';
+			$mediaTh = ($hasMedia) ? '<th>Media</th>' : '';
+			$noteTh = ($hasNotes) ? '<th>Notes</th>' : '';
+
+			$rendered = [];
+			foreach ($items as $item)
+			{
+				$rendered[] = renderTemplate(__DIR__ . '/list-item.php', [
+						'_' => $_,
+						'collection_type' => $collection_type,
+						'hasMedia' => $hasMedia,
+						'hasNotes' => $hasNotes,
+						'helper' => $helper,
+						'item' => $item,
+				]);
+			}
+			$rows = implode('', array_map('mb_trim', $rendered));
+
+			return <<<HTML
 				<table class="full-width media-wrap">
 					<thead>
-					<tr>
-						<?php if ($auth->isAuthenticated()): ?>
-							<td>Actions</td>
-						<?php endif ?>
-						<th>Title</th>
-						<th>Episode Count</th>
-						<th>Episode Length</th>
-						<th>Show Type</th>
-						<th>Age Rating</th>
-						<th>Genres</th>
-						<th>Notes</th>
-					</tr>
+						<tr>
+							{$firstTh}
+							<th>Title</th>
+							{$mediaTh}
+							<th class='numeric'>Episode Count</th>
+							<th class='numeric'>Episode Length</th>
+							<th>Show Type</th>
+							<th class='rating'>Age Rating</th>
+							{$noteTh}
+							<th>Genres</th>
+						</tr>
 					</thead>
-					<tbody>
-					<?php foreach ($items as $item): ?>
-						<?php include __DIR__ . '/list-item.php' ?>
-					<?php endforeach ?>
-					</tbody>
+					<tbody>{$rows}</tbody>
 				</table>
-				<?php endforeach; ?>
-			</div>
-		</div>
+HTML;
+
+		}) ?>
 	<?php endif ?>
 </main>
-<script defer="defer" src="<?= $urlGenerator->assetUrl('js/tables.min.js') ?>"></script>
+<script defer="defer" src="<?= $_->assetUrl('js/tables.min.js') ?>"></script>

app/views/collection/media-select-list.php

@@ -0,0 +1,11 @@
+<select name="media_id[]" id="media_id" multiple size="13">
+	<?php foreach ($media_items as $group => $items): ?>
+		<optgroup label='<?= $group ?>'>
+			<?php foreach ($items as $id => $name): ?>
+				<option <?= in_array($id, ($item['media_id'] ?? []), FALSE) ? 'selected="selected"' : '' ?> value="<?= $id ?>">
+					<?= $name ?>
+				</option>
+			<?php endforeach ?>
+		</optgroup>
+	<?php endforeach ?>
+</select>

app/views/footer.php

@@ -11,12 +11,6 @@
 	</div>
 </section>
 <script nomodule="nomodule" src="https://polyfill.io/v3/polyfill.min.js?features=es5%2CObject.assign"></script>
-<?php if ($auth->isAuthenticated()): ?>
-<script nomodule='nomodule' async="async" defer="defer" src="<?= $urlGenerator->assetUrl('js/scripts-authed.min.js') ?>"></script>
-<script type="module" src="<?= $urlGenerator->assetUrl('js/src/index-authed.js') ?>"></script>
-<?php else: ?>
-<script nomodule="nomodule" async="async" defer="defer" src="<?= $urlGenerator->assetUrl('js/scripts.min.js') ?>"></script>
-<script type="module" src="<?= $urlGenerator->assetUrl('js/src/index.js') ?>"></script>
-<?php endif ?>
+<script async="async" defer="defer" src="<?= $_->assetUrl('js/scripts.min.js') ?>"></script>
 </body>
 </html>

app/views/header.php

@@ -6,29 +6,25 @@
 	<meta http-equiv="cache-control" content="no-store" />
 	<meta http-equiv="Content-Security-Policy" content="script-src 'self'" />
 	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1, user-scalable=1" />
-	<?php if ($config->get('theme') !== 'auto'): ?>
-		<link rel="stylesheet" href="<?= $urlGenerator->assetUrl('css/app.min.css') ?>" />
-	<?php elseif ($config->get('theme') === 'auto'): ?>
-		<link rel="stylesheet" href="<?= $urlGenerator->assetUrl('css/dark-auto.min.css') ?>" />
-	<?php endif ?>
-	<link rel="<?= $config->get('theme') === 'dark' ? '' : 'alternate ' ?>stylesheet" title="Dark Theme" href="<?= $urlGenerator->assetUrl('css/dark.min.css') ?>" />
-	<link rel="icon" href="<?= $urlGenerator->assetUrl('images/icons/favicon.ico') ?>" />
-	<link rel="apple-touch-icon" sizes="57x57" href="<?= $urlGenerator->assetUrl('images/icons/apple-icon-57x57.png') ?>">
-	<link rel="apple-touch-icon" sizes="60x60" href="<?= $urlGenerator->assetUrl('images/icons/apple-icon-60x60.png') ?>">
-	<link rel="apple-touch-icon" sizes="72x72" href="<?= $urlGenerator->assetUrl('images/icons/apple-icon-72x72.png') ?>">
-	<link rel="apple-touch-icon" sizes="76x76" href="<?= $urlGenerator->assetUrl('images/icons/apple-icon-76x76.png') ?>">
-	<link rel="apple-touch-icon" sizes="114x114" href="<?= $urlGenerator->assetUrl('images/icons/apple-icon-114x114.png') ?>">
-	<link rel="apple-touch-icon" sizes="120x120" href="<?= $urlGenerator->assetUrl('images/icons/apple-icon-120x120.png') ?>">
-	<link rel="apple-touch-icon" sizes="144x144" href="<?= $urlGenerator->assetUrl('images/icons/apple-icon-144x144.png') ?>">
-	<link rel="apple-touch-icon" sizes="152x152" href="<?= $urlGenerator->assetUrl('images/icons/apple-icon-152x152.png') ?>">
-	<link rel="apple-touch-icon" sizes="180x180" href="<?= $urlGenerator->assetUrl('images/icons/apple-icon-180x180.png') ?>">
-	<link rel="icon" type="image/png" sizes="192x192"  href="<?= $urlGenerator->assetUrl('images/icons/android-icon-192x192.png') ?>">
-	<link rel="icon" type="image/png" sizes="32x32" href="<?= $urlGenerator->assetUrl('images/icons/favicon-32x32.png') ?>">
-	<link rel="icon" type="image/png" sizes="96x96" href="<?= $urlGenerator->assetUrl('images/icons/favicon-96x96.png') ?>">
-	<link rel="icon" type="image/png" sizes="16x16" href="<?= $urlGenerator->assetUrl('images/icons/favicon-16x16.png') ?>">
+	<link rel="stylesheet" href="<?= $_->assetUrl('css/' . $_->config->get('theme') . '.min.css') ?>" />
+	<link rel="<?= $_->config->get('theme') === 'dark' ? '' : 'alternate ' ?>stylesheet" title="Dark Theme" href="<?= $_->assetUrl('css/dark.min.css') ?>" />
+	<link rel="icon" href="<?= $_->assetUrl('images/icons/favicon.ico') ?>" />
+	<link rel="apple-touch-icon" sizes="57x57" href="<?= $_->assetUrl('images/icons/apple-icon-57x57.png') ?>">
+	<link rel="apple-touch-icon" sizes="60x60" href="<?= $_->assetUrl('images/icons/apple-icon-60x60.png') ?>">
+	<link rel="apple-touch-icon" sizes="72x72" href="<?= $_->assetUrl('images/icons/apple-icon-72x72.png') ?>">
+	<link rel="apple-touch-icon" sizes="76x76" href="<?= $_->assetUrl('images/icons/apple-icon-76x76.png') ?>">
+	<link rel="apple-touch-icon" sizes="114x114" href="<?= $_->assetUrl('images/icons/apple-icon-114x114.png') ?>">
+	<link rel="apple-touch-icon" sizes="120x120" href="<?= $_->assetUrl('images/icons/apple-icon-120x120.png') ?>">
+	<link rel="apple-touch-icon" sizes="144x144" href="<?= $_->assetUrl('images/icons/apple-icon-144x144.png') ?>">
+	<link rel="apple-touch-icon" sizes="152x152" href="<?= $_->assetUrl('images/icons/apple-icon-152x152.png') ?>">
+	<link rel="apple-touch-icon" sizes="180x180" href="<?= $_->assetUrl('images/icons/apple-icon-180x180.png') ?>">
+	<link rel="icon" type="image/png" sizes="192x192"  href="<?= $_->assetUrl('images/icons/android-icon-192x192.png') ?>">
+	<link rel="icon" type="image/png" sizes="32x32" href="<?= $_->assetUrl('images/icons/favicon-32x32.png') ?>">
+	<link rel="icon" type="image/png" sizes="96x96" href="<?= $_->assetUrl('images/icons/favicon-96x96.png') ?>">
+	<link rel="icon" type="image/png" sizes="16x16" href="<?= $_->assetUrl('images/icons/favicon-16x16.png') ?>">
 
 </head>
-<body class="<?= $escape->attr($url_type) ?> list">
+<body class="<?= $_->escape->attr($url_type) ?> list">
 	<?php include 'setup-check.php' ?>
 	<header>
 	<?php
@@ -43,5 +39,4 @@
 			}
 		}
 	?>
-
 	</header>

app/views/history.php

@@ -0,0 +1,47 @@
+<main class="details fixed">
+	<?php if (empty($items)): ?>
+		<h3>No recent history.</h3>
+	<?php else: ?>
+		<section>
+		<?php foreach ($items as $name => $item): ?>
+			<article class="flex flex-no-wrap flex-justify-start">
+				<section class="flex-self-center history-img">
+					<a href="<?= $item['url'] ?>">
+					<?= $_->h->img(
+						$item['coverImg'],
+						['width' => '110px', 'height' => '156px'],
+					) ?>
+					</a>
+				</section>
+				<section class="flex-self-center">
+					<?= $_->h->a($item['url'], $item['title']) ?>
+					<br />
+					<br />
+					<?= $item['action'] ?>
+					<br />
+					<small>
+						<?php if ( ! empty($item['dateRange'])):
+							[$startDate, $endDate] = array_map(
+								fn ($date) => $date->format('l, F d'),
+								$item['dateRange']
+							);
+							[$startTime, $endTime] = array_map(
+									fn ($date) => $date->format('h:i:s A'),
+									$item['dateRange']
+							);
+							?>
+							<?php if ($startDate === $endDate): ?>
+								<?= "{$startDate}, {$startTime} &ndash; {$endTime}" ?>
+							<?php else: ?>
+								<?= "{$startDate} {$startTime} &ndash; {$endDate} {$endTime}" ?>
+							<?php endif ?>
+						<?php else: ?>
+							<?= $item['updated']->format('l, F d h:i:s A') ?>
+						<?php endif ?>
+					</small>
+				</section>
+			</article>
+		<?php endforeach ?>
+		</section>
+	<?php endif ?>
+</main>

app/views/js-warning.php

@@ -0,0 +1,6 @@
+<noscript>
+<div class="message error">
+	<span class="icon"></span>
+	This feature requires Javascript to function :(
+</div>
+</noscript>

app/views/login.php

@@ -1,7 +1,7 @@
 <main>
-	<h2><?= $config->get('whose_list'); ?>'s Login</h2>
+	<h2><?= $_->config->get('whose_list'); ?>'s Login</h2>
 	<?= $message ?>
-	<form method="post" action="<?= $url->generate('login.post') ?>">
+	<form method="post" action="<?= $_->urlFromRoute('login.post') ?>">
 		<table class="form invisible">
 			<tr>
 				<td><label for="password">Password: </label></td>

app/views/main-menu.php

@@ -1,88 +1,114 @@
 <?php declare(strict_types=1);
+/**
+ * Hummingbird Anime List Client
+ *
+ * An API client for Kitsu to manage anime and manga watch lists
+ *
+ * PHP version 8.1
+ *
+ * @copyright   2015 - 2023  Timothy J. Warren <tim@timshome.page>
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     5.2
+ * @link        https://git.timshomepage.net/timw4mail/HummingBirdAnimeClient
+ */
 
 namespace Aviat\AnimeClient;
 
-$whose = $config->get('whose_list') . "'s ";
-$lastSegment = $urlGenerator->lastSegment();
+$whose = $_->config->get('whose_list') . "'s ";
+$lastSegment = $_->lastSegment();
 $extraSegment = $lastSegment === 'list' ? '/list' : '';
-$hasAnime = stripos($_SERVER['REQUEST_URI'], 'anime') !== FALSE;
-$hasManga = stripos($_SERVER['REQUEST_URI'], 'manga') !== FALSE;
+$hasAnime = str_contains($GLOBALS['_SERVER']['REQUEST_URI'], 'anime');
+$hasManga = str_contains($GLOBALS['_SERVER']['REQUEST_URI'], 'manga');
 
 ?>
 <div id="main-nav" class="flex flex-align-end flex-wrap">
 	<span class="flex-no-wrap grow-1">
-		<?php if(strpos($route_path, 'collection') === FALSE): ?>
-			<?= $helper->a(
-				$urlGenerator->defaultUrl($url_type),
-				$whose . ucfirst($url_type) . ' List'
+		<?php if( ! str_contains($route_path, 'collection')): ?>
+			<?= $_->h->a(
+				$_->defaultUrl($url_type),
+				$whose . ucfirst($url_type) . ' List',
+					['aria-current'=> 'page']
 			) ?>
-			<?php if($config->get("show_{$url_type}_collection")): ?>
-				[<?= $helper->a(
-					$url->generate("{$url_type}.collection.view") . $extraSegment,
+			<?php if($_->config->get("show_{$url_type}_collection")): ?>
+				[<?= $_->h->a(
+					$_->urlFromRoute("{$url_type}.collection.view") . $extraSegment,
 					ucfirst($url_type) . ' Collection'
 				) ?>]
 			<?php endif ?>
-			<?php if($config->get("show_{$other_type}_collection")): ?>
-				[<?= $helper->a(
-					$url->generate("{$other_type}.collection.view") . $extraSegment,
+			<?php if($_->config->get("show_{$other_type}_collection")): ?>
+				[<?= $_->h->a(
+					$_->urlFromRoute("{$other_type}.collection.view") . $extraSegment,
 					ucfirst($other_type) . ' Collection'
 				) ?>]
 			<?php endif ?>
-			[<?= $helper->a(
-				$urlGenerator->defaultUrl($other_type) . $extraSegment,
+			[<?= $_->h->a(
+				$_->defaultUrl($other_type) . $extraSegment,
 				ucfirst($other_type) . ' List'
 			) ?>]
 		<?php else: ?>
-			<?= $whose . ucfirst($url_type) . ' Collection' ?>
-			<?php if($config->get("show_{$other_type}_collection")): ?>
-				[<?= $helper->a(
-					$url->generate("{$other_type}.collection.view") . $extraSegment,
+			<?= $_->h->a(
+					$_->urlFromRoute("{$url_type}.collection.view") . $extraSegment,
+					$whose . ucfirst($url_type) . ' Collection',
+					['aria-current'=> 'page']
+			) ?>
+			<?php if($_->config->get("show_{$other_type}_collection")): ?>
+				[<?= $_->h->a(
+					$_->urlFromRoute("{$other_type}.collection.view") . $extraSegment,
 					ucfirst($other_type) . ' Collection'
 				) ?>]
 			<?php endif ?>
-			[<?= $helper->a($urlGenerator->defaultUrl('anime') . $extraSegment, 'Anime List') ?>]
-			[<?= $helper->a($urlGenerator->defaultUrl('manga') . $extraSegment, 'Manga List') ?>]
+			[<?= $_->h->a($_->defaultUrl('anime') . $extraSegment, 'Anime List') ?>]
+			[<?= $_->h->a($_->defaultUrl('manga') . $extraSegment, 'Manga List') ?>]
 		<?php endif ?>
-		<?php if ($auth->isAuthenticated() && $config->get(['cache', 'driver']) !== 'null'): ?>
+		<?php if ($_->isAuthenticated() && $_->config->get(['cache', 'driver']) !== 'null'): ?>
 			<span class="flex-no-wrap small-font">
 			<button type="button" class="js-clear-cache user-btn">Clear API Cache</button>
 		</span>
 		<?php endif ?>
 	</span>
 
-	<span class="flex-no-wrap small-font">[<?= $helper->a(
-		$url->generate('default_user_info'),
-		'About '. $config->get('whose_list')
+	<span class="flex-no-wrap small-font">[<?= $_->h->a(
+		$_->urlFromRoute('default_user_info'),
+		'About '. $_->config->get('whose_list')
 	) ?>]</span>
 
-	<?php if ($auth->isAuthenticated()): ?>
+	<?php if ($_->isAuthenticated()): ?>
 		<span class="flex-no-wrap small-font">
-		<?= $helper->a(
-			$url->generate('settings'),
+		<?= $_->h->a(
+			$_->urlFromRoute('settings'),
 			'Settings',
 			['class' => 'bracketed']
 		) ?>
 		</span>
 		<span class="flex-no-wrap small-font">
-		<?= $helper->a(
-			$url->generate('logout'),
+		<?= $_->h->a(
+			$_->urlFromRoute('logout'),
 			'Logout',
 			['class' => 'bracketed']
 		) ?>
 		</span>
 	<?php else: ?>
 		<span class="flex-no-wrap small-font">
-		[<?= $helper->a($url->generate('login'), "{$whose} Login") ?>]
+		[<?= $_->h->a($_->urlFromRoute('login'), "{$whose} Login") ?>]
 		</span>
 	<?php endif ?>
 </div>
+<?php if ($_->isViewPage() && ($hasAnime || $hasManga)): ?>
 <nav>
-	<?php if ($container->get('util')->isViewPage() && ($hasAnime || $hasManga)): ?>
-		<?= $helper->menu($menu_name) ?>
+		<?= $_->h->menu($menu_name) ?>
+		<?php if (stripos($GLOBALS['_SERVER']['REQUEST_URI'], 'history') === FALSE): ?>
 		<br />
 		<ul>
-			<li class="<?= Util::isNotSelected('list', $lastSegment) ?>"><a href="<?= $urlGenerator->url($route_path) ?>">Cover View</a></li>
-			<li class="<?= Util::isSelected('list', $lastSegment) ?>"><a href="<?= $urlGenerator->url("{$route_path}/list") ?>">List View</a></li>
+			<?php $currentView = Util::eq('list', $lastSegment) ? 'list' : 'cover' ?>
+			<li class="<?= Util::isNotSelected('list', $lastSegment) ?>">
+				<a aria-current="<?= Util::ariaCurrent($currentView === 'cover') ?>"
+						href="<?= $_->urlFromPath($route_path) ?>">Cover View</a>
+			</li>
+			<li class="<?= Util::isSelected('list', $lastSegment) ?>">
+				<a aria-current="<?= Util::ariaCurrent($currentView === 'list') ?>"
+						href="<?= $_->urlFromPath("{$route_path}/list") ?>">List View</a>
+			</li>
 		</ul>
-	<?php endif ?>
+		<?php endif ?>
 </nav>
+<?php endif ?>

app/views/manga/add.php

@@ -1,7 +1,8 @@
-<?php if ($auth->isAuthenticated()): ?>
+<?php if ($_->isAuthenticated()): ?>
 <main>
 	<h2>Add Manga to your List</h2>
 	<form action="<?= $action_url ?>" method="post">
+		<?php include realpath(__DIR__ . '/../js-warning.php') ?>
 		<section>
 			<div class="cssload-loader" hidden="hidden">
 				<div class="cssload-inner cssload-one"></div>

app/views/manga/cover.php

@@ -1,6 +1,6 @@
 <main class="media-list">
-<?php if ($auth->isAuthenticated()): ?>
-<a class="bracketed" href="<?= $url->generate('manga.add.get') ?>">Add Item</a>
+<?php if ($_->isAuthenticated()): ?>
+<a class="bracketed" href="<?= $_->urlFromRoute('manga.add.get') ?>">Add Item</a>
 <?php endif ?>
 <?php if (empty($sections)): ?>
 <h3>There's nothing here!</h3>
@@ -11,80 +11,15 @@
 	<?php foreach ($sections as $name => $items): ?>
 	<?php if (empty($items)): ?>
 		<section class="status">
-			<h2><?= $escape->html($name) ?></h2>
+			<h2><?= $_->escape->html($name) ?></h2>
 			<h3>There's nothing here!</h3>
 		</section>
 	<?php else: ?>
 		<section class="status">
-			<h2><?= $escape->html($name) ?></h2>
+			<h2><?= $_->escape->html($name) ?></h2>
 			<section class="media-wrap">
 				<?php foreach($items as $item): ?>
-				<article class="media" data-kitsu-id="<?= $item['id'] ?>" data-mal-id="<?= $item['mal_id'] ?>">
-					<?php if ($auth->isAuthenticated()): ?>
-					<div class="edit-buttons" hidden>
-						<button class="plus-one-chapter">+1 Chapter</button>
-						<?php /* <button class="plus-one-volume">+1 Volume</button> */ ?>
-					</div>
-					<?php endif ?>
-					<?= $helper->picture("images/manga/{$item['manga']['id']}.webp") ?>
-					<div class="name">
-						<a href="<?= $url->generate('manga.details', ['id' => $item['manga']['slug']]) ?>">
-						<?= $escape->html($item['manga']['title']) ?>
-						<?php foreach($item['manga']['titles'] as $title): ?>
-							<br /><small><?= $title ?></small>
-						<?php endforeach ?>
-						</a>
-					</div>
-					<div class="table">
-						<?php if ($auth->isAuthenticated()): ?>
-						<div class="row">
-							<span class="edit">
-								<a class="bracketed"
-									title="Edit information about this manga"
-									href="<?= $url->generate('edit', [
-										'controller' => 'manga',
-										'id' => $item['id'],
-										'status' => $name
-									]) ?>">
-									Edit
-								</a>
-							</span>
-						</div>
-						<?php endif ?>
-						<div class="row">
-							<div><?= $item['manga']['type'] ?></div>
-							<div class="user-rating">Rating: <?= $item['user_rating'] ?> / 10</div>
-						</div>
-
-						<?php if ($item['rereading']): ?>
-						<div class="row">
-							<?php foreach(['rereading'] as $attr): ?>
-							<?php if($item[$attr]): ?>
-								<span class="item-<?= $attr ?>"><?= ucfirst($attr) ?></span>
-							<?php endif ?>
-							<?php endforeach ?>
-						</div>
-						<?php endif ?>
-
-						<?php if ($item['reread'] > 0): ?>
-						<div class="row">
-							<div>Reread <?= $item['reread'] ?> time(s)</div>
-						</div>
-						<?php endif ?>
-
-						<div class="row">
-							<div class="chapter_completion">
-								Chapters: <span class="chapters_read"><?= $item['chapters']['read'] ?></span> /
-									<span class="chapter_count"><?= $item['chapters']['total'] ?></span>
-							</div>
-						<?php /* </div>
-						<div class="row"> */ ?>
-							<div class="volume_completion">
-								Volumes: <span class="volume_count"><?= $item['volumes']['total'] ?></span>
-							</div>
-						</div>
-					</div>
-				</article>
+					<?= $component->mangaCover($item, $name) ?>
 				<?php endforeach ?>
 			</section>
 		</section>

app/views/manga/details.php

@@ -1,23 +1,51 @@
 <main class="details fixed">
 	<section class="flex flex-no-wrap">
 		<aside class="info">
-			<?= $helper->picture("images/manga/{$data['id']}-original.webp", 'jpg', ['class' => 'cover']) ?>
+			<?= $_->h->img($data['cover_image'], ['class' => 'cover', 'width' => '350']) ?>
 
 			<br />
 
 			<table class="media-details">
 				<tr>
-					<td>Manga Type</td>
-					<td><?= ucfirst($data['manga_type']) ?></td>
+					<td class="align-right">Publishing Status</td>
+					<td><?= $data['status'] ?></td>
 				</tr>
+				<tr>
+					<td>Manga Type</td>
+					<td><?= ucfirst(strtolower($data['manga_type'])) ?></td>
+				</tr>
+				<?php if ( ! empty($data['volume_count'])): ?>
 				<tr>
 					<td>Volume Count</td>
 					<td><?= $data['volume_count'] ?></td>
 				</tr>
+				<?php endif ?>
+				<?php if ( ! empty($data['chapter_count'])): ?>
 				<tr>
 					<td>Chapter Count</td>
 					<td><?= $data['chapter_count'] ?></td>
 				</tr>
+				<?php endif ?>
+
+				<?php if ( ! empty($data['age_rating'])): ?>
+					<tr>
+						<td>Age Rating</td>
+						<td><abbr title="<?= $data['age_rating_guide'] ?>"><?= $data['age_rating'] ?></abbr>
+						</td>
+					</tr>
+				<?php endif ?>
+
+				<?php if (count($data['links']) > 0): ?>
+					<tr>
+						<td>External Links</td>
+						<td>
+							<?php foreach ($data['links'] as $urlName => $externalUrl): ?>
+								<a rel='external' href="<?= $externalUrl ?>"><?= $urlName ?></a><br />
+							<?php endforeach ?>
+						</td>
+					</tr>
+				<?php endif ?>
+
 				<tr>
 					<td>Genres</td>
 					<td>
@@ -29,8 +57,8 @@
 			<br />
 		</aside>
 		<article class="text">
-			<h2 class="toph"><a rel="external" href="<?= $data['url'] ?>"><?= $data['title'] ?></a></h2>
-			<?php foreach ($data['titles'] as $title): ?>
+			<h2 class="toph"><?= $data['title'] ?></h2>
+			<?php foreach ($data['titles_more'] as $title): ?>
 				<h3><?= $title ?></h3>
 			<?php endforeach ?>
 
@@ -44,61 +72,34 @@
 	<?php if (count($data['characters']) > 0): ?>
 		<h2>Characters</h2>
 
-		<div class="tabs">
-			<?php $i = 0 ?>
-			<?php foreach ($data['characters'] as $role => $list): ?>
-				<input
-					type="radio" name="character-role-tabs"
-					id="character-tabs<?= $i ?>" <?= $i === 0 ? 'checked' : '' ?> />
-				<label for="character-tabs<?= $i ?>"><?= ucfirst($role) ?></label>
-				<section class="content media-wrap flex flex-wrap flex-justify-start">
-					<?php foreach ($list as $id => $char): ?>
-						<?php if ( ! empty($char['image']['original'])): ?>
-							<article class="<?= $role === 'supporting' ? 'small-' : '' ?>character">
-								<?php $link = $url->generate('character', ['slug' => $char['slug']]) ?>
-								<div class="name">
-									<?= $helper->a($link, $char['name']); ?>
-								</div>
-								<a href="<?= $link ?>">
-									<?= $helper->picture("images/characters/{$id}.webp") ?>
-								</a>
-							</article>
-						<?php endif ?>
-					<?php endforeach ?>
-				</section>
-				<?php $i++ ?>
-			<?php endforeach ?>
-		</div>
+		<?= $component->tabs('manga-characters', $data['characters'], static function($list, $role) use ($component, $helper, $_) {
+			$rendered = [];
+			foreach ($list as $id => $char)
+			{
+				$rendered[] = $component->character(
+					$char['name'],
+					$_->urlFromRoute('character', ['slug' => $char['slug']]),
+					$_->h->img($char['image'], ['loading' => 'lazy']),
+					($role !== 'main') ? 'small-character' : 'character'
+				);
+			}
+
+			return implode('', array_map('mb_trim', $rendered));
+		}) ?>
 	<?php endif ?>
 
 	<?php if (count($data['staff']) > 0): ?>
 		<h2>Staff</h2>
 
-		<div class="vertical-tabs">
-			<?php $i = 0 ?>
-			<?php foreach ($data['staff'] as $role => $people): ?>
-				<div class="tab">
-					<input
-						type="radio" name="staff-roles" id="staff-role<?= $i ?>" <?= $i === 0 ? 'checked' : '' ?> />
-					<label for="staff-role<?= $i ?>"><?= $role ?></label>
-					<section class='content media-wrap flex flex-wrap flex-justify-start'>
-						<?php foreach ($people as $pid => $person): ?>
-							<article class='character person'>
-								<?php $link = $url->generate('person', ['id' => $pid]) ?>
-								<div class="name">
-									<a href="<?= $link ?>">
-										<?= $person['name'] ?>
-									</a>
-								</div>
-								<a href="<?= $link ?>">
-									<?= $helper->picture("images/people/{$pid}.webp") ?>
-								</a>
-							</article>
-						<?php endforeach ?>
-					</section>
-				</div>
-				<?php $i++ ?>
-			<?php endforeach ?>
-		</div>
+		<?= $component->verticalTabs('manga-staff', $data['staff'],
+				fn($people) => implode('', array_map(
+						fn ($person) => $component->character(
+							$person['name'],
+							$_->urlFromRoute('person', ['slug' => $person['slug']]),
+							$_->h->img($person['image']),
+						),
+						$people
+				))
+		) ?>
 	<?php endif ?>
 </main>

app/views/manga/edit.php

@@ -1,4 +1,4 @@
-<?php if ($auth->isAuthenticated()): ?>
+<?php if ($_->isAuthenticated()): ?>
 	<main>
 		<h2>
 			Edit Manga List Item
@@ -8,9 +8,9 @@
 				<thead>
 				<tr>
 					<th>
-						<h3><?= $escape->html($item['manga']['title']) ?></h3>
+						<h3><?= $_->escape->html($item['manga']['title']) ?></h3>
 						<?php foreach ($item['manga']['titles'] as $title): ?>
-							<h4><?= $escape->html($title) ?></h4>
+							<h4><?= $_->escape->html($title) ?></h4>
 						<?php endforeach ?>
 					</th>
 				</tr>
@@ -18,7 +18,7 @@
 				<tbody>
 				<tr>
 					<td rowspan="9">
-						<?= $helper->picture("images/manga/{$item['manga']['id']}-original.webp", "jpg", [], ["width" => "390"]) ?>
+						<?= $_->h->img($item['manga']['image']) ?>
 					</td>
 				</tr>
 				<tr>
@@ -46,13 +46,6 @@
 							   value="<?= $item['chapters']['read'] ?>"/> / <?= $item['chapters']['total'] ?>
 					</td>
 				</tr>
-				<tr>
-					<td><label for="volumes_read">Volumes Read</label></td>
-					<td>
-						<?php /*<input type="number" disabled="disabled" min="0" name="volumes_read" id="volumes_read" value="" /> */ ?>
-						- / <?= $item['volumes']['total'] ?>
-					</td>
-				</tr>
 				<tr>
 					<td><label for="rereading_flag">Rereading?</label></td>
 					<td>
@@ -71,7 +64,7 @@
 				<tr>
 					<td><label for="notes">Notes</label></td>
 					<td>
-						<textarea name="notes" id="notes"><?= $escape->html($item['notes']) ?></textarea>
+						<textarea name="notes" id="notes"><?= $_->escape->html($item['notes']) ?></textarea>
 					</td>
 				</tr>
 				<tr>
@@ -90,7 +83,7 @@
 		</form>
 		<fieldset>
 			<legend>Danger Zone</legend>
-			<form class="js-delete" action="<?= $url->generate('manga.delete') ?>" method="post">
+			<form class="js-delete" action="<?= $_->urlFromRoute('manga.delete') ?>" method="post">
 				<table class="form invisible">
 					<tbody>
 					<tr>

app/views/manga/list.php

@@ -1,6 +1,6 @@
 <main class="media-list">
-<?php if ($auth->isAuthenticated()): ?>
-<a class="bracketed" href="<?= $url->generate('manga.add.get') ?>">Add Item</a>
+<?php if ($_->isAuthenticated()): ?>
+<a class="bracketed" href="<?= $_->urlFromRoute('manga.add.get') ?>">Add Item</a>
 <?php endif ?>
 <?php if (empty($sections)): ?>
 <h3>There's nothing here!</h3>
@@ -16,24 +16,22 @@
 		<table class='media-wrap'>
 			<thead>
 				<tr>
-					<?php if ($auth->isAuthenticated()): ?>
+					<?php if ($_->isAuthenticated()): ?>
 					<td>&nbsp;</td>
 					<?php endif ?>
 					<th>Title</th>
-					<th>Rating</th>
-					<th>Completed Chapters</th>
-					<th># of Volumes</th>
+					<th class='numeric'>Score</th>
+					<th class='numeric'>Completed Chapters</th>
 					<th>Attributes</th>
 					<th>Type</th>
-					<th>Genres</th>
 				</tr>
 			</thead>
 			<tbody>
 				<?php foreach($items as $item): ?>
 				<tr id="manga-<?= $item['id'] ?>">
-					<?php if($auth->isAuthenticated()): ?>
+					<?php if($_->isAuthenticated()): ?>
 					<td>
-						<a class="bracketed" href="<?= $url->generate('edit', [
+						<a class="bracketed" href="<?= $_->urlFromRoute('edit', [
 							'controller' => 'manga',
 							'id' => $item['id'],
 							'status' => $name
@@ -41,7 +39,7 @@
 					</td>
 					<?php endif ?>
 					<td class="align-left">
-						<a href="<?= $url->generate('manga.details', ['id' => $item['manga']['slug']]) ?>">
+						<a href="<?= $_->urlFromRoute('manga.details', ['id' => $item['manga']['slug']]) ?>">
 							<?= $item['manga']['title'] ?>
 						</a>
 						<?php foreach($item['manga']['titles'] as $title): ?>
@@ -50,11 +48,16 @@
 					</td>
 					<td><?= $item['user_rating'] ?> / 10</td>
 					<td><?= $item['chapters']['read'] ?> / <?= $item['chapters']['total'] ?></td>
-					<td><?= $item['volumes']['total'] ?></td>
 					<td>
 	                    <ul>
-						<?php if ($item['reread'] > 0): ?>
-	                        <li>Reread <?= $item['reread'] ?> time(s)</li>
+						<?php if ($item['reread'] == 1): ?>
+							<li>Reread once</li>
+						<?php elseif ($item['reread'] == 2): ?>
+							<li>Reread twice</li>
+						<?php elseif ($item['reread'] == 3): ?>
+							<li>Reread thrice</li>
+						<?php elseif ($item['reread'] > 3): ?>
+							<li>Reread <?= $item['reread'] ?> times</li>
 						<?php endif ?>
 						<?php foreach(['rereading'] as $attr): ?>
 							<?php if($item[$attr]): ?>
@@ -64,9 +67,6 @@
 	                    </ul>
 					</td>
 					<td><?= $item['manga']['type'] ?></td>
-					<td class="align-left">
-						<?= implode(', ', $item['manga']['genres']) ?>
-					</td>
 				</tr>
 				<?php endforeach ?>
 			</tbody>
@@ -75,4 +75,4 @@
 	<?php endforeach ?>
 <?php endif ?>
 </main>
-<script defer="defer" src="<?= $urlGenerator->assetUrl('js/tables.min.js') ?>"></script>
+<script defer="defer" src="<?= $_->assetUrl('js/tables.min.js') ?>"></script>

app/views/message.php

@@ -1,5 +1,5 @@
-<div class="message <?= $escape->attr($message_type) ?>">
+<div class="message <?= $_->escape->attr($message_type) ?>">
 	<span class="icon"></span>
-	<?= $escape->html($message) ?>
+	<?= $_->escape->html($message) ?>
 	<span class="close"></span>
 </div>

app/views/person/character-mapping.php

@@ -1,67 +0,0 @@
-<?php
-use function Aviat\AnimeClient\getLocalImg;
-use Aviat\AnimeClient\API\Kitsu;
-?>
-<h3>Voice Acting Roles</h3>
-<div class="tabs">
-<?php $i = 0; ?>
-<?php foreach($data['characters'] as $role => $characterList): ?>
-	<input <?= $i === 0 ? 'checked="checked"' : '' ?> type="radio" name="character-type-tabs" id="character-type-<?= $i ?>" />
-	<label for="character-type-<?= $i ?>"><h5><?= ucfirst($role) ?></h5></label>
-	<section class="content">
-		<table class="borderless max-table">
-			<tr>
-				<th>Character</th>
-				<th>Series</th>
-			</tr>
-			<?php foreach ($characterList as $cid => $character): ?>
-				<tr>
-					<td>
-						<article class="character">
-							<?php
-							$link = $url->generate('character', ['slug' => $character['character']['slug']]);
-							?>
-							<a href="<?= $link ?>">
-								<?php $imgPath = ($character['character']['image'] === NULL)
-									? 'images/characters/empty.png'
-									: getLocalImg($character['character']['image']['original']);
-
-									echo $helper->picture($imgPath);
-								?>
-								<div class="name">
-									<?= $character['character']['canonicalName'] ?>
-								</div>
-							</a>
-						</article>
-					</td>
-					<td>
-						<section class="align-left media-wrap">
-							<?php foreach ($character['media'] as $sid => $series): ?>
-								<article class="media">
-									<?php
-									$link = $url->generate('anime.details', ['id' => $series['slug']]);
-									$titles = Kitsu::filterTitles($series);
-									?>
-									<a href="<?= $link ?>">
-										<?= $helper->picture("images/anime/{$sid}.webp") ?>
-									</a>
-									<div class="name">
-										<a href="<?= $link ?>">
-											<?= array_shift($titles) ?>
-											<?php foreach ($titles as $title): ?>
-												<br />
-												<small><?= $title ?></small>
-											<?php endforeach ?>
-										</a>
-									</div>
-								</article>
-							<?php endforeach ?>
-						</section>
-					</td>
-				</tr>
-			<?php endforeach; ?>
-		</table>
-	</section>
-	<?php $i++ ?>
-<?php endforeach ?>
-</div>

app/views/person/details.php

@@ -1,21 +1,28 @@
-<?php
-
-use Aviat\AnimeClient\API\Kitsu;
-
-?>
 <main class="details fixed">
 	<section class="flex flex-no-wrap">
 		<div>
-			<?= $helper->picture("images/people/{$data['id']}-original.webp", 'jpg', ['class' => 'cover' ]) ?>
+			<?= $_->h->img($data['image'], ['class' => 'cover' ]) ?>
 		</div>
 		<div>
 			<h2 class="toph"><?= $data['name'] ?></h2>
+			<?php foreach ($data['names'] as $name): ?>
+				<h3><?= $name ?></h3>
+			<?php endforeach ?>
+			<?php if ( ! empty($data['birthday'])): ?>
+				<h4><?= $data['birthday'] ?></h4>
+			<?php endif ?>
+			<br />
+			<hr />
+			<div class="description">
+				<p><?= str_replace("\n", '</p><p>', $data['description']) ?></p>
+			</div>
 		</div>
 	</section>
 
 	<?php if ( ! empty($data['staff'])): ?>
 		<section>
 			<h3>Castings</h3>
+
 			<div class="vertical-tabs">
 				<?php $i = 0 ?>
 				<?php foreach ($data['staff'] as $role => $entries): ?>
@@ -24,31 +31,17 @@ use Aviat\AnimeClient\API\Kitsu;
 							type="radio" name="staff-roles" id="staff-role<?= $i ?>" <?= $i === 0 ? 'checked' : '' ?> />
 						<label for="staff-role<?= $i ?>"><?= $role ?></label>
 						<?php foreach ($entries as $type => $casting): ?>
-							<?php if ($type === 'characters') continue; ?>
-							<?php if ( ! (empty($entries['manga']) || empty($entries['anime']))): ?>
+							<?php if (isset($entries['manga'], $entries['anime'])): ?>
 								<h4><?= ucfirst($type) ?></h4>
 							<?php endif ?>
-							<section class="content">
+							<section class="content media-wrap flex flex-wrap flex-justify-start">
 								<?php foreach ($casting as $sid => $series): ?>
-									<article class="media">
-										<?php
-										$mediaType = in_array($type, ['anime', 'manga'], TRUE) ? $type : 'anime';
-										$link = $url->generate("{$mediaType}.details", ['id' => $series['slug']]);
-										$titles = Kitsu::filterTitles($series);
-										?>
-										<a href="<?= $link ?>">
-											<?= $helper->picture("images/{$type}/{$sid}.webp") ?>
-										</a>
-										<div class="name">
-											<a href="<?= $link ?>">
-												<?= array_shift($titles) ?>
-												<?php foreach ($titles as $title): ?>
-													<br />
-													<small><?= $title ?></small>
-												<?php endforeach ?>
-											</a>
-										</div>
-									</article>
+									<?php $mediaType = in_array($type, ['anime', 'manga'], TRUE) ? $type : 'anime'; ?>
+									<?= $_->component->media(
+											$series['titles'],
+											$_->urlFromRoute("{$mediaType}.details", ['id' => $series['slug']]),
+											$_->h->img($series['image'], ['width' => 220, 'loading' => 'lazy'])
+									) ?>
 								<?php endforeach; ?>
 							</section>
 						<?php endforeach ?>
@@ -59,9 +52,53 @@ use Aviat\AnimeClient\API\Kitsu;
 		</section>
 	<?php endif ?>
 
-	<?php if ( ! (empty($data['characters']['main']) || empty($data['characters']['supporting']))): ?>
+	<?php if ( ! empty($data['characters'])): ?>
 		<section>
-			<?php include 'character-mapping.php' ?>
+			<h3>Voice Acting Roles</h3>
+			<?= $component->tabs('voice-acting-roles', $data['characters'], static function ($characterList) use ($component, $helper, $_) {
+				$voiceRoles = [];
+				foreach ($characterList as $cid => $item):
+					$character = $component->character(
+						$item['character']['canonicalName'],
+						$_->urlFromRoute('character', ['slug' => $item['character']['slug']]),
+						$_->h->img($item['character']['image'], ['loading' => 'lazy']),
+					);
+					$medias = [];
+					foreach ($item['media'] as $sid => $series)
+					{
+						$medias[] = $component->media(
+							$series['titles'],
+							$_->urlFromRoute('anime.details', ['id' => $series['slug']]),
+							$_->h->img($series['image'], ['width' => 220, 'loading' => 'lazy'])
+						);
+					}
+					$media = implode('', array_map('mb_trim', $medias));
+
+					$voiceRoles[] = <<<HTML
+						<tr>
+							<td>{$character}</td>
+							<td>
+								<section class="align-left media-wrap">{$media}</section>
+							</td>
+						</tr>
+HTML;
+				endforeach;
+
+				$roles = implode('', array_map('mb_trim', $voiceRoles));
+
+				return <<<HTML
+					<table class="borderless max-table">
+						<thead>
+							<tr>
+								<th>Character</th>
+								<th>Series</th>
+							</tr>
+						</thead>
+						<tbody>{$roles}</tbody>
+					</table>
+HTML;
+
+			}) ?>
 		</section>
 	<?php endif ?>
 </main>

app/views/settings/_anilist.php

@@ -0,0 +1,24 @@
+<?php if ( ! $hasRequiredAnilistConfig): ?>
+	<p class="static-message info">See the <a href="https://git.timshomepage.net/timw4mail/HummingBirdAnimeClient/wiki/anilist">wiki</a> to learn how to set up Anilist integration. </p>
+<?php else: ?>
+	<?php $auth = $anilistModel->checkAuth(); ?>
+	<?php if (array_key_exists('errors', $auth)): ?>
+		<p class="static-message error">Anilist API Client is Not Authorized.</p>
+		<?= $_->h->a(
+			$_->urlFromRoute('anilist-redirect'),
+			'Link Anilist Account',
+			['class' => 'bracketed user-btn']
+		) ?>
+	<?php else: ?>
+		<?php $expires = $_->config->get(['anilist', 'access_token_expires']); ?>
+		<p class="static-message info">
+			Linked to Anilist. Your access token will expire around <?= date('F j, Y, g:i a T', $expires) ?>
+		</p>
+		<?php require __DIR__ . '/_form.php' ?>
+		<?= $_->h->a(
+			$_->urlFromRoute('anilist-redirect'),
+			'Update Access Token',
+			['class' => 'bracketed user-btn']
+		) ?>
+	<?php endif ?>
+<?php endif ?>

app/views/settings/_field.php

@@ -0,0 +1,5 @@
+<article>
+	<label for="<?= $fieldName ?>"><?= $field['title'] ?></label><br />
+	<small><?= $field['description'] ?></small><br />
+	<?= $_->h->field($fieldName, $field); ?>
+</article>

app/views/settings/_form.php

@@ -6,19 +6,19 @@
 ?>
 
 <?php foreach ($fields as $name => $field): ?>
-	<?php $fieldname = ($section === 'config' || $nestedPrefix !== 'config') ? "{$nestedPrefix}[{$name}]" : "{$nestedPrefix}[{$section}][{$name}]"; ?>
+	<?php
+		$fieldName = ($section === 'config' || $nestedPrefix !== 'config')
+				? "{$nestedPrefix}[{$name}]"
+				: "{$nestedPrefix}[{$section}][{$name}]";
+	?>
 	<?php if ($field['type'] === 'subfield'): ?>
 		<section>
 			<h4><?= $field['title'] ?></h4>
-			<?php include_once '_form.php'; ?>
+			<?php include '_subfield.php'; ?>
 		</section>
 	<?php elseif ( ! empty($field['display'])): ?>
-		<article>
-			<label for="<?= $fieldname ?>"><?= $field['title'] ?></label><br />
-			<small><?= $field['description'] ?></small><br />
-			<?= $helper->field($fieldname, $field); ?>
-		</article>
+		<?php include '_field.php' ?>
 	<?php else: ?>
-		<?php $hiddenFields[] = $helper->field($fieldname, $field); ?>
+		<?php $hiddenFields[] = $_->h->field($fieldName, $field); ?>
 	<?php endif ?>
 <?php endforeach ?>

app/views/settings/_subfield.php

@@ -0,0 +1,20 @@
+<?php
+// Higher scoped variables:
+// $field
+// $fields
+// $hiddenFields
+// $nestedPrefix
+?>
+
+<?php foreach ($field['fields'] as $name => $field): ?>
+	<?php
+		$fieldName = ($section === 'config' || $nestedPrefix !== 'config')
+			? "{$nestedPrefix}[{$name}]"
+			: "{$nestedPrefix}[{$section}][{$name}]";
+	?>
+	<?php if ( ! empty($field['display'])): ?>
+		<?php include '_field.php' ?>
+	<?php else: ?>
+		<?php $hiddenFields[] = $_->h->field($fieldName, $field); ?>
+	<?php endif ?>
+<?php endforeach ?>

app/views/settings/settings.php

@@ -1,5 +1,5 @@
 <?php
-if ( ! $auth->isAuthenticated())
+if ( ! $_->isAuthenticated())
 {
 	echo '<h1>Not Authorized</h1>';
 	return;
@@ -16,7 +16,7 @@ $hiddenFields = [];
 $nestedPrefix = 'config';
 ?>
 
-<form action="<?= $url->generate('settings-post') ?>" method="POST">
+<form action="<?= $_->urlFromRoute('settings-post') ?>" method="POST">
 	<main class='settings form'>
 		<button type="submit">Save Changes</button>
 		<div class="tabs">
@@ -28,27 +28,11 @@ $nestedPrefix = 'config';
 				/>
 				<label for="settings-tab<?= $i ?>"><h3><?= $sectionMapping[$section] ?></h3></label>
 				<section class="content">
-					<?php require __DIR__ . '/_form.php' ?>
-					<?php if ($section === 'anilist'): ?>
-						<hr />
-						<?php $auth = $anilistModel->checkAuth(); ?>
-						<?php if (array_key_exists('errors', $auth)): ?>
-							<p class="static-message error">Not Authorized.</p>
-							<?= $helper->a(
-								$url->generate('anilist-redirect'),
-								'Link Anilist Account'
-							) ?>
-						<?php else: ?>
-							<?php $expires = $config->get(['anilist', 'access_token_expires']); ?>
-							<p class="static-message info">
-								Linked to Anilist. Your access token will expire around <?= date('F j, Y, g:i a T', $expires) ?>
-							</p>
-							<?= $helper->a(
-								$url->generate('anilist-redirect'),
-								'Update Access Token'
-							) ?>
-						<?php endif ?>
-					<?php endif ?>
+					<?php
+						($section === 'anilist')
+							? require __DIR__ . '/_anilist.php'
+							: require __DIR__ . '/_form.php'
+					?>
 				</section>
 				<?php $i++; ?>
 			<?php endforeach ?>
@@ -60,7 +44,3 @@ $nestedPrefix = 'config';
 		<button type="submit">Save Changes</button>
 	</main>
 </form>
-
-
-
-

app/views/setup-check.php

@@ -2,7 +2,7 @@
 
 use function Aviat\AnimeClient\checkFolderPermissions;
 
-$setupErrors = checkFolderPermissions($container->get('config'));
+$setupErrors = checkFolderPermissions($_->config);
 ?>
 
 <?php if ( ! empty($setupErrors)): ?>

app/views/user/details.php

@@ -1,42 +1,60 @@
 <?php
-use Aviat\AnimeClient\API\Kitsu;
+use Aviat\AnimeClient\Kitsu;
 ?>
 <main class="user-page details">
 	<h2 class="toph">
-		<?= $helper->a(
-			"https://kitsu.io/users/{$data['slug']}",
-			$data['name'], [
-			'title' => 'View profile on Kitsu'
+		About
+		<?= $_->h->a(
+				"https://kitsu.io/users/{$data['slug']}",
+				$data['name'], [
+				'title' => 'View profile on Kitsu'
 		])
 		?>
 	</h2>
 
-	<p><?= $escape->html($data['about']) ?></p>
-
 	<section class="flex flex-no-wrap">
 		<aside class="info">
-			<center>
-				<?= $helper->img($urlGenerator->assetUrl($data['avatar']), ['alt' => '']); ?>
-			</center>
+			<table class="media-details invisible">
+				<tr>
+					<?php if($data['avatar'] !== null): ?>
+					<td><?= $_->h->img($data['avatar'], ['alt' => '', 'width' => '225']); ?></td>
+					<?php endif ?>
+					<td><?= $_->escape->html($data['about']) ?></td>
+				</tr>
+			</table>
 			<br />
 			<table class="media-details">
+				<?php foreach ([
+					'joinDate' => 'Joined',
+					'birthday' => 'Birthday',
+					'gender' => 'Gender',
+					'location' => 'Location'
+			   ] as $key => $label): ?>
+				<?php if ($data[$key] !== null): ?>
 				<tr>
-					<td>Location</td>
-					<td><?= $data['location'] ?></td>
+					<td><?= $label ?></td>
+					<td><?= $data[$key] ?></td>
 				</tr>
+				<?php endif ?>
+				<?php endforeach; ?>
+
+				<?php if ($data['website'] !== null): ?>
 				<tr>
 					<td>Website</td>
-					<td><?= $helper->a($data['website'], $data['website']) ?></td>
+					<td><?= $_->h->a($data['website'], $data['website']) ?></td>
 				</tr>
-				<?php if ( ! empty($data['waifu'])): ?>
+				<?php endif ?>
+
+				<?php if ($data['waifu']['character'] !== null): ?>
 				<tr>
-					<td><?= $escape->html($data['waifu']['label']) ?></td>
+					<td><?= $_->escape->html($data['waifu']['label']) ?></td>
 					<td>
 						<?php
 							$character = $data['waifu']['character'];
-							echo $helper->a(
-								$url->generate('character', ['slug' => $character['slug']]),
-								$character['canonicalName']
+							echo $_->component->character(
+									$character['names']['canonical'],
+									$_->urlFromRoute('character', ['slug' => $character['slug']]),
+									$_->h->img(Kitsu::getImage($character))
 							);
 						?>
 					</td>
@@ -57,79 +75,35 @@ use Aviat\AnimeClient\API\Kitsu;
 		<article>
 			<?php if ( ! empty($data['favorites'])): ?>
 			<h3>Favorites</h3>
-			<div class="tabs">
-				<?php $i = 0 ?>
-				<?php if ( ! empty($data['favorites']['characters'])): ?>
-					<input type="radio" name="user-favorites" id="user-fav-chars" <?= $i === 0 ? 'checked' : '' ?> />
-					<label for="user-fav-chars">Characters</label>
-					<section class="content full-width media-wrap">
-					<?php foreach($data['favorites']['characters'] as $id => $char): ?>
-						<?php if ( ! empty($char['image']['original'])): ?>
-						<article class="character">
-							<?php $link = $url->generate('character', ['slug' => $char['slug']]) ?>
-							<div class="name"><?= $helper->a($link, $char['canonicalName']); ?></div>
-							<a href="<?= $link ?>">
-								<?= $helper->picture("images/characters/{$char['id']}.webp") ?>
-							</a>
-						</article>
-						<?php endif ?>
-					<?php endforeach ?>
-					</section>
-					<?php $i++; ?>
-				<?php endif ?>
-				<?php if ( ! empty($data['favorites']['anime'])): ?>
-					<input type="radio" name="user-favorites" id="user-fav-anime" <?= $i === 0 ? 'checked' : '' ?> />
-					<label for="user-fav-anime">Anime</label>
-					<section class="content full-width media-wrap">
-						<?php foreach($data['favorites']['anime'] as $anime): ?>
-						<article class="media">
-							<?php
-								$link = $url->generate('anime.details', ['id' => $anime['slug']]);
-								$titles = Kitsu::filterTitles($anime);
-							?>
-							<a href="<?= $link ?>">
-								<?= $helper->picture("images/anime/{$anime['id']}.webp") ?>
-							</a>
-							<div class="name">
-								<a href="<?= $link ?>">
-									<?= array_shift($titles) ?>
-									<?php foreach ($titles as $title): ?>
-										<br /><small><?= $title ?></small>
-									<?php endforeach ?>
-								</a>
-							</div>
-						</article>
-						<?php endforeach ?>
-					</section>
-					<?php $i++; ?>
-				<?php endif ?>
-				<?php if ( ! empty($data['favorites']['manga'])): ?>
-					<input type="radio" name="user-favorites" id="user-fav-manga" <?= $i === 0 ? 'checked' : '' ?> />
-					<label for="user-fav-manga">Manga</label>
-					<section class="content full-width media-wrap">
-						<?php foreach($data['favorites']['manga'] as $manga): ?>
-						<article class="media">
-							<?php
-								$link = $url->generate('manga.details', ['id' => $manga['slug']]);
-								$titles = Kitsu::filterTitles($manga);
-							?>
-							<a href="<?= $link ?>">
-								<?= $helper->picture("images/manga/{$manga['id']}.webp") ?>
-							</a>
-							<div class="name">
-								<a href="<?= $link ?>">
-									<?= array_shift($titles) ?>
-									<?php foreach ($titles as $title): ?>
-										<br /><small><?= $title ?></small>
-									<?php endforeach ?>
-								</a>
-							</div>
-						</article>
-						<?php endforeach ?>
-					</section>
-					<?php $i++; ?>
-				<?php endif ?>
-			</div>
+			<?= $_->component->tabs('user-favorites', $data['favorites'], static function ($items, $type) use ($_) {
+				if ($type === 'character')
+				{
+					uasort($items, fn ($a, $b) => $a['names']['canonical'] <=> $b['names']['canonical']);
+				}
+				else
+				{
+					uasort($items, fn ($a, $b) => $a['titles']['canonical'] <=> $b['titles']['canonical']);
+				}
+
+				$rendered = array_map(fn ($item) => match ($type) {
+					'character' => $_->component->character(
+							$item['names']['canonical'],
+							$_->urlFromRoute('character', ['slug' => $item['slug']]),
+							$_->h->img(Kitsu::getImage($item))
+					),
+					default => $_->component->media(
+							array_merge(
+									[$item['titles']['canonical']],
+									Kitsu::getFilteredTitles($item['titles']),
+							),
+							$_->urlFromRoute("{$type}.details", ['id' => $item['slug']]),
+							$_->h->img(Kitsu::getPosterImage($item), ['width' => 220]),
+					),
+				}, $items);
+
+				return implode('', array_map('mb_trim', $rendered));
+
+			}, 'content full-width media-wrap') ?>
 			<?php endif ?>
 		</article>
 	</section>

build/CodeIgniter/Docs/Files/ClosingFileAndLocationCommentStandard.xml

@@ -1,28 +0,0 @@
-<documentation title="Closing comments instead of PHP closing tag">
-    <standard>
-    <![CDATA[
-    The PHP closing tag on a PHP document ?> is optional to the PHP parser. However, if used, any whitespace following the closing tag, whether introduced by the developer, user, or an FTP application, can cause unwanted output, PHP errors, or if the latter are suppressed, blank pages. For this reason, all PHP files should OMIT the closing PHP tag, and instead use a comment block to mark the end of file and it's location relative to the application root. This allows you to still identify a file as being complete and not truncated.
-    ]]>
-    </standard>
-    <code_comparison>
-        <code title="Examples of valid closing comments">
-        <![CDATA[
-<?php
-
-  echo "Here's my code!";
-
-/* End of file myfile.php */
-/* Location: ./system/modules/mymodule/myfile.php */ 
-        ]]>
-        </code>
-        <code title="Examples of invalid closing comments">
-        <![CDATA[
-<?php
-
-  echo "Here's my code!";
-
-?> 
-        ]]>
-        </code>
-    </code_comparison>
-</documentation>

build/CodeIgniter/Docs/Files/Utf8EncodingAndByteOrderMarkStandard.xml

@@ -1,7 +0,0 @@
-<documentation title="Unicode (UTF-8) encoding without BOM">
-    <standard>
-    <![CDATA[
-    Files should be saved with Unicode (UTF-8) encoding. The BOM should not be used. Unlike UTF-16 and UTF-32, there's no byte order to indicate in a UTF-8 encoded file, and the BOM can have a negative side effect in PHP of sending output, preventing the application from being able to set its own headers. Unix line endings should be used (LF).
-    ]]>
-    </standard>
-</documentation>

build/CodeIgniter/Docs/NamingConventions/ConstructorNameStandard.xml

@@ -1,31 +0,0 @@
-<documentation title="Constructor Names">
-    <standard>
-    <![CDATA[
-    Class names should always start with an uppercase letter. Multiple words should be separated with an underscore, and not CamelCased. All other class methods should be entirely lowercased and named to clearly indicate their function, preferably including a verb. Try to avoid overly long and verbose names.
-    ]]>
-    </standard>
-    <code_comparison>
-        <code title="Examples of valid constructor name">
-        <![CDATA[
-class Super_class
-{
-  function Super_class()
-  {
-    echo 'Some code here !';
-  }
-}
-        ]]>
-        </code>
-        <code title="Examples of invalid constructor name">
-        <![CDATA[
-class Super_class
-{
-  function __constructor()
-  {
-    echo 'Some code here !';
-  }
-}
-        ]]>
-        </code>
-    </code_comparison>
-</documentation>

build/CodeIgniter/Docs/NamingConventions/ValidClassNameStandard.xml

@@ -1,21 +0,0 @@
-<documentation title="Class names">
-    <standard>
-    <![CDATA[
-    Class names should always start with an uppercase letter. Multiple words should be separated with an underscore, and not CamelCased. All other class methods should be entirely lowercased and named to clearly indicate their function, preferably including a verb. Try to avoid overly long and verbose names.
-    ]]>
-    </standard>
-    <code_comparison>
-        <code title="Examples of valid class names">
-        <![CDATA[
-class Super_class
-        ]]>
-        </code>
-        <code title="Examples of invalid class names">
-        <![CDATA[
-class SuperClass // words not separated with underscores and words next to the first one start with an upper case
-class superclass // words not separated with underscores
-class Super_Class // words next to the first one start with an upper case
-        ]]>
-        </code>
-    </code_comparison>
-</documentation>

build/CodeIgniter/Docs/NamingConventions/ValidFileNameStandard.xml

@@ -1,21 +0,0 @@
-<documentation title="File names">
-    <standard>
-    <![CDATA[
-    To be able to find which class is contained in a file, file names should be case-insensitively equal to class names. Some operating systems and tools are case-insensitive, though other are. So, file names should be in lower case to avoid any trouble.
-    ]]>
-    </standard>
-    <code_comparison>
-        <code title="Examples of valid file names">
-        <![CDATA[
-super_class.php
-        ]]>
-        </code>
-        <code title="Examples of invalid file names">
-        <![CDATA[
-superclass.php // words not separated with underscores
-SuperClass.php // not in lower case and words not separated with underscores
-Super_class.php // not in lower case
-        ]]>
-        </code>
-    </code_comparison>
-</documentation>

build/CodeIgniter/Docs/NamingConventions/ValidMethodNameStandard.xml

@@ -1,27 +0,0 @@
-<documentation title="Function and Method Names">
-    <standard>
-    <![CDATA[
-    Class names should always start with an uppercase letter. Multiple words should be separated with an underscore, and not CamelCased. All other class methods should be entirely lowercased and named to clearly indicate their function, preferably including a verb. Try to avoid overly long and verbose names.
-    Methods and variables that are only accessed internally by your class, such as utility and helper functions that your public methods use for code abstraction, should be prefixed with an underscore.
-    ]]>
-    </standard>
-    <code_comparison>
-        <code title="Examples of valid method names">
-        <![CDATA[
-function get_file_properties() // descriptive, underscore separator, and all lowercase letters
-private function _get_file_properties()
-        ]]>
-        </code>
-        <code title="Examples of invalid method names">
-        <![CDATA[
-function fileproperties() // not descriptive and needs underscore separator
-function fileProperties() // not descriptive and uses CamelCase
-function getfileproperties() // Better! But still missing underscore separator
-function getFileProperties() // uses CamelCase
-function get_the_file_properties_from_the_file() // wordy
-private function get_the_file_properties() // not prefixed with an underscor, though private
-function _get_the_file_properties() // prefixed with an underscor, though public
-        ]]>
-        </code>
-    </code_comparison>
-</documentation>

build/CodeIgniter/Docs/NamingConventions/ValidVariableNameStandard.xml

@@ -1,31 +0,0 @@
-<documentation title="Variable names">
-    <standard>
-    <![CDATA[
-    Namely, variables should contain only lowercase letters, use underscore separators, and be reasonably named to indicate their purpose and contents. Very short, non-word variables should only be used as iterators in for() loops.
-    Methods and variables that are only accessed internally by your class, such as utility and helper functions that your public methods use for code abstraction, should be prefixed with an underscore.
-    ]]>
-    </standard>
-    <code_comparison>
-        <code title="Examples of valid variable names">
-        <![CDATA[
-for ($j = 0; $j < 10; $j++)
-$str
-$buffer
-$group_id
-$last_city
-private $_internal_data;
-        ]]>
-        </code>
-        <code title="Examples of invalid variable names">
-        <![CDATA[
-$j = 'foo'; // single letter variables should only be used in for() loops
-$Str // contains uppercase letters
-$bufferedText // uses CamelCasing, and could be shortened without losing semantic meaning
-$groupid // multiple words, needs underscore separator
-$name_of_last_city_used // too long
-private $internal_data; // not prefixed with an underscor, though private
-$_public_attribute; // prefixed with an underscor, though public
-        ]]>
-        </code>
-    </code_comparison>
-</documentation>

build/CodeIgniter/Docs/Operators/StrictComparisonOperatorStandard.xml

@@ -1,40 +0,0 @@
-<documentation title="Strict comparison operators">
-    <standard>
-    <![CDATA[
-    Some PHP functions return FALSE on failure, but may also have a valid return value of "" or 0, which would evaluate to FALSE in loose comparisons. Be explicit by comparing the variable type when using these return values in conditionals to ensure the return value is indeed what you expect, and not a value that has an equivalent loose-type evaluation.
-    Use the same stringency in returning and checking your own variables. Use === and !== as necessary.
-    ]]>
-    </standard>
-    <code_comparison>
-        <code title="Valid strict comparison">
-        <![CDATA[
-if (strpos($str, 'foo') === FALSE) {
-  echo 'Do something.';
-}
-
-function build_string($str = "")
-{
-  if ($str === "") {
-    echo 'Buid string.';
-  }
-}
-        ]]>
-        </code>
-        <code title="Invalid loose comparison">
-        <![CDATA[
-// If 'foo' is at the beginning of the string, strpos will return a 0,
-// resulting in this conditional evaluating as TRUE
-if (strpos($str, 'foo') == FALSE) {
-  echo 'Do something.';
-}
-
-function build_string($str = "")
-{
-  if ($str == "") { // uh-oh! What if FALSE or the integer 0 is passed as an argument?
-    echo 'Buid string.';
-  }
-}
-        ]]>
-        </code>
-    </code_comparison>
-</documentation>

build/CodeIgniter/Docs/Strings/DoubleQuoteUsageStandard.xml

@@ -1,28 +0,0 @@
-<documentation title="Double-quoted strings">
-    <standard>
-    <![CDATA[
-    Always use single quoted strings unless you need variables parsed, and in cases where you do need variables parsed, use braces to prevent greedy token parsing. You may also use double-quoted strings if the string contains single quotes, so you do not have to use escape characters.
-    ]]>
-    </standard>
-    <code_comparison>
-        <code title="Examples of invalid double-quoted strings">
-        <![CDATA[
-"My String" // no variable parsing, so no use for double quotes
-"My string $foo" // needs braces
-'SELECT foo FROM bar WHERE baz = \'bag\'' // ugly
-'\r\n' // it isn't wrong, but it won't be interpreted as a new line feed
-        ]]>
-        </code>
-        <code title="Examples of valid double-quoted strings">
-        <![CDATA[
-'My String'
-"My string {$foo}" // variables in strings may be enclosed with braces in 2 ways
-"My string ${foo}"
-"My string {$foo['bar']}" // variables in strings may be an array entry
-"My string {$foo->bar}" // variables in strings may be an object attribute
-"SELECT foo FROM bar WHERE baz = 'bag'"
-"\n" // not specified in Code Igniter coding standard, but it should be allowed
-        ]]>
-        </code>
-    </code_comparison>
-</documentation>

build/CodeIgniter/Sniffs/Commenting/InlineCommentSniff.php

@@ -1,187 +0,0 @@
-<?php
-/**
- * CodeIgniter_Sniffs_Commenting_InlineCommentSniff.
- *
- * PHP version 5
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baobaz.com>
- * @copyright 2011 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-/**
- * CodeIgniter_Sniffs_Commenting_InlineCommentSniff.
- *
- * Ensure the use of single line comments within code (i.e //)
- * and blank lines between large comment blocks and code.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baobaz.com>
- * @copyright 2011 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-namespace CodeIgniter\Sniffs\Commenting;
-
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Files\File;
-
-class InlineCommentSniff implements Sniff
-{
-    /**
-     * @var int Limit defining long comments.
-     * Long comments count $longCommentLimit or more lines.
-     */
-    public $longCommentLimit = 5;
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-            T_COMMENT
-        );
-    }//end register()
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param File $phpcsFile The current file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // keep testing only if it's about the first comment of the block
-        $previousCommentPtr = $phpcsFile->findPrevious($tokens[$stackPtr]['code'], $stackPtr - 1);
-        if ($tokens[$previousCommentPtr]['line'] !== $tokens[$stackPtr]['line'] - 1) {
-            if (TRUE !== $this->_checkCommentStyle($phpcsFile, $stackPtr)) {
-                return;
-            }
-
-            $commentLines = $this->_getCommentBlock($phpcsFile, $stackPtr);
-
-            if (count($commentLines) >= $this->longCommentLimit) {
-                $this->_checkBlankLinesAroundLongComment($phpcsFile, $commentLines);
-            }
-        }
-    }//end process()
-
-
-    /**
-     * Add error to $phpcsFile, if comment pointed by $stackPtr doesn't start
-     * with '//'.
-     *
-     * @param File $phpcsFile The current file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        that has to be a comment.
-     *
-     * @return bool TRUE if the content of the token pointed by $stackPtr starts
-     *              with //, FALSE if an error was added to $phpcsFile.
-     */
-    private function _checkCommentStyle(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        if ($tokens[$stackPtr]['content'][0] === '#') {
-            $error  = 'Perl-style comments are not allowed; use "// Comment" or DocBlock comments instead';
-            $phpcsFile->addError($error, $stackPtr, 'WrongStyle');
-            return FALSE;
-        } else if (substr($tokens[$stackPtr]['content'], 0, 2) === '/*'
-            || $tokens[$stackPtr]['content'][0] === '*'
-        ) {
-            $error  = 'Multi lines comments are not allowed; use "// Comment" DocBlock comments instead';
-            $phpcsFile->addError($error, $stackPtr, 'WrongStyle');
-            return FALSE;
-        } else if (substr($tokens[$stackPtr]['content'], 0, 2) !== '//') {
-            $error  = 'Use single line or DocBlock comments within code';
-            $phpcsFile->addError($error, $stackPtr, 'WrongStyle');
-            return FALSE;
-        }
-        return TRUE;
-    }//_checkCommentStyle()
-
-
-    /**
-     * Gather into an array all comment lines to which $stackPtr belongs.
-     *
-     * @param File $phpcsFile The current file being scanned.
-     * @param int                  $stackPtr  Pointer to the first comment line.
-     *
-     * @return type array Pointers to tokens making up the comment block.
-     */
-    private function _getCommentBlock(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        $commentLines = array($stackPtr);
-        $nextComment  = $stackPtr;
-        $lastLine     = $tokens[$stackPtr]['line'];
-
-        while (($nextComment = $phpcsFile->findNext($tokens[$stackPtr]['code'], ($nextComment + 1), null, false)) !== false) {
-            if (($tokens[$nextComment]['line'] - 1) !== $lastLine) {
-                // Not part of the block.
-                break;
-            }
-
-            $lastLine       = $tokens[$nextComment]['line'];
-            $commentLines[] = $nextComment;
-        }
-
-        return $commentLines;
-    }//_getCommentBlock()
-
-
-    /**
-     * Add errors to $phpcsFile, if $commentLines isn't enclosed with blank lines.
-     *
-     * @param File $phpcsFile    The current file being scanned.
-     * @param array                $commentLines Lines of the comment block being checked.
-     *
-     * @return bool TRUE if $commentLines is enclosed with at least a blank line
-     * before and after, FALSE otherwise.
-     */
-    private function _checkBlankLinesAroundLongComment(File $phpcsFile, array $commentLines)
-    {
-        $hasBlankLinesAround = TRUE;
-        $tokens = $phpcsFile->getTokens();
-
-        // check blank line before the long comment
-        $firstCommentPtr = reset($commentLines);
-        $firstPreviousSpacePtr = $firstCommentPtr - 1;
-        while (T_WHITESPACE === $tokens[$firstPreviousSpacePtr]['code'] && $firstPreviousSpacePtr > 0) {
-            $firstPreviousSpacePtr--;
-        }
-        if ($tokens[$firstPreviousSpacePtr]['line'] >= $tokens[$firstCommentPtr]['line'] - 1) {
-            $error  = "Please add a blank line before comments counting more than {$this->longCommentLimit} lines.";
-            $phpcsFile->addError($error, $firstCommentPtr, 'LongCommentWithoutSpacing');
-            $hasBlankLinesAround = FALSE;
-        }
-
-        // check blank line after the long comment
-        $lastCommentPtr = end($commentLines);
-        $lastNextSpacePtr = $lastCommentPtr + 1;
-        while (T_WHITESPACE === $tokens[$lastNextSpacePtr]['code'] && $lastNextSpacePtr < count($tokens)) {
-            $lastNextSpacePtr++;
-        }
-        if ($tokens[$lastNextSpacePtr]['line'] <= $tokens[$lastCommentPtr]['line'] + 1) {
-            $error  = "Please add a blank line after comments counting more than {$this->longCommentLimit} lines.";
-            $phpcsFile->addError($error, $lastCommentPtr, 'LongCommentWithoutSpacing');
-            $hasBlankLinesAround = FALSE;
-        }
-
-        return $hasBlankLinesAround;
-    }//end _checkBlanksAroundLongComment()
-
-}//end class
-
-?>

build/CodeIgniter/Sniffs/Files/ByteOrderMarkSniff.php

@@ -1,98 +0,0 @@
-<?php
-/**
- * CodeIgniter_Sniffs_Files_ByteOrderMarkSniff.
- *
- * PHP version 5
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baobaz.com>
- * @copyright 2006 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-/**
- * CodeIgniter_Sniffs_Files_ByteOrderMarkSniff.
- *
- * Ensures that no BOM appears at the beginning of file.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baobaz.com>
- * @copyright 2006 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-namespace CodeIgniter\Sniffs\Files;
-
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Files\File;
-
-class ByteOrderMarkSniff implements Sniff
-{
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array( T_OPEN_TAG );
-    }//end register()
-
-    /**
-     * List of supported BOM definitions.
-     *
-     * Use encoding names as keys and hex BOM representations as values.
-     *
-     * @return array
-     */
-    protected function getBomDefinitions()
-    {
-        return array(
-            'UTF-8'       => 'efbbbf',
-            'UTF-16 (BE)' => 'feff',
-            'UTF-16 (LE)' => 'fffe',
-            'UTF-32 (BE)' => '0000feff',
-            'UTF-32 (LE)' => 'fffe0000'
-        );
-    }//end getBomDefinitions()
-
-    /**
-     * Process tokens.
-     *
-     * Actually, only proceed when we're at index 0, this should be the only case
-     * that will contain BOM. Then check if BOM definition matches what
-     * we've found as file's inline HTML. Inline HTML could be longer than just BOM
-     * so make sure you test as much as needed.
-     *
-     * @param File $phpcsFile The current file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr )
-    {
-        // We are only interested if this is the first open tag.
-        if ($stackPtr !== 0) {
-            if ($phpcsFile->findPrevious(T_OPEN_TAG, ($stackPtr - 1)) !== false) {
-                return;
-            }
-        }
-
-        $tokens = $phpcsFile->getTokens();
-        $fileStartString = $tokens[0]['content'];
-        foreach ($this->getBomDefinitions() as $bomName => $expectedBomHex) {
-            $bomByteLength = strlen($expectedBomHex) / 2;
-            $fileStartHex = bin2hex(substr($fileStartString, 0, $bomByteLength));
-            if ($fileStartHex === $expectedBomHex) {
-                $error = "File contains a $bomName byte order mark (BOM).";
-                $phpcsFile->addError($error, $stackPtr, 123);
-                break;
-            }
-        }
-    }//end process()
-}

build/CodeIgniter/Sniffs/Files/Utf8EncodingSniff.php

@@ -1,222 +0,0 @@
-<?php
-/**
- * CodeIgniter_Sniffs_Files_Utf8EncodingSniff.
- *
- * PHP version 5
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baobaz.com>
- * @copyright 2006 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-/**
- * CodeIgniter_Sniffs_Files_Utf8EncodingSniff.
- *
- * Ensures that PHP files are encoded with Unicode (UTF-8) encoding.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baobaz.com>
- * @copyright 2006 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-namespace CodeIgniter\Sniffs\Files;
-
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Files\File;
-
-class Utf8EncodingSniff implements Sniff
-{
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-            T_OPEN_TAG
-        );
-
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param File $phpcsFile The current file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        // We are only interested if this is the first open tag.
-        if ($stackPtr !== 0) {
-            if ($phpcsFile->findPrevious(T_OPEN_TAG, ($stackPtr - 1)) !== false) {
-                return;
-            }
-        }
-
-        $file_path = $phpcsFile->getFilename();
-        $file_name = basename($file_path);
-        $file_content = file_get_contents($file_path);
-        if (false === mb_check_encoding($file_content, 'UTF-8')) {
-            $error = 'File "' . $file_name . '" should be saved with Unicode (UTF-8) encoding.';
-            $phpcsFile->addError($error, 0);
-        }
-        if ( ! self::_checkUtf8W3c($file_content)) {
-            $error = 'File "' . $file_name . '" should be saved with Unicode (UTF-8) encoding, but it did not successfully pass the W3C test.';
-            $phpcsFile->addError($error, 0);
-        }
-        if ( ! self::_checkUtf8Rfc3629($file_content)) {
-            $error = 'File "' . $file_name . '" should be saved with Unicode (UTF-8) encoding, but it did not meet RFC3629 requirements.';
-            $phpcsFile->addError($error, 0);
-        }
-    }//end process()
-
-
-    /**
-     * Checks that the string $content contains only valid UTF-8 chars
-     * using W3C's method.
-     * Returns true if $content contains only UTF-8 chars, false otherwise.
-     *
-     * @param string $content String to check.
-     *
-     * @return bool true if $content contains only UTF-8 chars, false otherwise.
-     *
-     * @see http://w3.org/International/questions/qa-forms-utf-8.html
-     */
-    private static function _checkUtf8W3c($content)
-    {
-        $content_chunks=self::mb_chunk_split($content, 4096, '');
-    	foreach($content_chunks as $content_chunk)
-		{
-			$preg_result= preg_match(
-            '%^(?:
-                  [\x09\x0A\x0D\x20-\x7E]            # ASCII
-                | [\xC2-\xDF][\x80-\xBF]             # non-overlong 2-byte
-                |  \xE0[\xA0-\xBF][\x80-\xBF]        # excluding overlongs
-                | [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}  # straight 3-byte
-                |  \xED[\x80-\x9F][\x80-\xBF]        # excluding surrogates
-                |  \xF0[\x90-\xBF][\x80-\xBF]{2}     # planes 1-3
-                | [\xF1-\xF3][\x80-\xBF]{3}          # planes 4-15
-                |  \xF4[\x80-\x8F][\x80-\xBF]{2}     # plane 16
-            )*$%xs',
-            $content_chunk
-			);
-			if($preg_result!==1)
-			{
-				return false;
-			}
-
-		}
-		return true;
-    }//end _checkUtf8W3c()
-
-    /**
-     * Checks that the string $content contains only valid UTF-8 chars
-     * using the method described in RFC 3629.
-     * Returns true if $content contains only UTF-8 chars, false otherwise.
-     *
-     * @param string $content String to check.
-     *
-     * @return bool true if $content contains only UTF-8 chars, false otherwise.
-     *
-     * @see http://www.php.net/manual/en/function.mb-detect-encoding.php#85294
-     */
-    private static function _checkUtf8Rfc3629($content)
-    {
-        $len = strlen($content);
-        for ($i = 0; $i < $len; $i++) {
-            $c = ord($content[$i]);
-            if ($c > 128) {
-                if (($c >= 254)) {
-                    return false;
-                } elseif ($c >= 252) {
-                    $bits=6;
-                } elseif ($c >= 248) {
-                    $bits=5;
-                } elseif ($c >= 240) {
-                    $bytes = 4;
-                } elseif ($c >= 224) {
-                    $bytes = 3;
-                } elseif ($c >= 192) {
-                    $bytes = 2;
-                } else {
-                    return false;
-                } if (($i + $bytes) > $len) {
-                    return false;
-                } while ($bytes > 1) {
-                    $i++;
-                    $b = ord($content[$i]);
-                    if ($b < 128 || $b > 191) {
-                        return false;
-                    }
-                    $bytes--;
-                }
-            }
-        }
-        return true;
-    }//_checkUtf8Rfc3629()
-
-	 /**
-     * Splits a string to chunks of given size
-	 * This helps to avoid segmentation fault errors when large text is given
-     * Returns array of strings after splitting
-     *
-     * @param string $str String to split.
-	 * @param int $len number of characters per chunk
-     *
-     * @return array string array after splitting
-     *
-     * @see http://php.net/manual/en/function.chunk-split.php
-     */
-	private static function mb_chunk_split($str, $len, $glue)
-	{
-		if (empty($str)) return false;
-		$array = self::mbStringToArray ($str);
-		$n = -1;
-		$new = Array();
-		foreach ($array as $char) {
-			$n++;
-			if ($n < $len) $new []= $char;
-			elseif ($n == $len) {
-				$new []= $glue . $char;
-				$n = 0;
-			}
-		}
-		return $new;
-	}//mb_chunk_split
-	/**
-     * Supporting function for mb_chunk_split
-     *
-     * @param string $str
-	 *
-     * @return array
-     *
-     * @see http://php.net/manual/en/function.chunk-split.php
-     */
-	private static function mbStringToArray ($str)
-	{
-		if (empty($str)) return false;
-		$len = mb_strlen($str);
-		$array = array();
-		for ($i = 0; $i < $len; $i++) {
-			$array[] = mb_substr($str, $i, 1);
-		}
-		return $array;
-	}
-
-
-
-}//end class
-
-?>

build/CodeIgniter/Sniffs/Operators/StrictComparisonOperatorSniff.php

@@ -1,81 +0,0 @@
-<?php
-/**
- * CodeIgniter_Sniffs_Operators_StrictComparisonOperatorSniff.
- *
- * PHP version 5
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baobaz.com>
- * @copyright 2006 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-/**
- * CodeIgniter_Sniffs_Operators_StrictComparisonOperatorSniff.
- *
- * Ensures that only strict comparison operators are used instead of
- * equal and not equal operators.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baobaz.com>
- * @copyright 2006 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-namespace CodeIgniter\Sniffs\Operators;
-
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Files\File;
-
-class StrictComparisonOperatorSniff implements Sniff
-{
-    private static $_replacements = array(
-        T_IS_EQUAL     => '===',
-        T_IS_NOT_EQUAL => '!==',
-    );
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-            T_IS_EQUAL,
-            T_IS_NOT_EQUAL,
-        );
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param File $phpcsFile The current file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        $operator_token = $tokens[$stackPtr];
-        $operator_string = $operator_token['content'];
-        $operator_code = $operator_token['code'];
-
-        $error_message = '"==" and "!=" are prohibited; use "'
-            . self::$_replacements[$operator_code] . '" instead of "'
-            . $operator_string . '".';
-        $phpcsFile->addError($error_message, $stackPtr, 'NonStrictComparisonUsed');
-    }//end process()
-
-
-}//end class
-
-?>

build/CodeIgniter/Sniffs/Strings/DoubleQuoteUsageSniff.php

@@ -1,465 +0,0 @@
-<?php
-
-/**
- * CodeIgniter_Sniffs_Strings_DoubleQuoteUsageSniff.
- *
- * PHP version 5
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baobaz.com>
- * @copyright 2011 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-namespace CodeIgniter\Sniffs\Strings;
-
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Files\File;
-use Exception;
-
-/**
- * CodeIgniter_Sniffs_Strings_DoubleQuoteUsageSniff.
- *
- * Ensures that double-quoted strings are used only to parse variables,
- * to avoid escape characters before single quotes or for chars that need
- * to be interpreted like \r, \n or \t.
- * If a double-quoted string contain both single and double quotes
- * but no variable, then a warning is raised to encourage the use of
- * single-quoted strings.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baobaz.com>
- * @copyright 2011 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-class VariableUsageSniff implements Sniff
-{
-	/**
-	 * Returns an array of tokens this test wants to listen for.
-	 *
-	 * @return array
-	 */
-	public function register()
-	{
-		/*
-		return array(
-			T_DOUBLE_QUOTED_STRING,
-			T_CONSTANT_ENCAPSED_STRING,
-		);
-		*/
-		return array();
-	}//end register()
-
-
-	/**
-	 * Processes this test, when one of its tokens is encountered.
-	 *
-	 * @param File $phpcsFile The current file being scanned.
-	 * @param int                  $stackPtr  The position of the current token
-	 *                                        in the stack passed in $tokens.
-	 *
-	 * @return void
-	 */
-	public function process(File $phpcsFile, $stackPtr)
-	{
-		$tokens = $phpcsFile->getTokens();
-		$string = $tokens[$stackPtr]['content'];
-		// makes sure that it is about a double quote string,
-		// since variables are not parsed out of double quoted string
-		$openDblQtStr = substr($string, 0, 1);
-		if (0 === strcmp($openDblQtStr, '"')) {
-			$this->processDoubleQuotedString($phpcsFile, $stackPtr, $string);
-		} else if (0 === strcmp($openDblQtStr, "'")) {
-			$this->processSingleQuotedString($phpcsFile, $stackPtr, $string);
-		}
-	}//end process()
-
-
-	/**
-	 * Processes this test, when the token encountered is a double-quoted string.
-	 *
-	 * @param File $phpcsFile   The current file being scanned.
-	 * @param int                  $stackPtr    The position of the current token
-	 *                                          in the stack passed in $tokens.
-	 * @param string               $dblQtString The double-quoted string content,
-	 *                                          i.e. without quotes.
-	 *
-	 * @return void
-	 */
-	protected function processDoubleQuotedString (File $phpcsFile, $stackPtr, $dblQtString)
-	{
-		$variableFound = FALSE;
-		$strTokens = token_get_all('<?php '.$dblQtString);
-		$strPtr = 1; // skip php opening tag added by ourselves
-		$requireDblQuotes = FALSE;
-		while ($strPtr < count($strTokens)) {
-			$strToken = $strTokens[$strPtr];
-			if (is_array($strToken)) {
-				if (in_array($strToken[0], array(T_DOLLAR_OPEN_CURLY_BRACES, T_CURLY_OPEN))) {
-					$strPtr++;
-					try {
-						$this->_parseVariable($strTokens, $strPtr);
-					} catch (Exception $err) {
-						$error = 'There is no variable, object nor array between curly braces. Please use the escape char for $ or {.';
-						$phpcsFile->addError($error, $stackPtr, 234);
-					}
-					$variableFound = TRUE;
-					if ('}' !== $strTokens[$strPtr]) {
-						$error = 'There is no matching closing curly brace.';
-						$phpcsFile->addError($error, $stackPtr, 345);
-					}
-					// don't move forward, since it will be done in the main loop
-					// $strPtr++;
-				} else if (T_VARIABLE === $strToken[0]) {
-					$variableFound = TRUE;
-					$error = "Variable {$strToken[1]} in double-quoted strings should be enclosed with curly braces. Please consider {{$strToken[1]}}";
-					$phpcsFile->addError($error, $stackPtr, 456);
-				}
-			}
-			$strPtr++;
-		}
-		return $variableFound;
-	}//end processDoubleQuotedString()
-
-
-	/**
-	 * Processes this test, when the token encountered is a single-quoted string.
-	 *
-	 * @param File $phpcsFile   The current file being scanned.
-	 * @param int                  $stackPtr    The position of the current token
-	 *                                          in the stack passed in $tokens.
-	 * @param string               $sglQtString The single-quoted string content,
-	 *                                          i.e. without quotes.
-	 *
-	 * @return void
-	 */
-	protected function processSingleQuotedString (File $phpcsFile, $stackPtr, $sglQtString)
-	{
-		$variableFound = FALSE;
-		$strTokens = token_get_all('<?php '.$sglQtString);
-		$strPtr = 1; // skip php opening tag added by ourselves
-		while ($strPtr < count($strTokens)) {
-			$strToken = $strTokens[$strPtr];
-			if (is_array($strToken)) {
-				if (T_VARIABLE === $strToken[0]) {
-					$error = "Variables like {$strToken[1]} should be in double-quoted strings only.";
-					$phpcsFile->addError($error, $stackPtr);
-				}
-			}
-			$strPtr++;
-		}
-		return $variableFound;
-	}//end processSingleQuotedString()
-
-	/**
-	 * Grammar rule to parse the use of a variable. Please notice that it
-	 * doesn't manage the leading $.
-	 *
-	 * _parseVariable ::= <variable>
-	 *     | <variable>_parseObjectAttribute()
-	 *     | <variable>_parseArrayIndexes()
-	 *
-	 * @exception Exception raised if $strTokens starting from $strPtr
-	 *                      doesn't matched the rule.
-	 *
-	 * @param array $strTokens Tokens to parse.
-	 * @param int   $strPtr    Pointer to the token where parsing starts.
-	 *
-	 * @return array The attribute name associated to index 'var', an array with
-	 * indexes 'obj' and 'attr' or an array with indexes 'arr' and 'idx'.
-	 */
-	private function _parseVariable ($strTokens, &$strPtr)
-	{
-		if ( ! in_array($strTokens[$strPtr][0], array(T_VARIABLE, T_STRING_VARNAME))) {
-			throw new Exception ('Expected variable name.');
-		}
-		$var = $strTokens[$strPtr][1];
-		$strPtr++;
-		$startStrPtr = $strPtr;
-		try {
-			$attr = $this->_parseObjectAttribute($strTokens, $strPtr);
-			return array ('obj' => $var, 'attr' => $attr);
-		} catch (Exception $err) {
-			if ($strPtr !== $startStrPtr) {
-				throw $err;
-			}
-		}
-		try {
-			$idx = $this->_parseArrayIndexes($strTokens, $strPtr);
-			return array ('arr' => $var, 'idx' => $idx);
-		} catch (Exception $err) {
-			if ($strPtr !== $startStrPtr) {
-				throw $err;
-			}
-		}
-		return array ('var' => $var);
-	}//end _parseVariable()
-
-
-	/**
-	 * Grammar rule to parse the use of an object attribute.
-	 *
-	 * _parseObjectAttribute ::= -><attribute>
-	 *     | -><attribute>_parseObjectAttribute()
-	 *     | -><attribute>_parseArrayIndexes()
-	 *
-	 * @exception Exception raised if $strTokens starting from $strPtr
-	 *                      doesn't matched the rule.
-	 *
-	 * @param array $strTokens Tokens to parse.
-	 * @param int   $strPtr    Pointer to the token where parsing starts.
-	 *
-	 * @return mixed The attribute name as a string, an array with indexes
-	 * 'obj' and 'attr' or an array with indexes 'arr' and 'idx'.
-	 */
-	private function _parseObjectAttribute ($strTokens, &$strPtr)
-	{
-		if (T_OBJECT_OPERATOR !== $strTokens[$strPtr][0]) {
-			throw new Exception ('Expected ->.');
-		}
-		$strPtr++;
-		if (T_STRING !== $strTokens[$strPtr][0]) {
-			throw new Exception ('Expected an object attribute.');
-		}
-		$attr = $strTokens[$strPtr][1];
-		$strPtr++;
-		$startStrPtr = $strPtr;
-		try {
-			$sub_attr = $this->_parseObjectAttribute($strTokens, $strPtr);
-			return array ('obj' => $attr, 'attr' => $sub_attr);
-		} catch (Exception $err) {
-			if ($strPtr !== $startStrPtr) {
-				throw $err;
-			}
-		}
-		try {
-			$idx = $this->_parseArrayIndexes($strTokens, $strPtr);
-			return array ('arr' => $attr, 'idx' => $idx);
-		} catch (Exception $err) {
-			if ($strPtr !== $startStrPtr) {
-				throw $err;
-			}
-		}
-		return $attr;
-	}//end _parseObjectAttribute()
-
-
-	/**
-	 * Grammar rule to parse the use of one or more array indexes.
-	 *
-	 * _parseArrayIndexes ::= _parseArrayIndex()+
-	 *
-	 * @exception Exception raised if $strTokens starting from $strPtr
-	 *                      doesn't matched the rule.
-	 *
-	 * @param array $strTokens Tokens to parse.
-	 * @param int   $strPtr    Pointer to the token where parsing starts.
-	 *
-	 * @return array Indexes in the same order as in the string.
-	 */
-	private function _parseArrayIndexes ($strTokens, &$strPtr)
-	{
-		$indexes = array($this->_parseArrayIndex($strTokens, $strPtr));
-		try {
-			while (1) {
-				$startStrPtr = $strPtr;
-				$indexes [] = $this->_parseArrayIndex($strTokens, $strPtr);
-			}
-		} catch (Exception $err) {
-			if (0 !== ($strPtr - $startStrPtr)) {
-				throw $err;
-			}
-			return $indexes;
-		}
-	}//end _parseArrayIndexes()
-
-
-	/**
-	 * Grammar rule to parse the use of array index.
-	 *
-	 * _parseArrayIndex ::= [<index>]
-	 *
-	 * @exception Exception raised if $strTokens starting from $strPtr
-	 *                      doesn't matched the rule.
-	 *
-	 * @param array $strTokens Tokens to parse.
-	 * @param int   $strPtr    Pointer to the token where parsing starts.
-	 *
-	 * @return string Index between the 2 square brackets
-	 */
-	private function _parseArrayIndex ($strTokens, &$strPtr)
-	{
-		if ('[' !== $strTokens[$strPtr]) {
-			throw new Exception ('Expected [.');
-		}
-		$strPtr++;
-		if (! in_array($strTokens[$strPtr][0], array(T_CONSTANT_ENCAPSED_STRING, T_LNUMBER))) {
-			throw new Exception ('Expected an array index.');
-		}
-		$index = $strTokens[$strPtr][1];
-		$strPtr++;
-		if (']' !== $strTokens[$strPtr]) {
-			throw new Exception ('Expected ].');
-		}
-		$strPtr++;
-		return $index;
-	}//end _parseArrayIndex()
-
-}//end class
-
-/**
- * CodeIgniter_Sniffs_Strings_VariableUsageSniff.
- *
- * Ensures that variables parsed in double-quoted strings are enclosed with
- * braces to prevent greedy token parsing.
- * Single-quoted strings don't parse variables, so there is no risk of greedy
- * token parsing.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baobaz.com>
- * @copyright 2011 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-class DoubleQuoteUsageSniff extends VariableUsageSniff
-{
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-            T_DOUBLE_QUOTED_STRING,
-            T_CONSTANT_ENCAPSED_STRING,
-        );
-    }//end register()
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param File $phpcsFile The current file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        // no variable are in the string from here
-        $tokens = $phpcsFile->getTokens();
-        $qtString = $tokens[$stackPtr]['content'];
-        // makes sure that it is about a double quote string,
-        // since variables are not parsed out of double quoted string
-        $open_qt_str = substr($qtString, 0, 1);
-
-        // clean the enclosing quotes
-        $qtString = substr($qtString, 1, strlen($qtString) - 1 - 1);
-
-        if (0 === strcmp($open_qt_str, '"')) {
-            $this->processDoubleQuotedString($phpcsFile, $stackPtr, $qtString);
-        } else if (0 === strcmp($open_qt_str, "'")) {
-            $this->processSingleQuotedString($phpcsFile, $stackPtr, $qtString);
-        }
-    }//end process()
-
-
-    /**
-     * Processes this test, when the token encountered is a double-quoted string.
-     *
-     * @param File $phpcsFile The current file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     * @param string               $qtString  The double-quoted string content,
-     *                                        i.e. without quotes.
-     *
-     * @return void
-     */
-    protected function processDoubleQuotedString (File $phpcsFile, $stackPtr, $qtString)
-    {
-        // so there should be at least a single quote or a special char
-        // if there are the 2 kinds of quote and no special char, then add a warning
-        $has_variable = parent::processDoubleQuotedString($phpcsFile, $stackPtr, '"'.$qtString.'"');
-        $has_specific_sequence = $this->_hasSpecificSequence($qtString);
-        $dbl_qt_at = strpos($qtString, '"');
-        $smpl_qt_at = strpos($qtString, "'");
-        if (false === $has_variable && false === $has_specific_sequence
-            && false === $smpl_qt_at
-        ) {
-            $error = 'Single-quoted strings should be used unless it contains variables, special chars like \n or single quotes.';
-            $phpcsFile->addError($error, $stackPtr, 111);
-        } else if (false !== $smpl_qt_at && false !== $dbl_qt_at
-            && false === $has_variable && false === $has_specific_sequence
-        ) {
-            $warning = 'It is encouraged to use a single-quoted string, since it doesn\'t contain any variable nor special char though it mixes single and double quotes.';
-            $phpcsFile->addWarning($warning, $stackPtr, 222);
-        }
-    }//end processDoubleQuotedString()
-
-
-    /**
-     * Processes this test, when the token encountered is a single-quoted string.
-     *
-     * @param File $phpcsFile The current file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     * @param string               $qtString  The single-quoted string content,
-     *                                        i.e. without quotes.
-     *
-     * @return void
-     */
-    protected function processSingleQuotedString (File $phpcsFile, $stackPtr, $qtString)
-    {
-        // if there is single quotes without additional double quotes,
-        // then user is allowed to use double quote to avoid having to
-        // escape single quotes. Don't add the warning, if an error was
-        // already added, because a variable was found in a single-quoted
-        // string.
-        $has_variable = parent::processSingleQuotedString($phpcsFile, $stackPtr, "'".$qtString."'");
-        $dbl_qt_at = strpos($qtString, '"');
-        $smpl_qt_at = strpos($qtString, "'");
-        if (false === $has_variable && false !== $smpl_qt_at && false === $dbl_qt_at) {
-            $warning = 'You may also use double-quoted strings if the string contains single quotes, so you do not have to use escape characters.';
-            $phpcsFile->addWarning($warning, $stackPtr, 333);
-        }
-    }//end processSingleQuotedString()
-
-    /**
-     * Return TRUE, if a sequence of chars that is parsed in a specific way
-     * in double-quoted strings is found, FALSE otherwise.
-     *
-     * @param string $string String in which sequence of special chars will
-     * be researched.
-     *
-     * @return TRUE, if a sequence of chars that is parsed in a specific way
-     * in double-quoted strings is found, FALSE otherwise.
-     *
-     * @link http://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.double
-     */
-    private function _hasSpecificSequence($string)
-    {
-        $hasSpecificSequence = FALSE;
-        $specialMeaningStrs = array('\n', '\r', '\t', '\v', '\f');
-        foreach ($specialMeaningStrs as $splStr) {
-            if (FALSE !== strpos($string, $splStr)) {
-                $hasSpecificSequence = TRUE;
-            }
-        }
-        $specialMeaningPtrns = array('\[0-7]{1,3}', '\x[0-9A-Fa-f]{1,2}');
-        foreach ($specialMeaningPtrns as $splPtrn) {
-            if (1 === preg_match("/{$splPtrn}/", $string)) {
-                $hasSpecificSequence = TRUE;
-            }
-        }
-        return $hasSpecificSequence;
-    }//end _hasSpecificSequence()
-
-}//end class
-
-?>

build/CodeIgniter/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php

@@ -1,87 +0,0 @@
-<?php
-/**
- * CodeIgniter_Sniffs_WhiteSpace_DisallowSpaceIndentSniff.
- *
- * PHP version 5
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@gmail.com>
- * @copyright 2011 Thomas ERNEST
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-/**
- * CodeIgniter_Sniffs_WhiteSpace_DisallowSpaceIndentSniff.
- *
- * Ensures the use of tabs for indentation.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@gmail.com>
- * @copyright 2011 Thomas ERNEST
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-namespace CodeIgniter\Sniffs\WhiteSpace;
-
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Files\File;
-
-class DisallowSpaceIndentSniff implements Sniff
-{
-
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = array(
-                                   'PHP',
-                                   'JS',
-                                   'CSS',
-                                  );
-
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_WHITESPACE);
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param File $phpcsFile All the tokens found in the document.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // Make sure this is whitespace used for indentation.
-        $line = $tokens[$stackPtr]['line'];
-        if ($stackPtr > 0 && $tokens[($stackPtr - 1)]['line'] === $line) {
-            return;
-        }
-
-        if (strpos($tokens[$stackPtr]['content'], " ") !== false) {
-            $error = 'Tabs must be used to indent lines; spaces are not allowed for code indentation';
-            $phpcsFile->addError($error, $stackPtr, 'SpacesUsedForIndentation');
-        }
-    }//end process()
-
-
-}//end class
-
-?>

build/CodeIgniter/Sniffs/WhiteSpace/DisallowWitheSpaceAroundPhpTagsSniff.php

@@ -1,95 +0,0 @@
-<?php
-/**
- * CodeIgniter_Sniffs_WhiteSpace_DisallowWitheSpaceAroundPhpTagsSniff.
- *
- * PHP version 5
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baobaz.com>
- * @copyright 2006 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-/**
- * CodeIgniter_Sniffs_WhiteSpace_DisallowWitheSpaceAroundPhpTagsSniff.
- *
- * Ensures that no whitespace precedes the opening PHP tag
- * or follows the closing PHP tag.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baobaz.com>
- * @copyright 2006 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-namespace CodeIgniter\Sniffs\WhiteSpace;
-
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Files\File;
-
-class DisallowWitheSpaceAroundPhpTagsSniff implements Sniff
-{
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-                T_OPEN_TAG,
-                T_CLOSE_TAG
-               );
-
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param File $phpcsFile The current file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        $php_tag_token = $tokens[$stackPtr];
-        $php_tag_code = $php_tag_token['code'];
-
-        if (T_OPEN_TAG === $php_tag_code) {
-            // opening php tag should be the first token.
-            // any whitespace beofre an opening php tag is tokenized
-            // as T_INLINE_HTML, so no need to check the content of the token.
-            $isFirst = 0 === $stackPtr;
-            if ( ! $isFirst) {
-                $error = 'Any char before the opening PHP tag is prohibited. Please remove newline or indentation before the opening PHP tag.';
-                $phpcsFile->addError($error, $stackPtr);
-            }
-        } else {
-            // if (T_CLOSE_TAG === $php_tag_code)
-            // closing php tag should be the last token
-            // and it must not contain any whitespace.
-            $php_tag_string = $php_tag_token['content'];
-            $isLast = count($tokens) - 1 === $stackPtr;
-            // both of the two closing php tags contains 2 chars exactly.
-            $containsEndTagOnly = strlen($php_tag_string) > 2;
-            if ( ! $isLast || ! $containsEndTagOnly ) {
-                $error = 'Any char after the closing PHP tag is prohibited. Please removes newline or spaces after the closing PHP tag.';
-                $phpcsFile->addError($error, $stackPtr);
-            }
-        }
-    }//end process()
-
-
-}//end class
-
-?>

build/CodeIgniter/Sniffs/WhiteSpace/ElseOnNewLineSniff.php

@@ -1,82 +0,0 @@
-<?php
-/**
- * CodeIgniter_Sniffs_WhiteSpace_ElseOnNewLineSniff.
- *
- * PHP version 5
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baobaz.com>
- * @copyright 2006 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-/**
- * CodeIgniter_Sniffs_WhiteSpace_ElseOnNewLineSniff.
- *
- * Ensures that control structures else and elseif stand on new lines.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baobaz.com>
- * @copyright 2006 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-namespace CodeIgniter\Sniffs\WhiteSpace;
-
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Files\File;
-
-class ElseOnNewLineSniff implements Sniff
-{
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-            T_ELSE,
-            T_ELSEIF,
-        );
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param File $phpcsFile The current file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        $else_token = $tokens[$stackPtr];
-        $previous_non_blank_token_ptr = $phpcsFile->findPrevious(array(T_WHITESPACE), $stackPtr - 1, null, true);
-
-        if (false === $previous_non_blank_token_ptr) {
-        	// else is no preceded with any symbol, but it is not the responsibility of this sniff.
-        	return;
-        }
-
-        $previous_non_blank_token = $tokens[$previous_non_blank_token_ptr];
-        if ($previous_non_blank_token['line'] === $else_token['line']) {
-            $error = '"' . $else_token['content'] . '" should be on a new line.';
-            $phpcsFile->addError($error, $stackPtr, 123423);
-        }
-
-    }//end process()
-
-
-}//end class
-
-?>

build/CodeIgniter/Sniffs/WhiteSpace/LogicalNotSpacingSniff.php

@@ -1,75 +0,0 @@
-<?php
-/**
- * CodeIgniter_Sniffs_WhiteSpace_LogicalNotSpacingSniff.
- *
- * PHP version 5
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baobaz.com>
- * @copyright 2006 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-/**
- * CodeIgniter_Sniffs_WhiteSpace_LogicalNotSpacingSniff.
- *
- * Ensures that at exactly a space precedes and follows the logical operator !.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baobaz.com>
- * @copyright 2006 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-namespace CodeIgniter\Sniffs\WhiteSpace;
-
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Files\File;
-
-class LogicalNotSpacingSniff implements Sniff
-{
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-            T_BOOLEAN_NOT,
-        );
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param File $phpcsFile The current file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        $operator_token = $tokens[$stackPtr];
-
-        $previous_token = $tokens[$stackPtr - 1];
-        $next_token = $tokens[$stackPtr + 1];
-        if (T_WHITESPACE !== $previous_token['code'] || T_WHITESPACE !== $next_token['code']) {
-            $error = 'Logical operator ! should always be preceded and followed with a whitespace.';
-            $phpcsFile->addError($error, $stackPtr, 'badNot');
-        }
-    }//end process()
-
-
-}//end class
-
-?>

build/CodeIgniter/UnusedSniffs/Files/AbstractClosingCommentSniff.php

@@ -1,104 +0,0 @@
-<?php
-/**
- * CodeIgniter_Sniffs_Files_AbstractClosingCommentSniff.
- *
- * PHP version 5
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baobaz.com>
- * @copyright 2006 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-/**
- * CodeIgniter_Sniffs_Files_AbstractClosingCommentSniff.
- *
- * Defines some methods used by
- * CodeIgniter_Sniffs_Files_ClosingFileCommentSniff
- * and CodeIgniter_Sniffs_Files_ClosingLocationCommentSniff.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baobaz.com>
- * @copyright 2006 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-namespace CodeIgniter\Sniffs\Files;
-
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Files\File;
-
-class AbstractClosingCommentSniff implements Sniff
-{
-    /**
-     * As an abstract class, this sniff is not associated to any token.
-     */
-    public function register()
-    {
-      return array();
-    }
-
-    /**
-     * As an abstract class, this sniff is not dedicated to process a token.
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-      $error = __CLASS__.'::'.__METHOD__.' is abstract. Please develop this method in a child class.';
-      throw new PHP_CodeSniffer_Exception($error);
-    }
-
-    /**
-     * Returns the comment without its delimiter(s) as well as leading
-     * and traling whitespaces.
-     *
-     * It removes the first #, the two first / (i.e. //) or the first /*
-     * and last \*\/. If a comment starts with /**, then the last * will remain
-     * as well as whitespaces between this star and the comment content.
-     *
-     * @param string $comment Comment containing either comment delimiter(s) and
-     * trailing or leading whitspaces to clean.
-     *
-     * @return string Comment without comment delimiter(s) and whitespaces.
-     */
-    protected static function _getCommentContent ($comment)
-    {
-        if (self::_stringStartsWith($comment, '#')) {
-            $comment = substr($comment, 1);
-        } else if (self::_stringStartsWith($comment, '//')) {
-            $comment = substr($comment, 2);
-        } else if (self::_stringStartsWith($comment, '/*')) {
-            $comment = substr($comment, 2, strlen($comment) - 2 - 2);
-        }
-        $comment = trim($comment);
-        return $comment;
-    }//_getCommentContent()
-
-
-    /**
-     * Binary safe string comparison between $needle and
-     * the beginning of $haystack. Returns true if $haystack starts with
-     * $needle, false otherwise.
-     *
-     * @param string $haystack The string to search in.
-     * @param string $needle   The string to search for.
-     *
-     * @return bool true if $haystack starts with $needle, false otherwise.
-     */
-    protected static function _stringStartsWith ($haystack, $needle)
-    {
-        $startsWith = false;
-        if (strlen($needle) <= strlen($haystack)) {
-            $haystackBeginning = substr($haystack, 0, strlen($needle));
-            if (0 === strcmp($haystackBeginning, $needle)) {
-                $startsWith = true;
-            }
-        }
-        return $startsWith;
-    }//_stringStartsWith()
-}//end class
-
-?>

build/CodeIgniter/UnusedSniffs/Files/ClosingFileCommentSniff.php

@@ -1,109 +0,0 @@
-<?php
-/**
- * CodeIgniter_Sniffs_Files_ClosingFileCommentSniff.
- *
- * PHP version 5
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baobaz.com>
- * @copyright 2006 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-/**
- * CodeIgniter_Sniffs_Files_ClosingFileCommentSniff.
- *
- * Ensures that a comment containing the file name is available at the end of file.
- * Only other comments and whitespaces are allowed to follow this specific comment.
- *
- * It may be all kind of comment like multi-line and inline C-style comments as
- * well as PERL-style comments. Any number of white may separate comment delimiters
- * from comment content. However, content has to be equal to template
- * "End of file <file_name>". Comparison between content and template is
- * case-sensitive.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baobaz.com>
- * @copyright 2006 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-namespace CodeIgniter\Sniffs\Files;
-
-use PHP_CodeSniffer\Files\File;
-
-class ClosingFileCommentSniff extends AbstractClosingCommentSniff
-{
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-            T_OPEN_TAG,
-        );
-
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param File $phpcsFile The current file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        // We are only interested if this is the first open tag.
-        if ($stackPtr !== 0) {
-            if ($phpcsFile->findPrevious(T_OPEN_TAG, ($stackPtr - 1)) !== false) {
-                return;
-            }
-        }
-
-        $fullFilename = $phpcsFile->getFilename();
-        $filename = basename($fullFilename);
-        $commentTemplate = "End of file $filename";
-
-        $tokens = $phpcsFile->getTokens();
-        $currentToken = count($tokens) - 1;
-        $hasClosingFileComment = false;
-        $isNotAWhitespaceOrAComment = false;
-        while ($currentToken >= 0
-            && ! $isNotAWhitespaceOrAComment
-            && ! $hasClosingFileComment
-        ) {
-            $token = $tokens[$currentToken];
-            $tokenCode = $token['code'];
-            if (T_COMMENT === $tokenCode) {
-                $commentString = self::_getCommentContent($token['content']);
-                if (0 === strcmp($commentString, $commentTemplate)) {
-                    $hasClosingFileComment = true;
-                }
-            } else if (T_WHITESPACE === $tokenCode) {
-                // Whitespaces are allowed between the closing file comment,
-                // other comments and end of file
-            } else {
-                $isNotAWhitespaceOrAComment = true;
-            }
-            $currentToken--;
-        }
-
-        if ( ! $hasClosingFileComment) {
-            $error = 'No comment block marks the end of file instead of the closing PHP tag. Please add a comment block containing only "' . $commentTemplate . '".';
-            $phpcsFile->addError($error, $currentToken);
-        }
-    }//end process()
-}//end class
-
-?>

build/CodeIgniter/UnusedSniffs/Files/ClosingLocationCommentSniff.php

@@ -1,182 +0,0 @@
-<?php
-/**
- * CodeIgniter_Sniffs_Files_ClosingLocationCommentSniff.
- *
- * PHP version 5
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baobaz.com>
- * @copyright 2006 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-/**
- * CodeIgniter_Sniffs_Files_ClosingLocationCommentSniff.
- *
- * Ensures that a comment containing the file location exists at the end of file.
- * Only other comments and whitespaces are allowed between this comment and
- * the end of file.
- *
- * It may be all kind of comment like multi-line and inline C-style comments as
- * well as PERL-style comments. Any number of white may separate comment delimiters
- * from comment content. However, content has to be equal to template
- * "Location: <file_path_relative_to_application_root>".
- * Comparison between content and template is case-sensitive.
- *
- * There are several ways to configure the application root. In order of priority :
- *   - Configuration variable ci_application_root.
- *   - Rule property applicationRoot.
- *   - Default value '/application/'
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baobaz.com>
- * @copyright 2006 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-namespace CodeIgniter\Sniffs\Files;
-
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util\Common;
-
-class ClosingLocationCommentSniff extends AbstractClosingCommentSniff
-{
-    public $applicationRoot = '/application/';
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-            T_OPEN_TAG
-        );
-
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param File $phpcsFile The current file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        // We are only interested if this is the first open tag.
-        if ($stackPtr !== 0) {
-            if ($phpcsFile->findPrevious(T_OPEN_TAG, ($stackPtr - 1)) !== false) {
-                return;
-            }
-        }
-
-        $filePath = $phpcsFile->getFilename();
-        $tokens = $phpcsFile->getTokens();
-        // removes the application root from the beginning of the file path
-        $locationPath = self::_getLocationPath($filePath, $this->_getAppRoot());
-        // add an error, if application root doesn't exist in current file path
-        if (false === $locationPath) {
-            $error = 'Unable to find "' . $this->_getAppRoot() . '" in file path "' . $filePath . '". Please set your project\'s application root.';
-            $phpcsFile->addError($error, count($tokens) - 1);
-            return;
-        }
-        // generates the expected comment
-        $commentTemplate = "Location: $locationPath";
-
-        $currentToken = count($tokens) - 1;
-        $hasClosingLocationComment = false;
-        $isNotAWhitespaceOrAComment = false;
-        while ($currentToken >= 0
-            && ! $isNotAWhitespaceOrAComment
-            && ! $hasClosingLocationComment
-        ) {
-            $token = $tokens[$currentToken];
-            $tokenCode = $token['code'];
-            if (T_COMMENT === $tokenCode) {
-                $commentString = self::_getCommentContent($token['content']);
-                if (0 === strcmp($commentString, $commentTemplate)) {
-                    $hasClosingLocationComment = true;
-                }
-            } else if (T_WHITESPACE === $tokenCode) {
-                // Whitespaces are allowed between the closing file comment,
-                //other comments and end of file
-            } else {
-                $isNotAWhitespaceOrAComment = true;
-            }
-            $currentToken--;
-        }
-
-        if ( ! $hasClosingLocationComment) {
-            $error = 'No comment block marks the end of file instead of the closing PHP tag. Please add a comment block containing only "' . $commentTemplate . '".';
-            $phpcsFile->addError($error, $currentToken);
-        }
-    }//end process()
-
-
-    /**
-     * Returns the relative path from $appRoot to $filePath, or false if
-     * $appRoot cannot be found in $filePath, because $appRoot is not a parent
-     * of $filePath.
-     *
-     * @param string $filePath Full path to the file being proceed.
-     * @param string $appRoot  Partial or full path to the CodeIgniter
-     * application root of the file being proceed. It must not contain the
-     * full path to the application root, but at least the name of the
-     * application root. Parent directory of the application root are allowed
-     * but not mandatory.
-     *
-     * @return string|bool The relative path from $appRoot to $filePath, or
-     * false if $appRoot cannot be found in $filePath.
-     */
-    private static function _getLocationPath ($filePath, $appRoot)
-    {
-        // removes the path to application root
-        // from the beginning of the file path
-        $appRootAt = strpos($filePath, $appRoot);
-        if (false === $appRootAt) {
-            return false;
-        }
-        $localPath = substr($filePath, $appRootAt + strlen($appRoot));
-        // ensures the location path to be a relative path starting with "./".
-        if ( ! self::_stringStartsWith($localPath, './')) {
-            $localPath = './' . $localPath;
-        } else if ( ! self::_stringStartsWith($localPath, '.')
-            && self::_stringStartsWith($localPath, '/')
-        ) {
-            $localPath = '.' . $localPath;
-        }
-        return $localPath;
-    }//end _getLocationPath()
-
-
-    /**
-     * Returns the application root that should be used first.
-     *
-     * There are several ways to configure the application root.
-     * In order of priority :
-     *   - Configuration variable ci_application_root.
-     *   - Rule property applicationRoot.
-     *   - Default value '/application/'
-     *
-     * @return string Path to your project application root.
-     */
-    private function _getAppRoot()
-    {
-        $appRoot = Common::getConfigData('ci_application_root');
-        if (null === $appRoot) {
-            $appRoot = $this->applicationRoot;
-        }
-        return $appRoot;
-    }//end _getAppRoot()
-}//end class
-
-?>

build/CodeIgniter/UnusedSniffs/NamingConventions/ConstructorNameSniff.php

@@ -1,142 +0,0 @@
-<?php
-/**
- * CodeIgniter_Sniffs_NamingConventions_ConstructorNameSniff.
- *
- * PHP version 5
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@gmail.com>
- * @copyright 2011 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-namespace CodeIgniter\Sniffs\NamingConventions;
-
-use PHP_CodeSniffer\Sniffs\AbstractScopeSniff;
-use PHP_CodeSniffer\Files\File;
-
-/**
- * CodeIgniter_Sniffs_NamingConventions_ConstructorNameSniff.
- *
- * Favor PHP 4 constructor syntax, which uses "function ClassName()".
- * Avoid PHP 5 constructor syntax, which uses "function __construct()".
- *
- * @todo Try to avoid overly long and verbose names.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@gmail.com>
- * @copyright 2010 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-class ConstructorNameSniff extends AbstractScopeSniff
-{
-
-
-    public $php5Constructors = '1';
-
-
-    /**
-     * Constructs the test with the tokens it wishes to listen for.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct(array(T_CLASS, T_INTERFACE), array(T_FUNCTION), true);
-
-    }//end __construct()
-
-
-    /**
-     * Processes this test when one of its tokens is encountered.
-     *
-     * @param File $phpcsFile The current file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     * @param int                  $currScope A pointer to the start of the scope.
-     *
-     * @return void
-     */
-    protected function processTokenWithinScope(
-        File $phpcsFile,
-        $stackPtr,
-        $currScope
-    ) {
-        $methodName = $phpcsFile->getDeclarationName($stackPtr);
-        $className  = $phpcsFile->getDeclarationName($currScope);
-
-	$isPhp4Constructor = strcasecmp($methodName, $className) === 0;
-	$isPhp5Constructor = strcasecmp($methodName, '__construct') === 0;
-        if ($this->php5Constructors != '0') {
-            if ($isPhp4Constructor) {
-                $error = "PHP4 style constructors are not allowed; use \"__construct\" instead";
-                $phpcsFile->addError($error, $stackPtr);
-            }
-        } else {
-            if ($isPhp5Constructor) {
-                $error = "PHP5 style constructors are not allowed; use \"$className\" instead";
-                $phpcsFile->addError($error, $stackPtr);
-            }
-        }
-        if ( ! $isPhp4Constructor && ! $isPhp5Constructor ) {
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-
-        $parentClassName = $phpcsFile->findExtendedClassName($currScope);
-        $wrongConstructor = '';
-        // prepares the error message and wrong constructor
-        if ($this->php5Constructors != '0') {
-            $error = 'PHP4 style calls to parent constructors are not allowed.';
-            $error = "$error Please use \"parent::__construct\" instead.";
-            if (false !== $parentClassName) {
-                $wrongConstructor = $parentClassName;
-            }
-            // Else $wrongConstructor will be empty
-            // and the test expression will always be false.
-            // It doesn't check that no parent method should be called
-            // when no parent class is defined.
-        } else {
-            $error = 'PHP5 style calls to parent constructors are not allowed.';
-            if (false !== $parentClassName) {
-                $error = "$error Please use \"parent::$parentClassName\" instead.";
-            }
-            $wrongConstructor = '__construct';
-        }
-
-        // looks for the use of a wrong constructor.
-        $endFunctionIndex = $tokens[$stackPtr]['scope_closer'];
-        $doubleColonIndex = $phpcsFile->findNext(
-            array(T_DOUBLE_COLON),
-            $stackPtr,
-            $endFunctionIndex
-        );
-        while ($doubleColonIndex) {
-            if ($tokens[($doubleColonIndex + 1)]['code'] === T_STRING
-                && $tokens[($doubleColonIndex + 1)]['content'] === $wrongConstructor
-            ) {
-                $phpcsFile->addError($error, ($doubleColonIndex + 1));
-            }
-
-            $doubleColonIndex = $phpcsFile->findNext(
-                array(T_DOUBLE_COLON),
-                $doubleColonIndex + 1,
-                $endFunctionIndex
-            );
-        }
-
-    }//end processTokenWithinScope()
-
-	protected function processTokenOutsideScope(File $phpcsFile, $stackPtr)
-	{
-		// TODO: Implement processTokenOutsideScope() method.
-	}
-
-}//end class
-
-?>

build/CodeIgniter/UnusedSniffs/NamingConventions/ValidClassNameSniff.php

@@ -1,84 +0,0 @@
-<?php
-/**
- * CodeIgniter_Sniffs_NamingConventions_ValidClassNameSniff.
- *
- * PHP version 5
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baoabz.com>
- * @copyright 2010 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-/**
- * CodeIgniter_Sniffs_NamingConventions_ValidClassNameSniff.
- *
- * Ensures that class and interface names have their first letter uppercase
- * and that words are separated with an underscore, and not CamelCased.
- *
- * @todo Try to avoid overly long and verbose names in using property rule and
- * configuration variable to set limits. Have a look at
- * CodeIgniter_Sniffs_NamingConventions_ValidMethodNameSniff.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baoabz.com>
- * @copyright 2010 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-namespace CodeIgniter\Sniffs\NamingConventions;
-
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Files\File;
-
-class ValidClassNameSniff implements Sniff
-{
-
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-            T_CLASS,
-            T_INTERFACE,
-        );
-
-    }//end register()
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param File $phpcsFile The current file being processed.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        // get the class name
-        $className = trim($phpcsFile->getDeclarationName($stackPtr));
-        // compute the expected class name
-        // [^_] means "something different from _", but not "nothing or something different from _"
-        $lcClassNameChunk = preg_replace('/([^_])([A-Z])/', '${1}_${2}', $className);
-        $expectedClassName
-            = strtoupper($className[0]) . strtolower(substr($lcClassNameChunk,1));
-        // ensures that the current class name
-        // and the expected class name are identical
-        if (0 !== strcmp($className, $expectedClassName)) {
-            $error =  'Class names should always have their first letter uppercase. Multiple words should be separated with an underscore, and not CamelCased. Please consider ' . $expectedClassName . ' instead of ' . $className . '.';
-            $phpcsFile->addError($error, $stackPtr);
-        }
-    }//end process()
-
-}//end class
-
-?>

build/CodeIgniter/UnusedSniffs/NamingConventions/ValidFileNameSniff.php

@@ -1,84 +0,0 @@
-<?php
-/**
- * CodeIgniter_Sniffs_NamingConventions_ValidFileNameSniff.
- *
- * PHP version 5
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baobaz.com>
- * @copyright 2011 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-/**
- * CodeIgniter_Sniffs_NamingConventions_ValidFileNameSniff.
- *
- * Tests that the file name matchs the name of the class  that it contains in lower case.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baobaz.com>
- * @copyright 2011 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-namespace CodeIgniter\Sniffs\NamingConventions;
-
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Files\File;
-
-class ValidFileNameSniff implements Sniff
-{
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-            T_CLASS,
-            T_INTERFACE,
-        );
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param File $phpcsFile The file being scanned.
-     * @param int                  $stackPtr  The position of the current token in the
-     *                                        stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        // computes the expected filename based on the name of the class or interface that it contains.
-        $decNamePtr = $phpcsFile->findNext(T_STRING, $stackPtr);
-        $decName = $tokens[$decNamePtr]['content'];
-        $expectedFileName = strtolower($decName);
-        // extracts filename without extension from its path.
-        $fullPath = $phpcsFile->getFilename();
-        $fileNameAndExt = basename($fullPath);
-        $fileName = substr($fileNameAndExt, 0, strrpos($fileNameAndExt, '.'));
-
-        if ($expectedFileName !== $fileName) {
-            $errorTemplate = 'Filename "%s" doesn\'t match the name of the %s that it contains "%s" in lower case. "%s" was expected.';
-            $errorMessage = sprintf(
-                $errorTemplate,
-                $fileName,
-                strtolower($tokens[$stackPtr]['content']), // class or interface
-                $decName,
-                $expectedFileName
-            );
-            $phpcsFile->addError($errorMessage, 0);
-        }
-    }//end process()
-}//end class
-
-?>

build/CodeIgniter/UnusedSniffs/NamingConventions/ValidMethodNameSniff.php

@@ -1,161 +0,0 @@
-<?php
-/**
- * CodeIgniter_Sniffs_NamingConventions_ValidMethodNameSniff.
- *
- * PHP version 5
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baoabz.com>
- * @copyright 2010 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-/**
- * CodeIgniter_Sniffs_NamingConventions_ValidMethodNameSniff.
- *
- * Ensures that class methods and functions areentirely lowercased and that
- * words are separated with an underscore, and not CamelCased.
- * Ensures that private class methods are prefixed with an underscore and that
- * all other methods are not prefixed with an underscored.
- * Ensures that names longer than 50 chars are prohibited. Likewise names longer
- * than 35 chars raise a warning.
- *
- * @todo Use a rule property or a configuration variable to allow users to set
- * their own maximum lengths for function and method names. Have a look at
- * CodeIgniter_Sniffs_Files_ClosingLocationCommentSniff and application root.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baoabz.com>
- * @copyright 2010 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-namespace CodeIgniter\Sniffs\NamingConventions;
-
-use PHP_CodeSniffer\Sniffs\AbstactScopeSniff;
-use PHP_CodeSniffer\Files\File;
-
-class ValidMethodNameSniff extends AbstractScopeSniff
-{
-    /**
-     * A list of all PHP magic methods.
-     *
-     * @var array
-     */
-    protected static $magicMethods = array(
-                               'construct',
-                               'destruct',
-                               'call',
-                               'callStatic',
-                               'get',
-                               'set',
-                               'isset',
-                               'unset',
-                               'sleep',
-                               'wakeup',
-                               'toString',
-                               'set_state',
-                               'clone',
-                              );
-
-    /**
-     * Defines which token(s) in which scope(s) will be proceed.
-     */
-    public function __construct()
-    {
-        parent::__construct(array(T_CLASS, T_INTERFACE), array(T_FUNCTION), true);
-
-    }//end __construct()
-
-
-    /**
-     * Processes the tokens within the scope.
-     *
-     * @param File $phpcsFile The file being processed.
-     * @param int                  $stackPtr  The position where this token was
-     *                                        found.
-     * @param int                  $currScope The position of the current scope.
-     *
-     * @return void
-     */
-    protected function processTokenWithinScope(File $phpcsFile, $stackPtr, $currScope)
-    {
-        $methodName = $phpcsFile->getDeclarationName($stackPtr);
-        if ($methodName === null) {
-            // Ignore closures.
-            return;
-        }
-
-        $className  = $phpcsFile->getDeclarationName($currScope);
-
-        // Is this a magic method i.e. is prefixed with "__".
-        if (0 === strcmp(substr($methodName, 0, 2), '__')) {
-            $magicPart = substr($methodName, 2);
-            if (in_array($magicPart, self::$magicMethods) === false) {
-                 $error = "Method name \"$className::$methodName\" is invalid; only PHP magic methods should be prefixed with a double underscore";
-                 $phpcsFile->addError($error, $stackPtr);
-            }
-
-            return;
-        }
-
-        // PHP4 constructors are allowed to break our rules.
-        if ($methodName === $className) {
-            return;
-        }
-
-        // PHP4 destructors are allowed to break our rules.
-        if ($methodName === '_'.$className) {
-            return;
-        }
-
-        if (0 !== strcmp($methodName, strtolower($methodName))) {
-            $uscrdMethodName = preg_replace('/([A-Z])/', '_${1}', $methodName);
-            $expectedMethodName = strtolower($uscrdMethodName);
-            $error = "Class methods should be entirely lowercased. Please consider \"$expectedMethodName\" instead of \"$methodName\".";
-            $phpcsFile->addError($error, $stackPtr);
-            return;
-        }
-
-        $methodProps    = $phpcsFile->getMethodProperties($stackPtr);
-        $scope          = $methodProps['scope'];
-        $scopeSpecified = $methodProps['scope_specified'];
-
-        // If it's a private method, it must have an underscore on the front.
-        if ($scope === 'private' && $methodName{0} !== '_') {
-            $error = "Private method name \"$className::$methodName\" must be prefixed with an underscore";
-            $phpcsFile->addError($error, $stackPtr);
-            return;
-        }
-
-        // If it's not a private method, it must not have an underscore on the front.
-        if ($scope !== 'private' && $methodName{0} === '_') {
-            if (true === $scopeSpecified) {
-                $error = "Public method name \"$className::$methodName\" must not be prefixed with an underscore";
-            } else {
-                $error = ucfirst($scope)." method name \"$className::$methodName\" must not be prefixed with an underscore";
-            }
-            $phpcsFile->addError($error, $stackPtr);
-            return;
-        }
-
-        // If name is too verbose,
-        // then either an error or a warning is displayed.
-        $error_limit = 50;
-        $warning_limit = 35;
-        if (strlen($methodName) > $error_limit) {
-            $error = "Overly long and verbose names are prohibited. Please find a name shorter than $error_limit chars.";
-            $phpcsFile->addError($error, $stackPtr);
-            return;
-        } else if (strlen($methodName) > $warning_limit) {
-            $warning = "Try to avoid overly long and verbose names in finding a name shorter than $warning_limit chars.";
-            $phpcsFile->addWarning($warning, $stackPtr);
-        }
-    }//end processTokenWithinScope()
-
-}//end class
-
-?>

build/CodeIgniter/UnusedSniffs/NamingConventions/ValidVariableNameSniff.php

@@ -1,562 +0,0 @@
-<?php
-/**
- * CodeIgniter_Sniffs_NamingConventions_ValidVariableNameSniff.
- *
- * PHP version 5
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baoabz.com>
- * @copyright 2010 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-/**
- * CodeIgniter_Sniffs_NamingConventions_ValidVariableNameSniff.
- *
- * Ensures that variable names contain only lowercase letters,
- * use underscore separators.
- * Ensures that class attribute names are prefixed with an underscore,
- * only when they are private.
- * Ensure that variable names are longer than 3 chars except those declared
- * in for loops.
- *
- * @todo Try to avoid overly long and verbose names in using property rule and
- * configuration variable to set limits. Have a look at
- * CodeIgniter_Sniffs_NamingConventions_ValidMethodNameSniff.
- * @todo Use a property rule or a configuration variable to allow users to set
- * minimum variable name length. Have a look at
- * CodeIgniter_Sniffs_Files_ClosingLocationCommentSniff and application root.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Thomas Ernest <thomas.ernest@baoabz.com>
- * @copyright 2010 Thomas Ernest
- * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-namespace CodeIgniter\Sniffs\NamingConventions;
-
-use PHP_CodeSniffer\Sniffs\AbstractVariableSniff;
-use PHP_CodeSniffer\Files\File;
-
-class ValidVariableNameSniff extends AbstractVariableSniff
-{
-
-
-    /**
-     * Processes class member variables.
-     *
-     * @param File $phpcsFile The file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    protected function processMemberVar(File $phpcsFile, $stackPtr)
-    {
-        // get variable name and properties
-        $tokens = $phpcsFile->getTokens();
-        $varTk = $tokens[$stackPtr];
-        $varName = substr($varTk['content'], 1);
-        $varProps = $phpcsFile->getMemberProperties($stackPtr);
-        // check(s)
-        if ( ! $this->checkLowerCase($phpcsFile, $stackPtr, $varName) ) {
-            return;
-        }
-        if ( ! $this->checkVisibilityPrefix($phpcsFile, $stackPtr, $varName, $varProps)) {
-            return;
-        }
-        if ( ! $this->checkLength($phpcsFile, $stackPtr, $varName)) {
-            return;
-        }
-
-    }//end processMemberVar()
-
-
-    /**
-     * Processes normal variables.
-     *
-     * @param File $phpcsFile The file where this token was found.
-     * @param int                  $stackPtr  The position where the token was found.
-     *
-     * @return void
-     */
-    protected function processVariable(File $phpcsFile, $stackPtr)
-    {
-        // get variable name
-        $tokens = $phpcsFile->getTokens();
-        $varTk = $tokens[$stackPtr];
-        $varName = substr($varTk['content'], 1);
-        // skip the current object variable, i.e. $this
-        if (0 === strcmp($varName, 'this')) {
-            return;
-        }
-        // check(s)
-        if ( ! $this->checkLowerCase($phpcsFile, $stackPtr, $varName)) {
-            return;
-        }
-        if ( ! $this->checkLength($phpcsFile, $stackPtr, $varName)) {
-            return;
-        }
-
-    }//end processVariable()
-
-
-    /**
-     * Processes variables in double quoted strings.
-     *
-     * @param File $phpcsFile The file where this token was found.
-     * @param int                  $stackPtr  The position where the token was found.
-     *
-     * @return void
-     */
-    protected function processVariableInString(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        $stringTk = $tokens[$stackPtr];
-        $stringString = $stringTk['content'];
-        $varAt = self::_getVariablePosition($stringString, 0);
-        while (false !== $varAt) {
-            // get variable name
-            $matches = array();
-            preg_match('/^\$\{?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)\}?/', substr($stringString, $varAt), $matches);
-            $varName = $matches[1];
-            // check(s)
-            if ( ! $this->checkLowerCase($phpcsFile, $stackPtr, $varName)) {
-                return;
-            }
-            if ( ! $this->checkLength($phpcsFile, $stackPtr, $varName)) {
-                return;
-            }
-            // prepare checking next variable
-            $varAt = self::_getVariablePosition($stringString, $varAt + 1);
-        }
-
-    }//end processVariableInString()
-
-
-    /**
-     * Checks that the variable name is all in lower case, else it add an error
-     * to $phpcsFile. Returns true if variable name is all in lower case, false
-     * otherwise.
-     *
-     * @param File $phpcsFile The current file being processed.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     * @param string               $varName   The name of the variable to
-     *                                        procced without $, { nor }.
-     *
-     * @return bool true if variable name is all in lower case, false otherwise.
-     */
-    protected function checkLowerCase(File $phpcsFile, $stackPtr, $varName)
-    {
-        $isInLowerCase = true;
-        if (0 !== strcmp($varName, strtolower($varName))) {
-            // get the expected variable name
-            $varNameWithUnderscores = preg_replace('/([A-Z])/', '_${1}', $varName);
-            $expectedVarName = strtolower(ltrim($varNameWithUnderscores, '_'));
-            // adapts the error message to the error case
-            if (strlen($varNameWithUnderscores) > strlen($varName)) {
-                $error = 'Variables should not use CamelCasing or start with a Capital.';
-            } else {
-                $error = 'Variables should be entirely lowercased.';
-            }
-            $error = $error . 'Please consider "' . $expectedVarName
-                . '" instead of "' . $varName . '".';
-            // adds the error and changes return value
-            $phpcsFile->addError($error, $stackPtr);
-            $isInLowerCase = false;
-        }
-        return $isInLowerCase;
-    }//end checkLowerCase()
-
-    /**
-     * Checks that an underscore is used at the beginning of a variable only if
-     * it is about a private variable. If it isn't a private variable, then it
-     * must not be prefixed with an underscore. Returns true if $varName is
-     * properly prefixed according to the variable visibility provided in
-     * $varProps, false otherwise.
-     *
-     * @param File $phpcsFile The current file being processed.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     * @param string               $varName   The name of the variable to
-     *                                        procced without $, { nor }.
-     * @param array                $varProps  Member variable properties like
-     *                                        its visibility.
-     *
-     * @return bool true if variable name is prefixed with an underscore only
-     * when it is about a private variable, false otherwise.
-     */
-    protected function checkVisibilityPrefix(File $phpcsFile, $stackPtr, $varName, $varProps)
-    {
-        $isVisibilityPrefixRight = true;
-        $scope = $varProps['scope'];
-        // If it's a private variable, it must have an underscore on the front.
-        if ($scope === 'private' && $varName{0} !== '_') {
-            $error = "Private variable name \"$varName\" must be prefixed with an underscore";
-            $phpcsFile->addError($error, $stackPtr);
-            $isVisibilityPrefixRight = false;
-        } else if ($scope !== 'private' && $varName{0} === '_') {
-            // If it's not a private variable,
-            // then it must not start with an underscore.
-            if (isset ($scopeSpecified) && true === $scopeSpecified) {
-                $error = "Public variable name \"$varName\" must not be prefixed with an underscore";
-            } else {
-                $error = ucfirst($scope) . " variable name \"$varName\" must not be prefixed with an underscore";
-            }
-            $phpcsFile->addError($error, $stackPtr);
-            $isVisibilityPrefixRight = false;
-        }
-        return $isVisibilityPrefixRight;
-    }//end checkVisibilityPrefix()
-
-    /**
-     * Checks that variable name length is not too short. Returns true, if it
-     * meets minimum length requirement, false otherwise.
-     *
-     * A variable name is too short if it is shorter than the minimal
-     * length and it isn't in the list of allowed short names nor declared in a
-     * for loop (in which it would be nested).
-     * The minimal length is defined in the function. It is 3 chars now.
-     * The list of allowed short names is defined in the function.
-     * It is case-sensitive. It contains only 'ci' now.
-     *
-     * @param File $phpcsFile The current file being processed.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     * @param string               $varName   The name of the variable to
-     *                                        procced without $, { nor }.
-     *
-     * @return bool false if variable name $varName is shorter than the minimal
-     * length and it isn't in the list of allowed short names nor declared in a
-     * for loop (in which it would be nested), otherwise true.
-     */
-    protected function checkLength(File $phpcsFile, $stackPtr, $varName)
-    {
-        $minLength = 3;
-        $allowedShortName = array('ci');
-
-        $isLengthRight = true;
-        // cleans variable name
-        $varName = ltrim($varName, '_');
-        if (strlen($varName) <= $minLength) {
-            // skips adding an error, if it is a specific variable name
-            if (in_array($varName, $allowedShortName)) {
-                return $isLengthRight;
-            }
-            // skips adding an error, if the variable is in a for loop
-            if (false !== self::_isInForLoop($phpcsFile, $stackPtr, $varName)) {
-                return $isLengthRight;
-            }
-            // adds the error message finally
-            $error = 'Very short'
-                . (
-                    $minLength > 0 ?
-                    ' (i.e. less than ' . ($minLength + 1) . ' chars)'
-                    : ''
-                )
-                . ', non-word variables like "' . $varName
-                . '" should only be used as iterators in for() loops.';
-            $phpcsFile->addError($error, $stackPtr);
-            $isLengthRight = false;
-        }
-        return $isLengthRight;
-    }//end checkLength()
-
-    /**
-     * Returns the position of closest previous T_FOR, if token associated with
-     * $stackPtr in $phpcsFile is in a for loop, otherwise false.
-     *
-     * @param File $phpcsFile The current file being processed.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     * @param string               $varName   The name of the variable to
-     *                                        procced without $, { nor }.
-     *
-     * @return int|bool Position of T_FOR if token associated with $stackPtr in
-     *                  $phpcsFile is in the head of a for loop, otherwise false.
-     */
-    private static function _isInForLoop(File $phpcsFile, $stackPtr, $varName)
-    {
-        $keepLookingFromPtr = $stackPtr;
-        while (false !== $keepLookingFromPtr) {
-            // looks if it is in (head or body) of a for loop
-            $forPtr = self::_isInForLoopHead($phpcsFile, $keepLookingFromPtr);
-            if (false === $forPtr) {
-                $forPtr = self::_isInForLoopBody($phpcsFile, $keepLookingFromPtr);
-            }
-            // checks if it is declared in here and prepares next step
-            if (false !== $forPtr) {
-                if (false !== self::_isDeclaredInForLoop($phpcsFile, $forPtr, $varName)) {
-                    return $forPtr;
-                }
-                $keepLookingFromPtr = $forPtr;
-            } else {
-                $keepLookingFromPtr = false;
-            }
-        }
-        return false;
-    }//end _isInForLoop()
-
-    /**
-     * Returns the position of closest previous T_FOR, if token associated with
-     * $stackPtr in $phpcsFile is in the head of a for loop, otherwise false.
-     * The head is the code placed between parenthesis next to the key word
-     * 'for' : for (<loop_head>) {<loop_body>}.
-     *
-     * @param File $phpcsFile The current file being processed.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return int|bool Position of T_FOR if token associated with $stackPtr in
-     *                  $phpcsFile is in the head of a for loop, otherwise false.
-     */
-    private static function _isInForLoopHead(File $phpcsFile, $stackPtr)
-    {
-        $isInForLoop = false;
-        $tokens = $phpcsFile->getTokens();
-        $currentTk = $tokens[$stackPtr];
-        if (array_key_exists('nested_parenthesis', $currentTk)) {
-            $nestedParenthesis = $currentTk['nested_parenthesis'];
-            foreach ( $nestedParenthesis as $openParPtr => $closeParPtr) {
-                $nonWhitspacePtr = $phpcsFile->findPrevious(
-                    array(T_WHITESPACE),
-                    $openParPtr - 1,
-                    null,
-                    true,
-                    null,
-                    true
-                );
-                if (false !== $nonWhitspacePtr) {
-                    $isFor = T_FOR === $tokens[$nonWhitspacePtr]['code'];
-                    if ($isFor) {
-                        $isInForLoop = $nonWhitspacePtr;
-                        break;
-                    }
-                }
-            }
-        }
-        return $isInForLoop;
-    }//end _isInForLoopHead()
-
-    /**
-     * Returns the position of closest previous T_FOR, if token associated with
-     * $stackPtr in $phpcsFile is in the body of a for loop, otherwise false.
-     * The body are the instructions placed after parenthesis of a 'for'
-     * declaration, enclosed with curly brackets usually.
-     * 'for' : for (<loop_head>) {<loop_body>}.
-     *
-     * @param File $phpcsFile The current file being processed.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return int|bool Position of T_FOR if token associated with $stackPtr in
-     *                  $phpcsFile is in the body of a for loop, otherwise false.
-     */
-    private static function _isInForLoopBody(File $phpcsFile, $stackPtr)
-    {
-        $isInForLoop = false;
-        $tokens = $phpcsFile->getTokens();
-        // get englobing hierarchy
-        $parentPtrAndCode = $tokens[$stackPtr]['conditions'];
-        krsort($parentPtrAndCode);
-
-        // looks for a for loop having a body not enclosed with curly brackets,
-        // which involves that its body contains only one instruction.
-        if (is_array($parentPtrAndCode) && ! empty($parentPtrAndCode)) {
-            $parentCode = reset($parentPtrAndCode);
-            $parentPtr = key($parentPtrAndCode);
-            $openBracketPtr = $tokens[$parentPtr]['scope_opener'];
-        } else {
-            $parentCode = 0;
-            $parentPtr = 0;
-            $openBracketPtr = 0;
-        }
-        $openResearchScopePtr = $stackPtr;
-        // recursive search, since a for statement may englobe other inline
-        // control statement or may be near to function calls, etc...
-        while (false !== $openResearchScopePtr) {
-            $closeParPtr = $phpcsFile->findPrevious(
-                array(T_CLOSE_PARENTHESIS),
-                $openResearchScopePtr,
-                null,
-                false,
-                null,
-                true
-            );
-            // is there a closing parenthesis with a control statement before
-            // the previous instruction ?
-            if (false !== $closeParPtr) {
-                // is there no opening curly bracket specific to
-                // set of instructions, between the closing parenthesis
-                // and the current token ?
-                if ($openBracketPtr < $closeParPtr) {
-                    // starts the search from the token before the closing
-                    // parenthesis, if it isn't a for statement
-                    $openResearchScopePtr = $closeParPtr - 1;
-                    // is this parenthesis associated with a for statement ?
-                    $closeParenthesisTk = $tokens[$closeParPtr];
-                    if (array_key_exists('parenthesis_owner', $closeParenthesisTk)) {
-                        $mayBeForPtr = $closeParenthesisTk['parenthesis_owner'];
-                        $mayBeForTk = $tokens[$mayBeForPtr];
-                        if (T_FOR === $mayBeForTk['code']) {
-                            return $mayBeForPtr;
-                        }
-                    }
-                } else {
-                    // if it is about a for loop, don't go further
-                    // and detect it after one more loop execution, do it now
-                    if (T_FOR === $parentCode) {
-                        return $parentPtr;
-                    }
-                    // starts the search from the token before the one
-                    // englobing the current statement
-                    $openResearchScopePtr = $parentPtr - 1;
-                    // re-initialize variables about the englobing structure
-                    if (is_array($parentPtrAndCode)) {
-                        $parentCode = next($parentPtrAndCode);
-                        $parentPtr = key($parentPtrAndCode);
-                        $openBracketPtr = $tokens[$parentPtr]['scope_opener'];
-                    }
-                }
-            } else {
-                $openResearchScopePtr = false;
-            }
-        }
-        // looks for a for loop having a body enclosed with curly brackets
-        foreach ($parentPtrAndCode as $parentPtr => $parentCode) {
-            if (T_FOR === $parentCode) {
-                return $parentPtr;
-            }
-        }
-        return false;
-    }//end _isInForLoopBody()
-
-    /**
-     * Returns true if a variable declared in the head of the for loop pointed
-     * by $forPtr in file $phpcsFile has the name $varName.
-     *
-     * @param File $phpcsFile The current file being processed.
-     * @param int                  $forPtr    The position of the 'for' token
-     *                                        in the stack passed in $tokens.
-     * @param string               $varName   The name of the variable to
-     *                                        procced without $, { nor }.
-     *
-     * @return int|bool true if a variable declared in the head of the for loop
-     * pointed by $forPtr in file $phpcsFile has the name $varName.
-     */
-    private static function _isDeclaredInForLoop(File $phpcsFile, $forPtr, $varName)
-    {
-        $isDeclaredInFor = false;
-        $tokens = $phpcsFile->getTokens();
-        $forVarPtrs = self::_getVarDeclaredInFor($phpcsFile, $forPtr);
-        foreach ($forVarPtrs as $forVarPtr) {
-            $forVarTk = $tokens[$forVarPtr];
-            // get variable name
-            $matches = array();
-            preg_match('/^\$\{?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)\}?/', $forVarTk['content'], $matches);
-            $forVarName = $matches[1];
-            if (0 === strcmp($forVarName, $varName)) {
-                $isDeclaredInFor = $forVarPtr;
-                break;
-            }
-        }
-        return $isDeclaredInFor;
-    }//end _isDeclaredInForLoop()
-
-    /**
-     * Returns list of pointers to variables declared in for loop associated to
-     * $forPtr in file $phpcsFile.
-     *
-     * All pointers in the result list are pointing to token with code
-     * T_VARIABLE. An exception is raised, if $forPtr doesn't point a token with
-     * code T_FOR.
-     *
-     * @param File $phpcsFile The current file being processed.
-     * @param int                  $forPtr    The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return array List of pointers to variables declared in for loop $forPtr.
-     */
-    private static function _getVarDeclaredInFor(File $phpcsFile, $forPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        $forTk = $tokens[$forPtr];
-        if (T_FOR !== $forTk['code']) {
-            throw new PHP_CodeSniffer_Exception('$forPtr must be of type T_FOR');
-        }
-        $openParPtr = $forTk['parenthesis_opener'];
-        $openParenthesisTk = $tokens[$openParPtr];
-        $endOfDeclPtr = $phpcsFile->findNext(array(T_SEMICOLON), $openParPtr);
-        $forVarPtrs = array();
-        $varPtr = $phpcsFile->findNext(
-            array(T_VARIABLE),
-            $openParPtr + 1,
-            $endOfDeclPtr
-        );
-        while (false !== $varPtr) {
-            $forVarPtrs [] = $varPtr;
-            $varPtr = $phpcsFile->findNext(
-                array(T_VARIABLE),
-                $varPtr + 1,
-                $endOfDeclPtr
-            );
-        }
-        return $forVarPtrs;
-    }//end _getVarDeclaredInFor()
-
-    /**
-     * Returns the position of first occurrence of a PHP variable starting with
-     * $ in $haystack from $offset.
-     *
-     * @param string $haystack The string to search in.
-     * @param int    $offset   The optional offset parameter allows you to
-     *                         specify which character in haystack to start
-     *                         searching. The returned position is still
-     *                         relative to the beginning of haystack.
-     *
-     * @return mixed The position as an integer
-     *               or the boolean false, if no variable is found.
-     */
-    private static function _getVariablePosition($haystack, $offset = 0)
-    {
-        $var_starts_at = strpos($haystack, '$', $offset);
-        $is_a_var = false;
-        while (false !== $var_starts_at && ! $is_a_var) {
-            // makes sure that $ is used for a variable and not as a symbol,
-            // if $ is protected with the escape char, then it is a symbol.
-            if (0 !== strcmp($haystack[$var_starts_at - 1], '\\')) {
-                if (0 === strcmp($haystack[$var_starts_at + 1], '{')) {
-                    // there is an opening brace in the right place
-                    // so it looks for the closing brace in the right place
-                    $hsChunk2 = substr($haystack, $var_starts_at + 2);
-                    if (1 === preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*\}/', $hsChunk2)) {
-                        $is_a_var = true;
-                    }
-                } else {
-                    $hsChunk1 = substr($haystack, $var_starts_at + 1);
-                    if (1 === preg_match('/^[a-zA-Z_\x7f-\xff]/', $hsChunk1)) {
-                        // $ is used for a variable and not as a symbol,
-                        // since what follows $ matchs the definition of
-                        // a variable label for PHP.
-                        $is_a_var = true;
-                    }
-                }
-            }
-            // update $var_starts_at for the next variable
-            // only if no variable was found, since it is returned otherwise.
-            if ( ! $is_a_var) {
-                $var_starts_at = strpos($haystack, '$', $var_starts_at + 1);
-            }
-        }
-        if ($is_a_var) {
-            return $var_starts_at;
-        } else {
-            return false;
-        }
-    }//end _getVariablePosition()
-}//end class
-
-?>

build/CodeIgniter/ruleset.xml

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ruleset name="CodeIgniter">
-  <description>CodeIgniter coding standard as described at http://codeigniter.com/user_guide/general/styleguide.html.</description>
-  <rule ref="Generic.Files.LineEndings">
-    <properties>
-      <property name="eolChar" value="\n"/>
-    </properties>
-  </rule>
-
-  <!-- PHP files should OMIT the closing PHP tag -->
-  <rule ref="Zend.Files.ClosingTag"/>
-  <!-- Always use full PHP opening tags -->
-  <rule ref="Generic.PHP.DisallowShortOpenTag"/>
-
-  <!-- Constants should always be fully uppercase -->
-  <rule ref="Generic.NamingConventions.UpperCaseConstantName"/>
-  <!-- TRUE, FALSE, and NULL keywords should always be fully uppercase -->
-  <rule ref="Generic.PHP.UpperCaseConstant"/>
-
-  <!-- One statement per line -->
-  <rule ref="Generic.Formatting.DisallowMultipleStatements"/>
-
-  <!-- Classes and functions should be commented -->
-  <rule ref="PEAR.Commenting.ClassComment"/>
-  <rule ref="PEAR.Commenting.FunctionComment"/>
-<!--  <rule ref="Squiz.Commenting.FunctionCommentThrowTag"/>-->
-  <!-- Use warnings for docblock comments for files and variables, since nothing is cleary explained -->
-  <rule ref="PEAR.Commenting.FileComment">
-    <properties>
-      <property name="error" value="false"/>
-    </properties>
-  </rule>
-  <rule ref="Squiz.Commenting.VariableComment">
-    <properties>
-      <property name="error" value="false"/>
-    </properties>
-  </rule>
-
-  <!-- Use Allman style indenting. With the exception of Class declarations,
-       braces are always placed on a line by themselves, and indented at the same level as the control statement that "owns" them. -->
-  <rule ref="Generic.Functions.OpeningFunctionBraceBsdAllman"/>
-  <rule ref="PEAR.WhiteSpace.ScopeClosingBrace"/>
-  <rule ref="Generic.Functions.FunctionCallArgumentSpacing"/>
-
-  <!-- @todo Please see PHP_CodeSniffer_Standards_CodeIgniter_CodeIgniterCodingStandard for more details about what there is to do -->
-</ruleset>
-

build/phpunit.xml

@@ -1,29 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-	colors="true"
-	stopOnFailure="false"
-	bootstrap="../tests/bootstrap.php"
-	beStrictAboutTestsThatDoNotTestAnything="true"
-	>
-	<filter>
-		<whitelist>
-			<directory suffix=".php">../src</directory>
-		</whitelist>
-	</filter>
-	<testsuites>
-		<testsuite name="AnimeClient">
-			<directory>../tests</directory>
-		</testsuite>
-	</testsuites>
-	<logging>
-		<log type="coverage-html" target="../coverage"/>
-		<log type="coverage-clover" target="logs/clover.xml"/>
-	</logging>
-	<php>
-		<server name="HTTP_USER_AGENT" value="Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:38.0) Gecko/20100101 Firefox/38.0" />
-		<server name="HTTP_HOST" value="localhost" />
-		<server name="SERVER_NAME" value="localhost" />
-		<server name="REQUEST_URI" value="/" />
-		<server name="REQUEST_METHOD" value="GET" />
-	</php>
-</phpunit>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" stopOnFailure="false" bootstrap="../tests/bootstrap.php" beStrictAboutTestsThatDoNotTestAnything="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd">
+  <coverage>
+    <report>
+      <clover outputFile="logs/clover.xml"/>
+      <html outputDirectory="../coverage"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="AnimeClient">
+      <directory>../tests/AnimeClient</directory>
+    </testsuite>
+    <testsuite name="Ion">
+      <directory>../tests/Ion</directory>
+    </testsuite>
+  </testsuites>
+  <logging>
+    <junit outputFile="logs/junit.xml"/>
+  </logging>
+  <php>
+    <server name="HTTP_USER_AGENT" value="Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:38.0) Gecko/20100101 Firefox/38.0"/>
+    <server name="HTTP_HOST" value="localhost"/>
+    <server name="SERVER_NAME" value="localhost"/>
+    <server name="REQUEST_URI" value="/"/>
+    <server name="REQUEST_METHOD" value="GET"/>
+  </php>
+  <source>
+    <include>
+      <directory suffix=".php">../src</directory>
+    </include>
+  </source>
+</phpunit>

build/update_header_comments.php

@@ -1,94 +0,0 @@
-<?php
-declare(strict_types=1);
-
-$file_patterns = [
-	'app/bootstrap.php',
-	'migrations/*.php',
-	'src/**/*.php',
-	'src/*.php',
-	'tests/**/*.php',
-	'tests/*.php',
-	'index.php',
-	'Robofile.php'
-];
-
-if ( ! function_exists('glob_recursive'))
-{
-	// Does not support flag GLOB_BRACE
-
-	function glob_recursive($pattern, $flags = 0)
-	{
-		$files = glob($pattern, $flags);
-
-		foreach (glob(dirname($pattern) . '/*', GLOB_ONLYDIR | GLOB_NOSORT) as $dir)
-		{
-			$files = array_merge($files, glob_recursive($dir . '/' . basename($pattern), $flags));
-		}
-
-		return $files;
-	}
-}
-
-function get_text_to_replace(array $tokens): string
-{
-	$output = '';
-
-	// Tokens have the follow structure if arrays:
-	// [0] => token type constant
-	// [1] => raw syntax parsed to that token
-	// [2] => line number
-	foreach($tokens as $token)
-	{
-		// Since we only care about opening docblocks,
-		// bail out when we get to the namespace token
-		if (is_array($token) && $token[0] === T_NAMESPACE)
-		{
-			break;
-		}
-
-		if (is_array($token))
-		{
-			$token = $token[1];
-		}
-
-		$output .= $token;
-	}
-
-	return $output;
-}
-
-function get_tokens($source): array
-{
-	return token_get_all($source);
-}
-
-function replace_files(array $files, $template)
-{
-	print_r($files);
-	foreach ($files as $file)
-	{
-		$source = file_get_contents($file);
-
-		if (stripos($source, 'namespace') === FALSE)
-		{
-			continue;
-		}
-
-		$tokens = get_tokens($source);
-		$text_to_replace = get_text_to_replace($tokens);
-
-		$header = file_get_contents(__DIR__ . $template);
-		$new_text = "<?php declare(strict_types=1);\n{$header}";
-
-		$new_source = str_replace($text_to_replace, $new_text, $source);
-		file_put_contents($file, $new_source);
-	}
-}
-
-foreach ($file_patterns as $glob)
-{
-	$files = glob_recursive($glob);
-	replace_files($files, '/header_comment.txt');
-}
-
-echo "Successfully updated headers \n";

composer.json

@@ -13,8 +13,8 @@
   "autoload": {
 	"files": [
 	  "src/Ion/functions.php",
-	  "src/AnimeClient/constants.php",
-	  "src/AnimeClient/AnimeClient.php"
+	  "src/AnimeClient.php",
+	  "src/AnimeClient/constants.php"
 	],
 	"psr-4": {
 	  "Aviat\\": "src/"
@@ -23,61 +23,46 @@
   "autoload-dev": {
 	"psr-4": {
 	  "Aviat\\AnimeClient\\Tests\\": "tests/AnimeClient",
-	  "Aviat\\Ion\\Tests\\": "tests/Ion",
-	  "CodeIgniter\\": "build/CodeIgniter/"
+	  "Aviat\\Ion\\Tests\\": "tests/Ion"
 	}
   },
   "config": {
-	"lock": false,
-	"platform": {
-	  "php": "7.3"
-	}
+	"lock": false
   },
   "require": {
-	"amphp/http-client": "^4.2",
-	"aura/html": "^2.0",
-	"aura/router": "^3.0",
-	"aura/session": "^2.0",
-	"aviat/banker": "^2.0.0",
-	"aviat/query": "^2.5.1",
-	"danielstjules/stringy": "^3.1.0",
+	"amphp/http-client": "^v5.0.0",
+	"aura/html": "^2.5.0",
+	"aura/router": "^3.3.0",
+	"aura/session": "^2.1.0",
+	"aviat/banker": "^4.1.2",
+	"aviat/query": "^4.1.0",
 	"ext-dom": "*",
-	"ext-iconv": "*",
-	"ext-json": "*",
 	"ext-gd": "*",
+	"ext-intl": "*",
+	"ext-json": "*",
+	"ext-mbstring": "*",
 	"ext-pdo": "*",
-	"laminas/laminas-diactoros": "^2.0.0",
-	"laminas/laminas-httphandlerrunner": "^1.0",
-	"maximebf/consolekit": "^1.0",
-	"monolog/monolog": "^2.0.1",
-	"php": "^7.3",
-	"psr/container": "~1.0",
-	"psr/http-message": "~1.0",
-	"psr/log": "~1.0",
-	"yosymfony/toml": "^1.0"
+	"laminas/laminas-diactoros": "^3.0.0",
+	"laminas/laminas-httphandlerrunner": "^2.6.1",
+	"maximebf/consolekit": "^1.0.3",
+	"monolog/monolog": "^3.0.0",
+	"php": ">= 8.2.0",
+	"psr/http-message": "^1.0.1 || ^2.0.0",
+	"symfony/polyfill-mbstring": "^1.0.0",
+	"symfony/polyfill-util": "^1.0.0",
+	"tracy/tracy": "^2.8.0",
+	"yosymfony/toml": "^1.0.4"
   },
   "require-dev": {
-	"consolidation/robo": "^2.0.0",
-	"filp/whoops": "^2.1",
-	"pdepend/pdepend": "^2.2",
-	"phploc/phploc": "^5.0",
-	"phpmd/phpmd": "^2.8",
-	"phpstan/phpstan": "^0.12.0",
-	"phpunit/phpunit": "^8.4.3",
+	"phpstan/phpstan": "^1.2.0",
+	"phpunit/phpunit": "^10.0.0",
 	"roave/security-advisories": "dev-master",
-	"robmorgan/phinx": "^0.10.6",
-	"sebastian/phpcpd": "^4.1.0",
-	"spatie/phpunit-snapshot-assertions": "^2.2.1",
-	"squizlabs/php_codesniffer": "^3.2.2",
-	"symfony/var-dumper": "^5",
-	"theseer/phpdox": "*"
+	"spatie/phpunit-snapshot-assertions": "^5.0.1"
   },
   "scripts": {
-	"build": "vendor/bin/robo build",
 	"build:css": "cd public && npm run build:css && cd ..",
 	"build:js": "cd public && npm run build:js && cd ..",
-	"clean": "vendor/bin/robo clean",
-	"coverage": "phpdbg -qrr -- vendor/bin/phpunit -c build",
+	"coverage": "php -dpcov.enabled=1 -dpcov.directory=. -dpcov.exclude=\"~vendor~\" ./vendor/bin/phpunit -c build",
 	"phpstan": "phpstan analyse -c phpstan.neon",
 	"watch:css": "cd public && npm run watch:css",
 	"watch:js": "cd public && npm run watch:js",
@@ -85,9 +70,7 @@
 	"test-update": "vendor/bin/phpunit -c build --no-coverage -d --update-snapshots"
   },
   "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"

console

@@ -7,7 +7,10 @@ require_once __DIR__ . '/vendor/autoload.php';
 use Aviat\AnimeClient\Command;
 use ConsoleKit\Console;
 
-$_SERVER['HTTP_HOST'] = 'localhost';
+$GLOBALS['_SERVER']['HTTP_HOST'] = 'localhost';
+
+const APP_DIR = __DIR__ . '/app';
+const TEMPLATE_DIR = APP_DIR . '/templates';
 
 // -----------------------------------------------------------------------------
 // Start console script
@@ -15,17 +18,15 @@ $_SERVER['HTTP_HOST'] = 'localhost';
 try
 {
 	(new Console([
-		'cache:clear' => Command\CacheClear::class,
-		'cache:refresh' => Command\CachePrime::class,
 		'clear:cache' => Command\CacheClear::class,
 		'clear:thumbnails' => Command\ClearThumbnails::class,
 		'refresh:cache' => Command\CachePrime::class,
 		'refresh:thumbnails' => Command\UpdateThumbnails::class,
-		'regenerate-thumbnails' => Command\UpdateThumbnails::class,
 		'lists:sync' => Command\SyncLists::class,
+		'sync:lists' => Command\SyncLists::class
 	]))->run();
 }
-catch (\Exception $e)
+catch (Throwable)
 {
 
 }

frontEndSrc/css.js

@@ -0,0 +1,70 @@
+/**
+ * Script for optimizing css
+ */
+const fs = require('fs');
+const postcss = require('postcss');
+const atImport = require('postcss-import');
+const cssNext = require('postcss-preset-env');
+const cssNano = require('cssnano');
+
+const lightCss = fs.readFileSync('css/light.css', 'utf-8');
+const darkCss = fs.readFileSync('css/src/dark-override.css', 'utf-8');
+const fullDarkCss = fs.readFileSync('css/dark.css', 'utf-8');
+
+const minOptions = {
+	autoprefixer: false,
+	colormin: false,
+	minifyFontValues: false,
+	options: {
+		sourcemap: false
+	}
+};
+
+const processOptions = {
+	browser: '> 0.5%',
+	features: {
+		'custom-properties': true,
+	},
+	stage: 0,
+};
+
+try {
+	(async () => {
+		// Basic theme
+		const lightMin = await postcss()
+			.use(atImport())
+			.use(cssNext(processOptions))
+			.use(cssNano(minOptions))
+			.process(lightCss, {
+				from: 'css/light.css',
+				to: '/public/css/light.min.css',
+			}).catch(console.error);
+		fs.writeFileSync('../public/css/light.min.css', lightMin.css);
+
+		// Dark theme
+		const darkFullMin = await postcss()
+			.use(atImport())
+			.use(cssNext(processOptions))
+			.use(cssNano(minOptions))
+			.process(fullDarkCss, {
+				from: 'css/dark.css',
+				to: '/public/css/dark.min.css',
+			});
+		fs.writeFileSync('../public/css/dark.min.css', darkFullMin.css);
+
+		// Dark override
+		const darkMin = await postcss()
+			.use(atImport())
+			.use(cssNext(processOptions))
+			.use(cssNano(minOptions))
+			.process(darkCss, {
+				from: 'css/dark-override.css',
+				to: '/public/css/dark.min.css',
+			}).catch(console.error);
+		const autoDarkCss = `${lightMin} @media (prefers-color-scheme: dark) { ${darkMin.css} }`
+		fs.writeFileSync('../public/css/auto.min.css', autoDarkCss)
+
+	})();
+} catch (e) {
+	console.error(e)
+}

frontEndSrc/css/auto.css

@@ -0,0 +1,3 @@
+@media (prefers-color-scheme: dark) {
+	@import "src/dark-override.css";
+}

frontEndSrc/css/dark.css

@@ -0,0 +1,5 @@
+@import "src/-marx-.css";
+@import "src/general.css";
+@import "src/components.css";
+@import "src/responsive.css";
+@import "src/dark-override.css";

frontEndSrc/css/light.css

@@ -0,0 +1,4 @@
+@import "src/-marx-.css";
+@import "src/general.css";
+@import "src/components.css";
+@import "src/responsive.css";

frontEndSrc/css/src/components.css

@@ -163,7 +163,7 @@ CSS Tabs
 	/* text-align: center; */
 }
 
-.tabs .content {
+.tabs .content, .single-tab {
 	display: none;
 	max-height: 950px;
 	border: 1px solid #e5e5e5;
@@ -175,7 +175,14 @@ CSS Tabs
 	overflow: auto;
 }
 
-.tabs .content.full-height {
+.single-tab {
+	display: block;
+	border: 1px solid #e5e5e5;
+	box-shadow: 0 48px 80px -32px rgba(0, 0, 0, 0.3);
+	margin-top: 1.5em;
+}
+
+.tabs .content.full-height, .single-tab.full-height {
 	max-height: none;
 }
 

frontEndSrc/css/src/dark-override.css

@@ -147,7 +147,8 @@ button:active {
 .tabs > [type="radio"]:checked + label,
 .tabs > [type="radio"]:checked + label + .content,
 .vertical-tabs [type="radio"]:checked + label,
-.vertical-tabs [type="radio"]:checked ~ .content {
+.vertical-tabs [type="radio"]:checked ~ .content,
+.single-tab {
 	/* border-color: #333; */
 	border: 0;
 	background: #666;

frontEndSrc/css/src/general.css

@@ -94,6 +94,7 @@ a:hover, a:active {
 iframe {
 	display: block;
 	margin: 0 auto;
+	border: 0;
 }
 
 /* -----------------------------------------------------------------------------
@@ -332,7 +333,8 @@ td.danger, td.danger:hover, td.danger:active {
 .borderless th,
 .invisible tr,
 .invisible td,
-.invisible th {
+.invisible th,
+table.invisible {
 	box-shadow: none;
 	border: 0;
 }
@@ -627,6 +629,14 @@ picture.cover {
 	background-size: contain;
 	background-repeat: no-repeat;
 }
+/* There are two .name elements, just darken them both in this case! */
+.media.search.disabled .name {
+	background-color: #000;
+	background-color: rgba(0, 0, 0, 0.75);
+	background-size: cover;
+	background-size: contain;
+	background-repeat: no-repeat;
+}
 
 .media.search > .row {
 	z-index: 6;
@@ -827,19 +837,11 @@ aside.info {
 	max-width: 390px;
 }
 
-/* .fixed aside.info + article {
-	max-width: inherit;
-} */
-
 aside picture, aside img {
 	display: block;
 	margin: 0 auto;
 }
 
-/* aside.info + article {
-	max-width: 66%;
-} */
-
 /* ----------------------------------------------------------------------------
 	User page styles
 -----------------------------------------------------------------------------*/
@@ -873,6 +875,12 @@ aside picture, aside img {
 	vertical-align: middle;
 }
 
+.small-streaming-logo {
+	width: 25px;
+	height: 25px;
+	vertical-align: middle;
+}
+
 .cover-streaming-link {
 	display: none;
 }
@@ -888,6 +896,11 @@ aside picture, aside img {
 	filter: drop-shadow(0 -1px 4px #fff);
 }
 
+.history-img {
+	width: 110px;
+	height: 156px;
+}
+
 /* ----------------------------------------------------------------------------
 Settings Form
 -----------------------------------------------------------------------------*/

frontEndSrc/js/anime-client.js

@@ -3,13 +3,13 @@
 // -------------------------------------------------------------------------
 
 const matches = (elm, selector) => {
-	let matches = (elm.document || elm.ownerDocument).querySelectorAll(selector),
-		i = matches.length;
-	while (--i >= 0 && matches.item(i) !== elm) {};
+	let m = (elm.document || elm.ownerDocument).querySelectorAll(selector);
+	let i = matches.length;
+	while (--i >= 0 && m.item(i) !== elm) {};
 	return i > -1;
 }
 
-export const AnimeClient = {
+const AnimeClient = {
 	/**
 	 * Placeholder function
 	 */
@@ -18,8 +18,8 @@ export const AnimeClient = {
 	 * DOM selector
 	 *
 	 * @param {string} selector - The dom selector string
-	 * @param {object} [context]
-	 * @return {[HTMLElement]} - array of dom elements
+	 * @param {Element} [context]
+	 * @return array of dom elements
 	 */
 	$(selector, context = null) {
 		if (typeof selector !== 'string') {
@@ -60,7 +60,7 @@ export const AnimeClient = {
 	/**
 	 * Hide the selected element
 	 *
-	 * @param  {string|Element} sel - the selector of the element to hide
+	 * @param  {string|Element|Element[]} sel - the selector of the element to hide
 	 * @return {void}
 	 */
 	hide (sel) {
@@ -77,7 +77,7 @@ export const AnimeClient = {
 	/**
 	 * UnHide the selected element
 	 *
-	 * @param  {string|Element} sel - the selector of the element to hide
+	 * @param  {string|Element|Element[]} sel - the selector of the element to hide
 	 * @return {void}
 	 */
 	show (sel) {
@@ -116,9 +116,9 @@ export const AnimeClient = {
 	/**
 	 * Finds the closest parent element matching the passed selector
 	 *
-	 * @param  {HTMLElement} current - the current HTMLElement
+	 * @param  {Element} current - the current Element
 	 * @param  {string} parentSelector - selector for the parent element
-	 * @return {HTMLElement|null} - the parent element
+	 * @return {Element|null} - the parent element
 	 */
 	closestParent (current, parentSelector) {
 		if (Element.prototype.closest !== undefined) {
@@ -204,9 +204,9 @@ function delegateEvent(sel, target, event, listener) {
 /**
  * Add an event listener
  *
- * @param  {string|HTMLElement} sel - the parent selector to bind to
+ * @param  {string|Element} sel - the parent selector to bind to
  * @param  {string} event - event name(s) to bind
- * @param  {string|HTMLElement|function} target - the element to directly bind the event to
+ * @param  {string|Element|function} target - the element to directly bind the event to
  * @param  {function} [listener] - event listener callback
  * @return {void}
  */
@@ -261,7 +261,7 @@ function ajaxSerialize(data) {
  *
  * @param  {string} url - the url to request
  * @param  {Object} config  - the configuration object
- * @return {void}
+ * @return {XMLHttpRequest}
  */
 AnimeClient.ajax = (url, config) => {
 	// Set some sane defaults
@@ -322,6 +322,8 @@ AnimeClient.ajax = (url, config) => {
 	} else {
 		request.send(config.data);
 	}
+
+	return request
 };
 
 /**
@@ -330,6 +332,7 @@ AnimeClient.ajax = (url, config) => {
  * @param {string} url
  * @param {object|function} data
  * @param {function} [callback]
+ * @return {XMLHttpRequest}
  */
 AnimeClient.get = (url, data, callback = null) => {
 	if (callback === null) {

frontEndSrc/js/anime.js

@@ -0,0 +1,128 @@
+import _ from './anime-client.js'
+import { renderSearchResults } from './template-helpers.js'
+import { getNestedProperty, hasNestedProperty } from "./fns";
+
+const search = (query, isCollection = false) => {
+	// Show the loader
+	_.show('.cssload-loader');
+
+	// Do the api search
+	return _.get(_.url('/anime-collection/search'), { query }, (searchResults, status) => {
+		searchResults = JSON.parse(searchResults);
+
+		// Hide the loader
+		_.hide('.cssload-loader');
+
+		// Show the results
+		_.$('#series-list')[ 0 ].innerHTML = renderSearchResults('anime', searchResults, isCollection);
+	});
+};
+
+// Anime list search
+if (_.hasElement('.anime #search')) {
+	let prevRequest = null;
+
+	_.on('#search', 'input', _.throttle(250, (e) => {
+		const query = encodeURIComponent(e.target.value);
+		if (query === '') {
+			return;
+		}
+
+		if (prevRequest !== null) {
+			prevRequest.abort();
+		}
+
+		prevRequest = search(query);
+	}));
+}
+
+// Anime collection search
+if (_.hasElement('#search-anime-collection')) {
+	let prevRequest = null;
+
+	_.on('#search-anime-collection', 'input', _.throttle(250, (e) => {
+		const query = encodeURIComponent(e.target.value);
+		if (query === '') {
+			return;
+		}
+
+		if (prevRequest !== null) {
+			prevRequest.abort();
+		}
+
+		prevRequest = search(query, true);
+	}));
+}
+
+// Action to increment episode count
+_.on('body.anime.list', 'click', '.plus-one', (e) => {
+	let parentSel = _.closestParent(e.target, 'article');
+	let watchedCount = parseInt(_.$('.completed_number', parentSel)[ 0 ].textContent, 10) || 0;
+	let totalCount = parseInt(_.$('.total_number', parentSel)[ 0 ].textContent, 10);
+	let title = _.$('.name a', parentSel)[ 0 ].textContent;
+
+	// Setup the update data
+	let data = {
+		id: parentSel.dataset.kitsuId,
+		anilist_id: parentSel.dataset.anilistId,
+		mal_id: parentSel.dataset.malId,
+		data: {
+			progress: watchedCount + 1
+		}
+	};
+
+	const displayMessage = (type, message) => {
+		_.hide('#loading-shadow');
+		_.showMessage(type, `${message} ${title}`);
+		_.scrollToTop();
+	}
+
+	const showError = () => displayMessage('error', 'Failed to update');
+
+	// If the episode count is 0, and incremented,
+	// change status to currently watching
+	if (isNaN(watchedCount) || watchedCount === 0) {
+		data.data.status = 'CURRENT';
+	}
+
+	// If you increment at the last episode, mark as completed
+	if ((!isNaN(watchedCount)) && (watchedCount + 1) === totalCount) {
+		data.data.status = 'COMPLETED';
+	}
+
+	_.show('#loading-shadow');
+
+	// okay, lets actually make some changes!
+	_.ajax(_.url('/anime/increment'), {
+		data,
+		dataType: 'json',
+		type: 'POST',
+		success: (res) => {
+			try {
+				const resData = JSON.parse(res);
+
+				// Do a rough sanity check for weird errors
+				let updatedProgress = getNestedProperty(resData, 'data.libraryEntry.update.libraryEntry.progress');
+				if (hasNestedProperty(resData, 'error') || updatedProgress !== data.data.progress) {
+					showError();
+					return;
+				}
+
+				// We've completed the series
+				if (getNestedProperty(resData, 'data.libraryEntry.update.libraryEntry.status') === 'COMPLETED') {
+					_.hide(parentSel);
+					displayMessage('success', 'Completed')
+
+					return;
+				}
+
+				// Just a normal update
+				_.$('.completed_number', parentSel)[ 0 ].textContent = ++watchedCount;
+				displayMessage('success', 'Updated');
+			} catch (_) {
+				showError();
+			}
+		},
+		error: showError,
+	});
+});

frontEndSrc/js/base/sort-tables.js

@@ -6,9 +6,22 @@ const LightTableSorter = (() => {
 	const sort = (a, b) => {
 		let textA = text(a);
 		let textB = text(b);
-		const n = parseInt(textA, 10);
-		if (n) {
-			textA = n;
+		console.log("Comparing " + textA + " and " + textB)
+
+		if(th.classList.contains("numeric")){
+			let arrayA = textA.replace('episodes:  ','').replace('-',0).split("/");
+			let arrayB = textB.replace('episodes:  ','').replace('-',0).split("/");
+			if(arrayA.length > 1) {
+				textA = parseInt(arrayA[0],10) / parseInt(arrayA[1],10);
+				textB = parseInt(arrayB[0],10) / parseInt(arrayB[1],10);
+			}
+			else{
+				textA = parseInt(arrayA[0],10);
+				textB = parseInt(arrayB[0],10);
+			}
+		}
+		else if (parseInt(textA, 10)) {
+			textA = parseInt(textA, 10);
 			textB = parseInt(textB, 10);
 		}
 		if (textA > textB) {
@@ -59,6 +72,7 @@ const LightTableSorter = (() => {
 			for (let i = 0, len = ths.length; i < len; i++) {
 				let th = ths[i];
 				th.classList.add('sorting');
+				th.classList.add('testing');
 				results.push(th.onclick = onClickEvent);
 			}
 			return results;