diff --git a/.gitattributes b/.gitattributes index f8ab467..b76132f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,5 @@ /.editorconfig export-ignore /.gitattributes export-ignore -/.php-cs-fixer.dist.php export-ignore +/.gitignore export-ignore +/pint.json export-ignore /rector.php export-ignore \ No newline at end of file diff --git a/.gitignore b/.gitignore index 97eb8a7..15e9032 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ +/.rector_cache /vendor -.php-cs-fixer.cache composer.lock \ No newline at end of file diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php deleted file mode 100644 index f0d08e5..0000000 --- a/.php-cs-fixer.dist.php +++ /dev/null @@ -1,164 +0,0 @@ - true, - 'array_syntax' => ['syntax' => 'short'], - 'binary_operator_spaces' => [ - 'default' => 'single_space', - 'operators' => ['=>' => null], - ], - 'blank_line_after_namespace' => true, - 'blank_line_after_opening_tag' => true, - 'blank_line_before_statement' => [ - 'statements' => ['return'], - ], - 'braces' => true, - 'cast_spaces' => true, - 'class_attributes_separation' => [ - 'elements' => [ - 'const' => 'one', - 'method' => 'one', - 'property' => 'one', - 'trait_import' => 'none', - ], - ], - 'class_definition' => [ - 'multi_line_extends_each_single_line' => true, - 'single_item_single_line' => true, - 'single_line' => true, - ], - 'concat_space' => [ - 'spacing' => 'none', - ], - 'constant_case' => ['case' => 'lower'], - 'declare_equal_normalize' => true, - 'elseif' => true, - 'encoding' => true, - 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, // added by Shift - 'function_declaration' => true, - 'function_typehint_space' => true, - 'general_phpdoc_tag_rename' => true, - 'heredoc_to_nowdoc' => true, - 'include' => true, - 'increment_style' => ['style' => 'post'], - 'indentation_type' => true, - 'linebreak_after_opening_tag' => true, - 'line_ending' => true, - 'lowercase_cast' => true, - 'lowercase_keywords' => true, - 'lowercase_static_reference' => true, // added from Symfony - 'magic_method_casing' => true, // added from Symfony - 'magic_constant_casing' => true, - 'method_argument_space' => [ - 'on_multiline' => 'ignore', - ], - 'multiline_whitespace_before_semicolons' => [ - 'strategy' => 'no_multi_line', - ], - 'native_function_casing' => true, - 'no_alias_functions' => true, - 'no_extra_blank_lines' => [ - 'tokens' => [ - 'extra', - 'throw', - 'use', - ], - ], - 'no_blank_lines_after_class_opening' => true, - 'no_blank_lines_after_phpdoc' => true, - 'no_closing_tag' => true, - 'no_empty_phpdoc' => true, - 'no_empty_statement' => 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_short_bool_cast' => true, - 'no_singleline_whitespace_before_semicolons' => true, - 'no_spaces_after_function_name' => true, - 'no_spaces_around_offset' => [ - 'positions' => ['inside', 'outside'], - ], - 'no_spaces_inside_parenthesis' => true, - 'no_trailing_comma_in_list_call' => true, - 'no_trailing_comma_in_singleline_array' => true, - 'no_trailing_whitespace' => true, - 'no_trailing_whitespace_in_comment' => true, - 'no_unneeded_control_parentheses' => [ - 'statements' => ['break', 'clone', 'continue', 'echo_print', 'return', 'switch_case', 'yield'], - ], - 'no_unreachable_default_argument_value' => true, - 'no_unused_imports' => true, - 'no_useless_return' => true, - 'no_whitespace_before_comma_in_array' => true, - 'no_whitespace_in_blank_line' => true, - 'normalize_index_brace' => true, - 'not_operator_with_successor_space' => true, - 'object_operator_without_whitespace' => true, - 'ordered_imports' => ['sort_algorithm' => 'alpha'], - 'psr_autoloading' => true, - 'phpdoc_indent' => true, - 'phpdoc_inline_tag_normalizer' => true, - 'phpdoc_no_access' => true, - 'phpdoc_no_package' => true, - 'phpdoc_no_useless_inheritdoc' => true, - 'phpdoc_scalar' => true, - 'phpdoc_single_line_var_spacing' => true, - 'phpdoc_summary' => false, - 'phpdoc_to_comment' => false, // override to preserve user preference - 'phpdoc_tag_type' => true, - 'phpdoc_trim' => true, - 'phpdoc_types' => true, - 'phpdoc_var_without_name' => true, - 'self_accessor' => true, - 'short_scalar_cast' => true, - 'simplified_null_return' => false, // disabled as "risky" - 'single_blank_line_at_eof' => true, - 'single_blank_line_before_namespace' => true, - 'single_class_element_per_statement' => [ - 'elements' => ['const', 'property'], - ], - 'single_import_per_statement' => true, - 'single_line_after_imports' => true, - 'single_line_comment_style' => [ - 'comment_types' => ['hash'], - ], - 'single_quote' => true, - 'space_after_semicolon' => true, - 'standardize_not_equals' => true, - 'switch_case_semicolon_to_colon' => true, - 'switch_case_space' => true, - 'ternary_operator_spaces' => true, - 'trailing_comma_in_multiline' => ['elements' => ['arrays']], - 'trim_array_spaces' => true, - 'unary_operator_spaces' => true, - 'visibility_required' => [ - 'elements' => ['method', 'property'], - ], - 'whitespace_after_comma_in_array' => true, -]; - - -$finder = Finder::create() - ->in([ - __DIR__ . '/config', - __DIR__ . '/lang', - __DIR__ . '/src', - ]) - ->name('*.php') - ->ignoreDotFiles(true) - ->ignoreVCS(true); - -return (new Config) - ->setFinder($finder) - ->setRules($rules) - ->setRiskyAllowed(true) - ->setUsingCache(true); diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d8cdf4..7694ec9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ CHANGELOG ========= +0.8.4 (2023-11-03) +------------------ + +- Updated QA tools + + 0.8.3 (2023-08-19) ------------------ diff --git a/README.md b/README.md index 24f0548..d58a725 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ This package provides several Blade components prepared for use with Bootstrap ( This package was initially an extension of [Blade UI Kit](https://blade-ui-kit.com/) to provide pre-styled components for Bootstrap. But by making it evolve we decided to decouple it from its parent. This simplifies the code as well as its use in our case. -This package is therefore largely inspired by [Blade UI Kit](https://blade-ui-kit.com/). A very large part of the documentation comes from it. And we sincerely thank its contributors for the idea and what they have developed. This package wouldn't exist without it. +This package is therefore largely inspired by [Blade UI Kit](https://blade-ui-kit.com/). A large part of the documentation comes from it. And we sincerely thank its contributors for the idea and what they have developed. This package wouldn't exist without it. Example ------- @@ -128,13 +128,13 @@ You don't have to, but you can publish: the configuration file, the views and th Publish the configuration file with this command: -``` +```bash php artisan vendor:publish --tag="blade-ui-kit-bootstrap-config" ``` Publish views with this command: -``` +```bash php artisan vendor:publish --tag="blade-ui-kit-bootstrap-views" ``` @@ -142,7 +142,7 @@ Note that it is not necessary to publish all views in your application. It is ev Publish translation files with this command: -``` +```bash php artisan vendor:publish --tag="blade-ui-kit-bootstrap-translations" ``` diff --git a/composer.json b/composer.json index 37434c2..2fde9f1 100644 --- a/composer.json +++ b/composer.json @@ -24,8 +24,9 @@ "illuminate/view": "^10.0" }, "require-dev": { - "driftingly/rector-laravel": "^0.21", - "rector/rector": "^0.17" + "laravel/pint": "^1.13.5", + "driftingly/rector-laravel": ">=0.26.2", + "rector/rector": ">=0.18.6" }, "autoload": { "psr-4": { diff --git a/config/blade-ui-kit-bootstrap.php b/config/blade-ui-kit-bootstrap.php index f1be8ff..8da94fd 100644 --- a/config/blade-ui-kit-bootstrap.php +++ b/config/blade-ui-kit-bootstrap.php @@ -1,21 +1,21 @@ paths([ - __DIR__ . '/config', - __DIR__ . '/lang', - __DIR__ . '/src', + __DIR__.'/config', + __DIR__.'/lang', + __DIR__.'/src', ]); $rectorConfig->parallel( @@ -32,48 +23,38 @@ $rectorConfig->importNames(); - // skip paths and/or rules + // cache settings //---------------------------------------------------------- - $rectorConfig->skip([ - // Pour la mise à jour PHP 8.1, ne pas prendre en compte MyCLabs enum to natives PHP enum - //MyCLabsClassToEnumRector::class, - //MyCLabsMethodCallToEnumConstRector::class, - // Transforme des faux-positifs, je préfère désactiver ça (PHP 8.1) - NullToStrictStringFuncCallArgRector::class, - - // Pas de ça dans les routes car transforme : - // [Controller::class, 'method'] en (new Controller)->method(...) - //StaticCallOnNonStaticToInstanceCallRector::class => [__DIR__.'/routes'], - //FirstClassCallableRector::class => [__DIR__.'/routes'], + // Ensure file system caching is used instead of in-memory. + $rectorConfig->cacheClass(FileCacheStorage::class); - // Également, si SetList::CODE_QUALITY, éviter de transformer dans les routes - // [GlideController::class, 'images'] en fn($path, Request $request) => (new GlideController())->images($path, $request) - //CallableThisArrayToAnonymousFunctionRector::class => [__DIR__.'/routes'], - //ClosureToArrowFunctionRector::class => [__DIR__.'/routes'], - ]); + // Specify a path that works locally as well as on CI job runners. + $rectorConfig->cacheDirectory(__DIR__.'/.rector_cache'); - // register single rules + // skip paths and/or rules //---------------------------------------------------------- + $rectorConfig->skip([ + // Transforms false positives, I prefer to disable that (PHP 8.1) + NullToStrictStringFuncCallArgRector::class, - // TYPE_DECLARATION - //$rectorConfig->rule(TypedPropertyFromStrictConstructorRector::class); - //$rectorConfig->rule(AddVoidReturnTypeWhereNoReturnRector::class); - //$rectorConfig->rule(AddClosureReturnTypeRector::class); - - // CODE_QUALITY - //$rectorConfig->rule(ReturnTypeFromStrictScalarReturnExprRector::class); - //$rectorConfig->rule(UseIdenticalOverEqualWithSameTypeRector::class); + // Ne pas changer les closure et Arrow Function en Static + StaticClosureRector::class, + StaticArrowFunctionRector::class, + ]); // define what sets of rules will be applied // tip: use "SetList" class to autocomplete sets with your IDE //---------------------------------------------------------- $rectorConfig->sets([ LaravelSetList::LARAVEL_FACADE_ALIASES_TO_FULL_NAMES, - LevelSetList::UP_TO_PHP_82, - SetList::CODE_QUALITY, + SetList::PHP_82, SetList::DEAD_CODE, - SetList::EARLY_RETURN, + SetList::CODE_QUALITY, + SetList::CODING_STYLE, SetList::TYPE_DECLARATION, + //SetList::PRIVATIZATION, + SetList::EARLY_RETURN, + SetList::INSTANCEOF, ]); }; diff --git a/resources/views/bootstrap-4/components/modals/confirm.blade.php b/resources/views/bootstrap-4/components/modals/confirm.blade.php index 5f4dddc..68cb655 100644 --- a/resources/views/bootstrap-4/components/modals/confirm.blade.php +++ b/resources/views/bootstrap-4/components/modals/confirm.blade.php @@ -1,4 +1,3 @@ - @push ('blade-ui-kit-bs-html')
class(['modal']) }} id="{{ $id }}" tabindex="-1" aria-labelledby="{{ $titleLabel }}" aria-hidden="true">
diff --git a/resources/views/bootstrap-4/components/modals/modal.blade.php b/resources/views/bootstrap-4/components/modals/modal.blade.php index e08f1b5..5659e8e 100644 --- a/resources/views/bootstrap-4/components/modals/modal.blade.php +++ b/resources/views/bootstrap-4/components/modals/modal.blade.php @@ -1,4 +1,3 @@ - @push ('blade-ui-kit-bs-html')
class(['modal']) }} id="{{ $id }}" tabindex="-1" aria-labelledby="{{ $titleLabel }}" aria-hidden="true">
@@ -27,4 +26,4 @@
-@endpush \ No newline at end of file +@endpush diff --git a/resources/views/bootstrap-5/components/modals/confirm.blade.php b/resources/views/bootstrap-5/components/modals/confirm.blade.php index b865682..7b777d4 100644 --- a/resources/views/bootstrap-5/components/modals/confirm.blade.php +++ b/resources/views/bootstrap-5/components/modals/confirm.blade.php @@ -1,4 +1,3 @@ - @push ('blade-ui-kit-bs-html')
class(['modal']) }} id="{{ $id }}" tabindex="-1" aria-labelledby="{{ $titleLabel }}" aria-hidden="true">
diff --git a/resources/views/bootstrap-5/components/modals/modal.blade.php b/resources/views/bootstrap-5/components/modals/modal.blade.php index a57f099..848f555 100644 --- a/resources/views/bootstrap-5/components/modals/modal.blade.php +++ b/resources/views/bootstrap-5/components/modals/modal.blade.php @@ -24,4 +24,4 @@
-@endpush \ No newline at end of file +@endpush diff --git a/src/Components/Buttons/FormButton.php b/src/Components/Buttons/FormButton.php index 7013760..1135eb1 100644 --- a/src/Components/Buttons/FormButton.php +++ b/src/Components/Buttons/FormButton.php @@ -18,7 +18,7 @@ public function __construct( string $method = 'POST', public bool $hasFiles = false, public bool $novalidate = true - ){ + ) { $this->formId = 'form-button-'.($formId ?? Str::random(32)); $this->method = $this->validFormMethod($method); } diff --git a/src/Components/Buttons/Logout.php b/src/Components/Buttons/Logout.php index e526888..f93b76b 100644 --- a/src/Components/Buttons/Logout.php +++ b/src/Components/Buttons/Logout.php @@ -7,8 +7,8 @@ class Logout extends FormButton { public function __construct( - ?string $formId = null, - ?string $action = null + string $formId = null, + string $action = null ) { $this->action = $action ?? route('logout'); diff --git a/src/Components/Forms/Inputs/Date.php b/src/Components/Forms/Inputs/Date.php index a90f349..98b01cc 100644 --- a/src/Components/Forms/Inputs/Date.php +++ b/src/Components/Forms/Inputs/Date.php @@ -8,9 +8,9 @@ class Date extends Input { public function __construct( string $name, - ?string $value = null, - ?string $id = null, - ?string $errorBag = null + string $value = null, + string $id = null, + string $errorBag = null ) { parent::__construct($name, 'date', $value, $id, $errorBag); } diff --git a/src/Components/Forms/Inputs/Email.php b/src/Components/Forms/Inputs/Email.php index 896dd44..b23a9ff 100644 --- a/src/Components/Forms/Inputs/Email.php +++ b/src/Components/Forms/Inputs/Email.php @@ -8,9 +8,9 @@ class Email extends Input { public function __construct( string $name, - ?string $value = null, - ?string $id = null, - ?string $errorBag = null + string $value = null, + string $id = null, + string $errorBag = null ) { parent::__construct($name, 'email', $value, $id, $errorBag); } diff --git a/src/Components/Forms/Inputs/Hidden.php b/src/Components/Forms/Inputs/Hidden.php index fae73b3..e4ba9eb 100644 --- a/src/Components/Forms/Inputs/Hidden.php +++ b/src/Components/Forms/Inputs/Hidden.php @@ -8,8 +8,8 @@ class Hidden extends Input { public function __construct( string $name, - ?string $value = null, - ?string $id = null, + string $value = null, + string $id = null, ) { parent::__construct($name, 'hidden', $value, $id); } diff --git a/src/Components/Forms/Inputs/Input.php b/src/Components/Forms/Inputs/Input.php index f5a9d84..36e7a9b 100644 --- a/src/Components/Forms/Inputs/Input.php +++ b/src/Components/Forms/Inputs/Input.php @@ -18,9 +18,9 @@ class Input extends BladeComponent public function __construct( public string $name, public string $type = 'text', - ?string $value = null, - ?string $id = null, - ?string $errorBag = null + string $value = null, + string $id = null, + string $errorBag = null ) { $this->value = old($name, $value ?? ''); $this->id = $id ?? $name; diff --git a/src/Components/Forms/Inputs/Password.php b/src/Components/Forms/Inputs/Password.php index b1e1e2b..fb8d8d7 100644 --- a/src/Components/Forms/Inputs/Password.php +++ b/src/Components/Forms/Inputs/Password.php @@ -8,8 +8,8 @@ class Password extends Input { public function __construct( string $name, - ?string $id = null, - ?string $errorBag = null + string $id = null, + string $errorBag = null ) { parent::__construct($name, 'password', null, $id, $errorBag); } diff --git a/src/Components/Forms/Inputs/Select.php b/src/Components/Forms/Inputs/Select.php index ce7ef04..8f2b12c 100644 --- a/src/Components/Forms/Inputs/Select.php +++ b/src/Components/Forms/Inputs/Select.php @@ -22,8 +22,8 @@ public function __construct( public ?string $placeholder = null, string $labelAttribute = 'name', string $valueAttribute = 'id', - ?string $id = null, - ?string $errorBag = null + string $id = null, + string $errorBag = null ) { $this->id = $id ?? $name; diff --git a/src/Components/Forms/Inputs/Textarea.php b/src/Components/Forms/Inputs/Textarea.php index ec33f3f..0556806 100644 --- a/src/Components/Forms/Inputs/Textarea.php +++ b/src/Components/Forms/Inputs/Textarea.php @@ -15,8 +15,8 @@ class Textarea extends BladeComponent public function __construct( public string $name, - ?string $id = null, - ?string $errorBag = null + string $id = null, + string $errorBag = null ) { $this->id = $id ?? $name; diff --git a/src/Components/Forms/Inputs/Time.php b/src/Components/Forms/Inputs/Time.php index af2385d..9bd1c93 100644 --- a/src/Components/Forms/Inputs/Time.php +++ b/src/Components/Forms/Inputs/Time.php @@ -8,9 +8,9 @@ class Time extends Input { public function __construct( string $name, - ?string $value = null, - ?string $id = null, - ?string $errorBag = null + string $value = null, + string $id = null, + string $errorBag = null ) { parent::__construct($name, 'time', $value, $id, $errorBag); } diff --git a/src/Concerns/CanHaveErrors.php b/src/Concerns/CanHaveErrors.php index b1359d0..79a525b 100644 --- a/src/Concerns/CanHaveErrors.php +++ b/src/Concerns/CanHaveErrors.php @@ -24,7 +24,7 @@ public function messages(): array return $bag->has($this->errorField) ? $bag->get($this->errorField) : []; } - protected function bootCanHaveErrors(string $errorField, ?string $errorBag = null): void + protected function bootCanHaveErrors(string $errorField, string $errorBag = null): void { static $view = null; @@ -32,7 +32,7 @@ protected function bootCanHaveErrors(string $errorField, ?string $errorBag = nul $view = resolve(ViewFactory::class); } - $this->errors = $view->shared('errors', new ViewErrorBag); + $this->errors = $view->shared('errors', new ViewErrorBag()); $this->errorField($errorField); $this->errorBag($errorBag); @@ -45,7 +45,7 @@ protected function errorField(string $errorField): void $this->errorField = $errorField; } - protected function errorBag(?string $errorBag = null): void + protected function errorBag(string $errorBag = null): void { if (is_null($errorBag)) { return;