From d0986ddbfd6390e579a46bf491af1ab394eebfa5 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 5 Aug 2022 16:38:38 +0200 Subject: [PATCH 001/132] Components: added parameter types + return types --- src/Components/Components.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Components/Components.php b/src/Components/Components.php index 02763c4..b040613 100644 --- a/src/Components/Components.php +++ b/src/Components/Components.php @@ -16,7 +16,7 @@ public function __construct() $this->components = new Collection(); } - public static function add(...$components) + public static function add(Component ...$components): self { $class = new self(); @@ -27,7 +27,7 @@ public static function add(...$components) return $class; } - public function push(Component $component) + public function push(Component $component): self { $this->components->push($component); @@ -39,14 +39,14 @@ public function get(): Collection return $this->components; } - public function toArray() + public function toArray(): array { return $this->components->map(function (Component $component) { return $component->toArray(); })->toArray(); } - public function getOptions() + public function getOptions(): array { return []; } From 3e7fac5f703c5f7b0ce0b9f4bffcc4976aa63f96 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 5 Aug 2022 16:55:20 +0200 Subject: [PATCH 002/132] Component: added return types --- src/Contracts/Component.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Contracts/Component.php b/src/Contracts/Component.php index eda90bf..c29607d 100644 --- a/src/Contracts/Component.php +++ b/src/Contracts/Component.php @@ -6,8 +6,14 @@ abstract class Component { + /** + * @return string + */ abstract public function getVue(); + /** + * @return array + */ public function toArray() { return [ From 8cefb8fa5411a057d75085624fcacdfa201e0e00 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 5 Aug 2022 17:03:38 +0200 Subject: [PATCH 003/132] added phpdoc for return types : mixed --- src/Contracts/ComponentsInterface.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/Contracts/ComponentsInterface.php b/src/Contracts/ComponentsInterface.php index 32b3182..ab8262c 100644 --- a/src/Contracts/ComponentsInterface.php +++ b/src/Contracts/ComponentsInterface.php @@ -6,9 +6,18 @@ interface ComponentsInterface { + /** + * @return mixed + */ public function header(); + /** + * @return mixed + */ public function aboveForm(); + /** + * @return mixed + */ public function belowForm(); } From a4e9be8fca78d637b69bf01dbbf50fd29fd78886 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 5 Aug 2022 17:04:07 +0200 Subject: [PATCH 004/132] Field $type has to be string + update for all field types --- src/Contracts/Field.php | 2 +- src/Fields/Boolean.php | 2 +- src/Fields/Image.php | 2 +- src/Fields/MultiSelect.php | 2 +- src/Fields/Number.php | 2 +- src/Fields/Select.php | 2 +- src/Fields/Tab.php | 2 +- src/Fields/Tabs.php | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Contracts/Field.php b/src/Contracts/Field.php index fc84c90..a243669 100644 --- a/src/Contracts/Field.php +++ b/src/Contracts/Field.php @@ -6,7 +6,7 @@ abstract class Field { - public $type = 'text'; + public string $type = 'text'; public string $label = ''; public string $name = ''; public bool $editable = true; diff --git a/src/Fields/Boolean.php b/src/Fields/Boolean.php index fa57454..de891c2 100644 --- a/src/Fields/Boolean.php +++ b/src/Fields/Boolean.php @@ -8,7 +8,7 @@ final class Boolean extends Field { - public $type = 'boolean'; + public string $type = 'boolean'; public $attributes = []; public static function make(string $name, string $label, array $attributes = []) diff --git a/src/Fields/Image.php b/src/Fields/Image.php index 994ff11..46e6cd5 100644 --- a/src/Fields/Image.php +++ b/src/Fields/Image.php @@ -8,7 +8,7 @@ final class Image extends Field { - public $type = 'image'; + public string $type = 'image'; public $collection = 'images'; diff --git a/src/Fields/MultiSelect.php b/src/Fields/MultiSelect.php index a5414a6..6c68887 100644 --- a/src/Fields/MultiSelect.php +++ b/src/Fields/MultiSelect.php @@ -9,7 +9,7 @@ final class MultiSelect extends Field { - public $type = 'multiSelect'; + public string $type = 'multiSelect'; /** * @param string $name diff --git a/src/Fields/Number.php b/src/Fields/Number.php index a921853..bb075aa 100644 --- a/src/Fields/Number.php +++ b/src/Fields/Number.php @@ -8,7 +8,7 @@ final class Number extends Field { - public $type = 'number'; + public string $type = 'number'; /** * @param string $name diff --git a/src/Fields/Select.php b/src/Fields/Select.php index e26b088..1f42d8d 100644 --- a/src/Fields/Select.php +++ b/src/Fields/Select.php @@ -9,7 +9,7 @@ final class Select extends Field { - public $type = 'select'; + public string $type = 'select'; public $multiple = true; /** diff --git a/src/Fields/Tab.php b/src/Fields/Tab.php index ef8b418..1f1744d 100644 --- a/src/Fields/Tab.php +++ b/src/Fields/Tab.php @@ -9,7 +9,7 @@ final class Tab extends Field { - public $type = 'tab'; + public string $type = 'tab'; public $fields; protected $title; diff --git a/src/Fields/Tabs.php b/src/Fields/Tabs.php index 408ab30..38a0359 100644 --- a/src/Fields/Tabs.php +++ b/src/Fields/Tabs.php @@ -9,7 +9,7 @@ final class Tabs extends Field { - public $type = 'tabs'; + public string $type = 'tabs'; public $tabs; public function __construct() From 78f17e19f3d229cfdd8061f4aed276dd53766360 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 5 Aug 2022 15:04:30 +0000 Subject: [PATCH 005/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 4f057c1..16bc43a 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":4113470597,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":3475913326,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":288662375,"src\/Fields\/Tabs.php":2338077135,"src\/Fields\/Select.php":2468598124,"src\/Fields\/Tab.php":122323775,"src\/Fields\/MultiSelect.php":2967987406,"src\/Fields\/Number.php":2972592454,"src\/Contracts\/Field.php":3529337728,"src\/Contracts\/Route.php":1966485194,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":1570910920,"src\/Contracts\/Filter.php":1482797957,"src\/Contracts\/Header.php":3412176535,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":39333525,"src\/Contracts\/Component.php":4154481113,"src\/Contracts\/Renderer.php":3899250064,"src\/Services\/CreateCustomService.php":2751149137,"src\/Services\/FilterService.php":1136423926,"src\/Services\/SortingService.php":971942833,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":392466729,"src\/Routes\/Create.php":3261679531,"src\/Routes\/Index.php":2467093646,"src\/Routes\/Edit.php":3380151641,"src\/Routes\/Store.php":901166628,"src\/Routes\/Routes.php":1567158451,"src\/Routes\/Update.php":1183005567,"src\/Filters\/Text.php":4047841771,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":3143774296,"src\/Filters\/Select.php":412827139,"src\/Headers\/Date.php":801899764,"src\/Headers\/Text.php":1963652945,"src\/Headers\/Headers.php":3282279307,"src\/Headers\/Boolean.php":3260714470,"src\/Headers\/Trend.php":1947377138,"src\/Headers\/Link.php":3399789503,"src\/Headers\/Set.php":186843820,"src\/Headers\/Money.php":3303539918,"src\/Headers\/Download.php":2796001948,"src\/Headers\/Rating.php":1094539246,"src\/Headers\/Label.php":3381470344,"src\/Headers\/InertiaLink.php":3761921318,"src\/Headers\/Number.php":844704962,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":119095043,"src\/Renderers\/IndexRenderer.php":144237398,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":2057470714,"src\/Contracts\/Route.php":1966485194,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":1570910920,"src\/Contracts\/Filter.php":1482797957,"src\/Contracts\/Header.php":3412176535,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":3899250064,"src\/Services\/CreateCustomService.php":2751149137,"src\/Services\/FilterService.php":1136423926,"src\/Services\/SortingService.php":971942833,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":392466729,"src\/Routes\/Create.php":3261679531,"src\/Routes\/Index.php":2467093646,"src\/Routes\/Edit.php":3380151641,"src\/Routes\/Store.php":901166628,"src\/Routes\/Routes.php":1567158451,"src\/Routes\/Update.php":1183005567,"src\/Filters\/Text.php":4047841771,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":3143774296,"src\/Filters\/Select.php":412827139,"src\/Headers\/Date.php":801899764,"src\/Headers\/Text.php":1963652945,"src\/Headers\/Headers.php":3282279307,"src\/Headers\/Boolean.php":3260714470,"src\/Headers\/Trend.php":1947377138,"src\/Headers\/Link.php":3399789503,"src\/Headers\/Set.php":186843820,"src\/Headers\/Money.php":3303539918,"src\/Headers\/Download.php":2796001948,"src\/Headers\/Rating.php":1094539246,"src\/Headers\/Label.php":3381470344,"src\/Headers\/InertiaLink.php":3761921318,"src\/Headers\/Number.php":844704962,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":119095043,"src\/Renderers\/IndexRenderer.php":144237398,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From b3a4ec99dcb57229870f845b632ee57a663d72f4 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 5 Aug 2022 17:08:51 +0200 Subject: [PATCH 006/132] added types for class, overwrite and options --- src/Contracts/Field.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Contracts/Field.php b/src/Contracts/Field.php index a243669..7d22928 100644 --- a/src/Contracts/Field.php +++ b/src/Contracts/Field.php @@ -15,7 +15,7 @@ abstract class Field 'mt-6', ], ]; - protected $options; + protected array $options; public string $vueComponent; @@ -34,7 +34,7 @@ public function __construct(string $name, string $label) * @param bool $overwrite * @return Field */ - public function addWrapperClass($class, $overwrite = false) + public function addWrapperClass(string $class, $overwrite = false): Field { return $this->addClass('wrapper', $class, $overwrite); } @@ -66,7 +66,7 @@ public function toArray() ]; } - private function addClass(string $element, $class, $overwrite = false) + private function addClass(string $element, string $class, bool $overwrite = false): Field { if ($overwrite) { $this->classes[$element] = $class; From 3e20d7f275830c8db87ca96636bdac0dbc79baa2 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 5 Aug 2022 15:09:27 +0000 Subject: [PATCH 007/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 16bc43a..ba7c762 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":2057470714,"src\/Contracts\/Route.php":1966485194,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":1570910920,"src\/Contracts\/Filter.php":1482797957,"src\/Contracts\/Header.php":3412176535,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":3899250064,"src\/Services\/CreateCustomService.php":2751149137,"src\/Services\/FilterService.php":1136423926,"src\/Services\/SortingService.php":971942833,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":392466729,"src\/Routes\/Create.php":3261679531,"src\/Routes\/Index.php":2467093646,"src\/Routes\/Edit.php":3380151641,"src\/Routes\/Store.php":901166628,"src\/Routes\/Routes.php":1567158451,"src\/Routes\/Update.php":1183005567,"src\/Filters\/Text.php":4047841771,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":3143774296,"src\/Filters\/Select.php":412827139,"src\/Headers\/Date.php":801899764,"src\/Headers\/Text.php":1963652945,"src\/Headers\/Headers.php":3282279307,"src\/Headers\/Boolean.php":3260714470,"src\/Headers\/Trend.php":1947377138,"src\/Headers\/Link.php":3399789503,"src\/Headers\/Set.php":186843820,"src\/Headers\/Money.php":3303539918,"src\/Headers\/Download.php":2796001948,"src\/Headers\/Rating.php":1094539246,"src\/Headers\/Label.php":3381470344,"src\/Headers\/InertiaLink.php":3761921318,"src\/Headers\/Number.php":844704962,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":119095043,"src\/Renderers\/IndexRenderer.php":144237398,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":3450381166,"src\/Contracts\/Route.php":1966485194,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":1570910920,"src\/Contracts\/Filter.php":1482797957,"src\/Contracts\/Header.php":3412176535,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":3899250064,"src\/Services\/CreateCustomService.php":2751149137,"src\/Services\/FilterService.php":1136423926,"src\/Services\/SortingService.php":971942833,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":392466729,"src\/Routes\/Create.php":3261679531,"src\/Routes\/Index.php":2467093646,"src\/Routes\/Edit.php":3380151641,"src\/Routes\/Store.php":901166628,"src\/Routes\/Routes.php":1567158451,"src\/Routes\/Update.php":1183005567,"src\/Filters\/Text.php":4047841771,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":3143774296,"src\/Filters\/Select.php":412827139,"src\/Headers\/Date.php":801899764,"src\/Headers\/Text.php":1963652945,"src\/Headers\/Headers.php":3282279307,"src\/Headers\/Boolean.php":3260714470,"src\/Headers\/Trend.php":1947377138,"src\/Headers\/Link.php":3399789503,"src\/Headers\/Set.php":186843820,"src\/Headers\/Money.php":3303539918,"src\/Headers\/Download.php":2796001948,"src\/Headers\/Rating.php":1094539246,"src\/Headers\/Label.php":3381470344,"src\/Headers\/InertiaLink.php":3761921318,"src\/Headers\/Number.php":844704962,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":119095043,"src\/Renderers\/IndexRenderer.php":144237398,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From b85c32c2b5c7a802f730b9f90b7225bdba26dfb1 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 5 Aug 2022 17:40:35 +0200 Subject: [PATCH 008/132] bugfix --- src/Contracts/Field.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Contracts/Field.php b/src/Contracts/Field.php index 7d22928..5f12f99 100644 --- a/src/Contracts/Field.php +++ b/src/Contracts/Field.php @@ -15,7 +15,10 @@ abstract class Field 'mt-6', ], ]; - protected array $options; + /** + * @var array $options + */ + protected $options; public string $vueComponent; From 5487f717fc8e42e04d4e154f62bade198d6b9b6a Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 5 Aug 2022 17:40:53 +0200 Subject: [PATCH 009/132] Header: added parameter and return types --- src/Contracts/Header.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Contracts/Header.php b/src/Contracts/Header.php index a7e06d6..3ae5405 100644 --- a/src/Contracts/Header.php +++ b/src/Contracts/Header.php @@ -6,12 +6,12 @@ abstract class Header { - protected $value; + protected string $value; protected string $label; protected string $type = 'property'; - protected $options = []; + protected array $options = []; protected bool $sortable = false; protected bool $editable = false; @@ -22,14 +22,14 @@ public function __construct(string $label, string $value) $this->setValue($value); } - protected function setLabel(string $label) + protected function setLabel(string $label): self { $this->label = $label; return $this; } - protected function setValue($value) + protected function setValue($value): self { $this->value = $value; @@ -54,28 +54,28 @@ protected function setType(string $type): Header * Available Options */ - public function editable(bool $editable = false) + public function editable(bool $editable = false): self { $this->editable = $editable; return $this; } - public function sortable() + public function sortable(): self { $this->sortable = true; return $this; } - public function tooltip(string $tooltip) + public function tooltip(string $tooltip): self { $this->setOption('tooltip', $tooltip); return $this; } - public function toArray() + public function toArray(): array { return [ 'type' => $this->type, From f3699fe649764429ce0fe17bc46541ef6d9cf85e Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 5 Aug 2022 17:41:02 +0200 Subject: [PATCH 010/132] Filter: added parameter and return types --- src/Contracts/Filter.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Contracts/Filter.php b/src/Contracts/Filter.php index d3f3b5a..cd6d8f4 100644 --- a/src/Contracts/Filter.php +++ b/src/Contracts/Filter.php @@ -27,7 +27,7 @@ public function __construct(string $label, string $field) $this->filterMethods = new Collection(); } - public function __call($name, $arguments) + public function __call(string $name, array $arguments): Filter { if (method_exists($this, $name)) { return $this->{$name}(...$arguments); @@ -38,33 +38,33 @@ public function __call($name, $arguments) return $this; } - public function setLabel(string $label) + public function setLabel(string $label): Filter { $this->label = $label; return $this; } - public function setField(string $field) + public function setField(string $field): Filter { $this->field = $field; return $this; } - public function setType(string $type) + public function setType(string $type): Filter { $this->type = $type; return $this; } - public function setOption(string $key, $value) + public function setOption(string $key, string $value): void { $this->options[$key] = $value; } - public function toArray() + public function toArray(): array { return [ 'label' => $this->label, @@ -102,7 +102,7 @@ public function setOperator(string $operator): self return $this; } - public function apply(Builder $builder, $value) + public function apply(Builder $builder, mixed $value): Builder { return $builder->where($this->getField(), $this->getOperator(), $value); } From 132a407556d12661ab485c91ef743fb1f069427d Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 5 Aug 2022 15:41:33 +0000 Subject: [PATCH 011/132] Fix styling --- .php-cs-fixer.cache | 2 +- src/Contracts/Field.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index ba7c762..d63f9b6 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":3450381166,"src\/Contracts\/Route.php":1966485194,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":1570910920,"src\/Contracts\/Filter.php":1482797957,"src\/Contracts\/Header.php":3412176535,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":3899250064,"src\/Services\/CreateCustomService.php":2751149137,"src\/Services\/FilterService.php":1136423926,"src\/Services\/SortingService.php":971942833,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":392466729,"src\/Routes\/Create.php":3261679531,"src\/Routes\/Index.php":2467093646,"src\/Routes\/Edit.php":3380151641,"src\/Routes\/Store.php":901166628,"src\/Routes\/Routes.php":1567158451,"src\/Routes\/Update.php":1183005567,"src\/Filters\/Text.php":4047841771,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":3143774296,"src\/Filters\/Select.php":412827139,"src\/Headers\/Date.php":801899764,"src\/Headers\/Text.php":1963652945,"src\/Headers\/Headers.php":3282279307,"src\/Headers\/Boolean.php":3260714470,"src\/Headers\/Trend.php":1947377138,"src\/Headers\/Link.php":3399789503,"src\/Headers\/Set.php":186843820,"src\/Headers\/Money.php":3303539918,"src\/Headers\/Download.php":2796001948,"src\/Headers\/Rating.php":1094539246,"src\/Headers\/Label.php":3381470344,"src\/Headers\/InertiaLink.php":3761921318,"src\/Headers\/Number.php":844704962,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":119095043,"src\/Renderers\/IndexRenderer.php":144237398,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":1966485194,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":1570910920,"src\/Contracts\/Filter.php":864889466,"src\/Contracts\/Header.php":1073738425,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":3899250064,"src\/Services\/CreateCustomService.php":2751149137,"src\/Services\/FilterService.php":1136423926,"src\/Services\/SortingService.php":971942833,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":392466729,"src\/Routes\/Create.php":3261679531,"src\/Routes\/Index.php":2467093646,"src\/Routes\/Edit.php":3380151641,"src\/Routes\/Store.php":901166628,"src\/Routes\/Routes.php":1567158451,"src\/Routes\/Update.php":1183005567,"src\/Filters\/Text.php":4047841771,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":3143774296,"src\/Filters\/Select.php":412827139,"src\/Headers\/Date.php":801899764,"src\/Headers\/Text.php":1963652945,"src\/Headers\/Headers.php":3282279307,"src\/Headers\/Boolean.php":3260714470,"src\/Headers\/Trend.php":1947377138,"src\/Headers\/Link.php":3399789503,"src\/Headers\/Set.php":186843820,"src\/Headers\/Money.php":3303539918,"src\/Headers\/Download.php":2796001948,"src\/Headers\/Rating.php":1094539246,"src\/Headers\/Label.php":3381470344,"src\/Headers\/InertiaLink.php":3761921318,"src\/Headers\/Number.php":844704962,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":119095043,"src\/Renderers\/IndexRenderer.php":144237398,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file diff --git a/src/Contracts/Field.php b/src/Contracts/Field.php index 5f12f99..ee5d0a8 100644 --- a/src/Contracts/Field.php +++ b/src/Contracts/Field.php @@ -16,7 +16,7 @@ abstract class Field ], ]; /** - * @var array $options + * @var array */ protected $options; From 577175e9a62cf2845b51805af9d533525946949f Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 5 Aug 2022 18:08:18 +0200 Subject: [PATCH 012/132] added parameter + return types for Contracts classes --- src/Contracts/Filter.php | 7 ++++++- src/Contracts/Header.php | 7 ++++++- src/Contracts/Invokables.php | 4 ++++ src/Contracts/Renderer.php | 4 ++-- src/Contracts/Route.php | 10 +++++----- 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/Contracts/Filter.php b/src/Contracts/Filter.php index cd6d8f4..62340fc 100644 --- a/src/Contracts/Filter.php +++ b/src/Contracts/Filter.php @@ -59,7 +59,12 @@ public function setType(string $type): Filter return $this; } - public function setOption(string $key, string $value): void + /** + * @param string $key + * @param mixed $value + * @return void + */ + public function setOption(string $key, $value): void { $this->options[$key] = $value; } diff --git a/src/Contracts/Header.php b/src/Contracts/Header.php index 3ae5405..8409c7c 100644 --- a/src/Contracts/Header.php +++ b/src/Contracts/Header.php @@ -29,13 +29,18 @@ protected function setLabel(string $label): self return $this; } - protected function setValue($value): self + protected function setValue(string $value): self { $this->value = $value; return $this; } + /** + * @param string $key + * @param mixed $value + * @return $this + */ protected function setOption(string $key, $value): self { $this->options[$key] = $value; diff --git a/src/Contracts/Invokables.php b/src/Contracts/Invokables.php index 21a3b35..09b8549 100644 --- a/src/Contracts/Invokables.php +++ b/src/Contracts/Invokables.php @@ -6,5 +6,9 @@ interface Invokables { + /** + * @param Renderer $renderer + * @return mixed + */ public function __invoke(Renderer $renderer); } diff --git a/src/Contracts/Renderer.php b/src/Contracts/Renderer.php index 9472738..2b507fc 100644 --- a/src/Contracts/Renderer.php +++ b/src/Contracts/Renderer.php @@ -16,9 +16,9 @@ abstract class Renderer implements Responsable protected $entity; protected $items; protected $resource; - protected $classes = []; + protected array $classes = []; protected ?Collection $components; - protected $fields; + protected $fields; protected ?Routes $routes = null; protected string $deleteMessage = 'Weet je zeker dat je dit wilt verwijderen.'; diff --git a/src/Contracts/Route.php b/src/Contracts/Route.php index da60e5a..d76f574 100644 --- a/src/Contracts/Route.php +++ b/src/Contracts/Route.php @@ -6,16 +6,16 @@ abstract class Route { - protected $name; + protected string $name; - abstract public function __construct($name); + abstract public function __construct(string $name); - public static function make($name) + public static function make(string $name) { return new static($name); } - public function getName() + public function getName(): string { return $this->name; } @@ -25,7 +25,7 @@ public function getType() return strtolower(class_basename($this)); } - public function toArray() + public function toArray(): array { return ['name' => $this->name]; } From 6fd70e762908a7cc9dd2a90c5eef5451309d0f2b Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 5 Aug 2022 16:08:44 +0000 Subject: [PATCH 013/132] Fix styling --- .php-cs-fixer.cache | 2 +- src/Contracts/Renderer.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index d63f9b6..75cadb5 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":1966485194,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":1570910920,"src\/Contracts\/Filter.php":864889466,"src\/Contracts\/Header.php":1073738425,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":3899250064,"src\/Services\/CreateCustomService.php":2751149137,"src\/Services\/FilterService.php":1136423926,"src\/Services\/SortingService.php":971942833,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":392466729,"src\/Routes\/Create.php":3261679531,"src\/Routes\/Index.php":2467093646,"src\/Routes\/Edit.php":3380151641,"src\/Routes\/Store.php":901166628,"src\/Routes\/Routes.php":1567158451,"src\/Routes\/Update.php":1183005567,"src\/Filters\/Text.php":4047841771,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":3143774296,"src\/Filters\/Select.php":412827139,"src\/Headers\/Date.php":801899764,"src\/Headers\/Text.php":1963652945,"src\/Headers\/Headers.php":3282279307,"src\/Headers\/Boolean.php":3260714470,"src\/Headers\/Trend.php":1947377138,"src\/Headers\/Link.php":3399789503,"src\/Headers\/Set.php":186843820,"src\/Headers\/Money.php":3303539918,"src\/Headers\/Download.php":2796001948,"src\/Headers\/Rating.php":1094539246,"src\/Headers\/Label.php":3381470344,"src\/Headers\/InertiaLink.php":3761921318,"src\/Headers\/Number.php":844704962,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":119095043,"src\/Renderers\/IndexRenderer.php":144237398,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":1604973599,"src\/Services\/CreateCustomService.php":2751149137,"src\/Services\/FilterService.php":1136423926,"src\/Services\/SortingService.php":971942833,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":392466729,"src\/Routes\/Create.php":3261679531,"src\/Routes\/Index.php":2467093646,"src\/Routes\/Edit.php":3380151641,"src\/Routes\/Store.php":901166628,"src\/Routes\/Routes.php":1567158451,"src\/Routes\/Update.php":1183005567,"src\/Filters\/Text.php":4047841771,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":3143774296,"src\/Filters\/Select.php":412827139,"src\/Headers\/Date.php":801899764,"src\/Headers\/Text.php":1963652945,"src\/Headers\/Headers.php":3282279307,"src\/Headers\/Boolean.php":3260714470,"src\/Headers\/Trend.php":1947377138,"src\/Headers\/Link.php":3399789503,"src\/Headers\/Set.php":186843820,"src\/Headers\/Money.php":3303539918,"src\/Headers\/Download.php":2796001948,"src\/Headers\/Rating.php":1094539246,"src\/Headers\/Label.php":3381470344,"src\/Headers\/InertiaLink.php":3761921318,"src\/Headers\/Number.php":844704962,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":119095043,"src\/Renderers\/IndexRenderer.php":144237398,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file diff --git a/src/Contracts/Renderer.php b/src/Contracts/Renderer.php index 2b507fc..40a1456 100644 --- a/src/Contracts/Renderer.php +++ b/src/Contracts/Renderer.php @@ -18,7 +18,7 @@ abstract class Renderer implements Responsable protected $resource; protected array $classes = []; protected ?Collection $components; - protected $fields; + protected $fields; protected ?Routes $routes = null; protected string $deleteMessage = 'Weet je zeker dat je dit wilt verwijderen.'; From 8de01cd77eca66dcd1d5b2a65bdf5760c2e2c96b Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 5 Aug 2022 18:13:35 +0200 Subject: [PATCH 014/132] added phpdoc typehint --- src/Services/SortingService.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Services/SortingService.php b/src/Services/SortingService.php index c722ae3..543da22 100644 --- a/src/Services/SortingService.php +++ b/src/Services/SortingService.php @@ -16,7 +16,13 @@ public function __construct(Request $request) $this->request = $request; } - public function __invoke(Builder $builder, $defaultColumn, $defaultDirection): Builder + /** + * @param Builder $builder + * @param mixed $defaultColumn + * @param string $defaultDirection + * @return Builder + */ + public function __invoke(Builder $builder, $defaultColumn, string $defaultDirection): Builder { if ($request = $this->request->get('sort')) { $builder->orderBy($request['column'], $request['direction']); From fc942e287bbfe4161587635a8dd6dee7d2828d67 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 5 Aug 2022 18:13:49 +0200 Subject: [PATCH 015/132] FilterService : added phpdoc typehint --- src/Services/FilterService.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Services/FilterService.php b/src/Services/FilterService.php index 4a29d84..0428698 100644 --- a/src/Services/FilterService.php +++ b/src/Services/FilterService.php @@ -33,8 +33,8 @@ public function __invoke(Builder $builder, Filters $filters): Builder } /** - * @param $field - * @param $value + * @param mixed $field + * @param mixed $value * @return void */ private function applyFilter($field, $value): void From 130be272aad06c7c26a992d61c60d71cbaa503f5 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 5 Aug 2022 18:13:59 +0200 Subject: [PATCH 016/132] added parameter type --- src/Services/CreateCustomService.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Services/CreateCustomService.php b/src/Services/CreateCustomService.php index 3ada92c..7a9359c 100644 --- a/src/Services/CreateCustomService.php +++ b/src/Services/CreateCustomService.php @@ -32,14 +32,14 @@ public static function copyFiles(string $name, int $type): array return [$pathPhp, $pathVue]; } - protected static function copyStub($path, $stub, $name, $extension) + protected static function copyStub(string $path, string $stub, string $name, string $extension): void { File::isDirectory($path) or File::makeDirectory($path, 0777, true, true); File::put("$path/$name.$extension", self::getContent($stub, $name)); } - protected static function getContent($stub, $name): string + protected static function getContent(string $stub, string $name): string { $contents = File::get($stub); From 130f5c7fda30805a8f4c9cf29e7085d056c5b560 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 5 Aug 2022 16:14:32 +0000 Subject: [PATCH 017/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 75cadb5..e5641b2 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":1604973599,"src\/Services\/CreateCustomService.php":2751149137,"src\/Services\/FilterService.php":1136423926,"src\/Services\/SortingService.php":971942833,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":392466729,"src\/Routes\/Create.php":3261679531,"src\/Routes\/Index.php":2467093646,"src\/Routes\/Edit.php":3380151641,"src\/Routes\/Store.php":901166628,"src\/Routes\/Routes.php":1567158451,"src\/Routes\/Update.php":1183005567,"src\/Filters\/Text.php":4047841771,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":3143774296,"src\/Filters\/Select.php":412827139,"src\/Headers\/Date.php":801899764,"src\/Headers\/Text.php":1963652945,"src\/Headers\/Headers.php":3282279307,"src\/Headers\/Boolean.php":3260714470,"src\/Headers\/Trend.php":1947377138,"src\/Headers\/Link.php":3399789503,"src\/Headers\/Set.php":186843820,"src\/Headers\/Money.php":3303539918,"src\/Headers\/Download.php":2796001948,"src\/Headers\/Rating.php":1094539246,"src\/Headers\/Label.php":3381470344,"src\/Headers\/InertiaLink.php":3761921318,"src\/Headers\/Number.php":844704962,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":119095043,"src\/Renderers\/IndexRenderer.php":144237398,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":1604973599,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":392466729,"src\/Routes\/Create.php":3261679531,"src\/Routes\/Index.php":2467093646,"src\/Routes\/Edit.php":3380151641,"src\/Routes\/Store.php":901166628,"src\/Routes\/Routes.php":1567158451,"src\/Routes\/Update.php":1183005567,"src\/Filters\/Text.php":4047841771,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":3143774296,"src\/Filters\/Select.php":412827139,"src\/Headers\/Date.php":801899764,"src\/Headers\/Text.php":1963652945,"src\/Headers\/Headers.php":3282279307,"src\/Headers\/Boolean.php":3260714470,"src\/Headers\/Trend.php":1947377138,"src\/Headers\/Link.php":3399789503,"src\/Headers\/Set.php":186843820,"src\/Headers\/Money.php":3303539918,"src\/Headers\/Download.php":2796001948,"src\/Headers\/Rating.php":1094539246,"src\/Headers\/Label.php":3381470344,"src\/Headers\/InertiaLink.php":3761921318,"src\/Headers\/Number.php":844704962,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":119095043,"src\/Renderers\/IndexRenderer.php":144237398,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From b8056033075fb0f3ec9ecc1eea1b2edd59efffa0 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 5 Aug 2022 18:29:03 +0200 Subject: [PATCH 018/132] added return and parameter types --- src/Routes/Create.php | 2 +- src/Routes/Destroy.php | 6 +++--- src/Routes/Edit.php | 6 +++--- src/Routes/Index.php | 2 +- src/Routes/Routes.php | 8 ++++---- src/Routes/Store.php | 6 +++--- src/Routes/Update.php | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Routes/Create.php b/src/Routes/Create.php index a4daab2..6aabbac 100644 --- a/src/Routes/Create.php +++ b/src/Routes/Create.php @@ -8,7 +8,7 @@ final class Create extends Route { - public function __construct($name) + public function __construct(string $name) { $this->name = $name; } diff --git a/src/Routes/Destroy.php b/src/Routes/Destroy.php index 789e0f9..9cb7eed 100644 --- a/src/Routes/Destroy.php +++ b/src/Routes/Destroy.php @@ -8,15 +8,15 @@ final class Destroy extends Route { - protected $identifier = 'id'; + protected string $identifier = 'id'; - public function __construct($name, $identifier = 'id') + public function __construct(string $name, string $identifier = 'id') { $this->name = $name; $this->identifier = $identifier; } - public static function make($name, $identifier = 'id') + public static function make(string $name, string $identifier = 'id'): self { return new static($name, $identifier); } diff --git a/src/Routes/Edit.php b/src/Routes/Edit.php index 0bc3900..09486b6 100644 --- a/src/Routes/Edit.php +++ b/src/Routes/Edit.php @@ -8,15 +8,15 @@ final class Edit extends Route { - protected $identifier = 'id'; + protected string $identifier = 'id'; - public function __construct($name, $identifier = 'id') + public function __construct(string $name, string $identifier = 'id') { $this->name = $name; $this->identifier = $identifier; } - public static function make($name, $identifier = 'id') + public static function make(string $name, string $identifier = 'id'): self { return new static($name, $identifier); } diff --git a/src/Routes/Index.php b/src/Routes/Index.php index 8dfdc7f..a40ee03 100644 --- a/src/Routes/Index.php +++ b/src/Routes/Index.php @@ -8,7 +8,7 @@ final class Index extends Route { - public function __construct($name) + public function __construct(string $name) { $this->name = $name; } diff --git a/src/Routes/Routes.php b/src/Routes/Routes.php index 6bb88a9..1ba8cca 100644 --- a/src/Routes/Routes.php +++ b/src/Routes/Routes.php @@ -9,14 +9,14 @@ final class Routes { - protected $routes; + protected Collection $routes; public function __construct() { $this->routes = new Collection(); } - public static function add(...$routes) + public static function add(Route ...$routes): self { $class = new self(); @@ -27,7 +27,7 @@ public static function add(...$routes) return $class; } - public function push(Route $header) + public function push(Route $header): self { $this->routes->push($header); @@ -39,7 +39,7 @@ public function get(): Collection return $this->routes; } - public function toArray() + public function toArray(): array { return $this->routes->mapWithKeys(function (Route $route) { return [ diff --git a/src/Routes/Store.php b/src/Routes/Store.php index a6bd1c5..6ecd1bb 100644 --- a/src/Routes/Store.php +++ b/src/Routes/Store.php @@ -8,15 +8,15 @@ final class Store extends Route { - protected $identifier = 'id'; + protected string $identifier = 'id'; - public function __construct($name, $identifier = 'id') + public function __construct(string $name, string $identifier = 'id') { $this->name = $name; $this->identifier = $identifier; } - public static function make($name, $identifier = 'id') + public static function make(string $name, string $identifier = 'id'): self { return new static($name, $identifier); } diff --git a/src/Routes/Update.php b/src/Routes/Update.php index d69e57a..c99e596 100644 --- a/src/Routes/Update.php +++ b/src/Routes/Update.php @@ -8,15 +8,15 @@ final class Update extends Route { - protected $identifier = 'id'; + protected string $identifier = 'id'; - public function __construct($name, $identifier = 'id') + public function __construct(string $name, string $identifier = 'id') { $this->name = $name; $this->identifier = $identifier; } - public static function make($name, $identifier = 'id') + public static function make(string $name, string $identifier = 'id'): self { return new static($name, $identifier); } From b134e0ca8f4a8dcbf449d81789d1b26b38f7e51a Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 5 Aug 2022 18:29:16 +0200 Subject: [PATCH 019/132] added types --- src/Renderers/FormRenderer.php | 6 +++--- src/Renderers/IndexRenderer.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Renderers/FormRenderer.php b/src/Renderers/FormRenderer.php index e61675e..b7132c7 100644 --- a/src/Renderers/FormRenderer.php +++ b/src/Renderers/FormRenderer.php @@ -15,7 +15,7 @@ final class FormRenderer extends Renderer { protected $entity; - private $method = 'POST'; + private string $method = 'POST'; public function __construct($entity = null) { @@ -28,7 +28,7 @@ public function __construct($entity = null) $this->entity = $entity; } - public function setMethod($method) + public function setMethod(string $method) { if (! in_array($method, ['POST', 'PUT', 'PATCH'])) { throw new \InvalidArgumentException('Invalid method'); @@ -66,7 +66,7 @@ public function toResponse($request) ->toResponse($request); } - public function getClasses() + public function getClasses(): array { return $this->classes; } diff --git a/src/Renderers/IndexRenderer.php b/src/Renderers/IndexRenderer.php index b70f10a..3267ca5 100644 --- a/src/Renderers/IndexRenderer.php +++ b/src/Renderers/IndexRenderer.php @@ -13,7 +13,7 @@ final class IndexRenderer extends Renderer protected string $title = ''; protected ?Headers $headers = null; protected ?Filters $filters = null; - protected $actions = []; + protected array $actions = []; protected $items = []; public static function render(): IndexRenderer @@ -21,7 +21,7 @@ public static function render(): IndexRenderer return new static(); } - public function items($items) + public function items($items): self { $this->items = $items; From aff4e1c2cdcbe00cdacbd27df5195c68d7841212 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 5 Aug 2022 16:29:41 +0000 Subject: [PATCH 020/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index e5641b2..87b9ad2 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":1604973599,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":392466729,"src\/Routes\/Create.php":3261679531,"src\/Routes\/Index.php":2467093646,"src\/Routes\/Edit.php":3380151641,"src\/Routes\/Store.php":901166628,"src\/Routes\/Routes.php":1567158451,"src\/Routes\/Update.php":1183005567,"src\/Filters\/Text.php":4047841771,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":3143774296,"src\/Filters\/Select.php":412827139,"src\/Headers\/Date.php":801899764,"src\/Headers\/Text.php":1963652945,"src\/Headers\/Headers.php":3282279307,"src\/Headers\/Boolean.php":3260714470,"src\/Headers\/Trend.php":1947377138,"src\/Headers\/Link.php":3399789503,"src\/Headers\/Set.php":186843820,"src\/Headers\/Money.php":3303539918,"src\/Headers\/Download.php":2796001948,"src\/Headers\/Rating.php":1094539246,"src\/Headers\/Label.php":3381470344,"src\/Headers\/InertiaLink.php":3761921318,"src\/Headers\/Number.php":844704962,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":119095043,"src\/Renderers\/IndexRenderer.php":144237398,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":1604973599,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":4047841771,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":3143774296,"src\/Filters\/Select.php":412827139,"src\/Headers\/Date.php":801899764,"src\/Headers\/Text.php":1963652945,"src\/Headers\/Headers.php":3282279307,"src\/Headers\/Boolean.php":3260714470,"src\/Headers\/Trend.php":1947377138,"src\/Headers\/Link.php":3399789503,"src\/Headers\/Set.php":186843820,"src\/Headers\/Money.php":3303539918,"src\/Headers\/Download.php":2796001948,"src\/Headers\/Rating.php":1094539246,"src\/Headers\/Label.php":3381470344,"src\/Headers\/InertiaLink.php":3761921318,"src\/Headers\/Number.php":844704962,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":741916351,"src\/Renderers\/IndexRenderer.php":2364579817,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From c67f1d6bc606195e87ddca828771ed2480144d7a Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 5 Aug 2022 18:35:52 +0200 Subject: [PATCH 021/132] updated phpstan level 5 to level 6 --- phpstan.neon.dist | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 7c01435..0810ff4 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -2,8 +2,9 @@ includes: - ./vendor/nunomaduro/larastan/extension.neon parameters: - level: 5 + level: 6 paths: - src tmpDir: build/phpstan checkMissingIterableValueType: false + checkGenericClassInNonGenericObjectType: false From 1d43e6840996684f7507b4ed96f60e95e3485df2 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 19 Aug 2022 15:56:38 +0200 Subject: [PATCH 022/132] added return types + argument types + global var types --- src/Contracts/Renderer.php | 8 ++++++++ src/Renderers/FormRenderer.php | 17 ++++++++++++++--- src/Renderers/IndexRenderer.php | 9 +++++++++ 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/Contracts/Renderer.php b/src/Contracts/Renderer.php index 40a1456..76cbc06 100644 --- a/src/Contracts/Renderer.php +++ b/src/Contracts/Renderer.php @@ -14,7 +14,15 @@ abstract class Renderer implements Responsable protected string $title = ''; protected string $action = ''; protected $entity; + + /** + * @var mixed $items + */ + protected $items; + /** + * @var mixed $resource + */ protected $resource; protected array $classes = []; protected ?Collection $components; diff --git a/src/Renderers/FormRenderer.php b/src/Renderers/FormRenderer.php index b7132c7..8033e7f 100644 --- a/src/Renderers/FormRenderer.php +++ b/src/Renderers/FormRenderer.php @@ -6,6 +6,7 @@ use Illuminate\Database\Eloquent\Model; use Libaro\Bread\Contracts\Renderer; +use phpDocumentor\Reflection\Types\Mixed_; /** * @method fields(string $class) @@ -14,9 +15,15 @@ */ final class FormRenderer extends Renderer { + /** + * @var Model|mixed + */ protected $entity; private string $method = 'POST'; + /** + * @param mixed $entity + */ public function __construct($entity = null) { parent::__construct(); @@ -28,7 +35,7 @@ public function __construct($entity = null) $this->entity = $entity; } - public function setMethod(string $method) + public function setMethod(string $method): FormRenderer { if (! in_array($method, ['POST', 'PUT', 'PATCH'])) { throw new \InvalidArgumentException('Invalid method'); @@ -39,11 +46,15 @@ public function setMethod(string $method) return $this; } - public function getMethod() + public function getMethod(): string { return $this->method; } + /** + * @param mixed $entity + * @return FormRenderer + */ public static function render($entity = null): FormRenderer { return new FormRenderer($entity); @@ -71,7 +82,7 @@ public function getClasses(): array return $this->classes; } - protected function guessResource() + protected function guessResource(): string { if ($this->resource) { return $this->resource; diff --git a/src/Renderers/IndexRenderer.php b/src/Renderers/IndexRenderer.php index 3267ca5..f23eb19 100644 --- a/src/Renderers/IndexRenderer.php +++ b/src/Renderers/IndexRenderer.php @@ -14,6 +14,10 @@ final class IndexRenderer extends Renderer protected ?Headers $headers = null; protected ?Filters $filters = null; protected array $actions = []; + + /** + * @var mixed + */ protected $items = []; public static function render(): IndexRenderer @@ -21,6 +25,11 @@ public static function render(): IndexRenderer return new static(); } + + /** + * @param mixed $items + * @return $this + */ public function items($items): self { $this->items = $items; From 4acd513e43616621187196f0e3de2ca059291ff8 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 19 Aug 2022 13:57:03 +0000 Subject: [PATCH 023/132] Fix styling --- .php-cs-fixer.cache | 2 +- src/Contracts/Renderer.php | 4 ++-- src/Renderers/FormRenderer.php | 1 - src/Renderers/IndexRenderer.php | 1 - 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 87b9ad2..a4947d2 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":1604973599,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":4047841771,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":3143774296,"src\/Filters\/Select.php":412827139,"src\/Headers\/Date.php":801899764,"src\/Headers\/Text.php":1963652945,"src\/Headers\/Headers.php":3282279307,"src\/Headers\/Boolean.php":3260714470,"src\/Headers\/Trend.php":1947377138,"src\/Headers\/Link.php":3399789503,"src\/Headers\/Set.php":186843820,"src\/Headers\/Money.php":3303539918,"src\/Headers\/Download.php":2796001948,"src\/Headers\/Rating.php":1094539246,"src\/Headers\/Label.php":3381470344,"src\/Headers\/InertiaLink.php":3761921318,"src\/Headers\/Number.php":844704962,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":741916351,"src\/Renderers\/IndexRenderer.php":2364579817,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":4047841771,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":3143774296,"src\/Filters\/Select.php":412827139,"src\/Headers\/Date.php":801899764,"src\/Headers\/Text.php":1963652945,"src\/Headers\/Headers.php":3282279307,"src\/Headers\/Boolean.php":3260714470,"src\/Headers\/Trend.php":1947377138,"src\/Headers\/Link.php":3399789503,"src\/Headers\/Set.php":186843820,"src\/Headers\/Money.php":3303539918,"src\/Headers\/Download.php":2796001948,"src\/Headers\/Rating.php":1094539246,"src\/Headers\/Label.php":3381470344,"src\/Headers\/InertiaLink.php":3761921318,"src\/Headers\/Number.php":844704962,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file diff --git a/src/Contracts/Renderer.php b/src/Contracts/Renderer.php index 76cbc06..aa43817 100644 --- a/src/Contracts/Renderer.php +++ b/src/Contracts/Renderer.php @@ -16,12 +16,12 @@ abstract class Renderer implements Responsable protected $entity; /** - * @var mixed $items + * @var mixed */ protected $items; /** - * @var mixed $resource + * @var mixed */ protected $resource; protected array $classes = []; diff --git a/src/Renderers/FormRenderer.php b/src/Renderers/FormRenderer.php index 8033e7f..4d90d37 100644 --- a/src/Renderers/FormRenderer.php +++ b/src/Renderers/FormRenderer.php @@ -6,7 +6,6 @@ use Illuminate\Database\Eloquent\Model; use Libaro\Bread\Contracts\Renderer; -use phpDocumentor\Reflection\Types\Mixed_; /** * @method fields(string $class) diff --git a/src/Renderers/IndexRenderer.php b/src/Renderers/IndexRenderer.php index f23eb19..5406b76 100644 --- a/src/Renderers/IndexRenderer.php +++ b/src/Renderers/IndexRenderer.php @@ -25,7 +25,6 @@ public static function render(): IndexRenderer return new static(); } - /** * @param mixed $items * @return $this From 25d794f81342d0d20da43972c1b3eb5ddd2895e9 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 19 Aug 2022 15:58:18 +0200 Subject: [PATCH 024/132] added return type --- src/Headers/Trend.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Headers/Trend.php b/src/Headers/Trend.php index be27ecf..44f1579 100644 --- a/src/Headers/Trend.php +++ b/src/Headers/Trend.php @@ -15,7 +15,7 @@ public function __construct(string $label, string $value) $this->setType('trend'); } - public static function make(string $label, string $value) + public static function make(string $label, string $value): Trend { return new self($label, $value); } From 79f6cbc003214cff055e691fd8be463604d98738 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 19 Aug 2022 15:58:46 +0200 Subject: [PATCH 025/132] added return type --- src/Headers/Text.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Headers/Text.php b/src/Headers/Text.php index df88a0a..892ee11 100644 --- a/src/Headers/Text.php +++ b/src/Headers/Text.php @@ -15,7 +15,7 @@ public function __construct(string $label, string $value) $this->setType('property'); } - public static function make(string $label, string $value) + public static function make(string $label, string $value): Text { return new self($label, $value); } From 2da4b7fda6ed7425ae4328967035a778595c5f78 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 19 Aug 2022 16:02:14 +0200 Subject: [PATCH 026/132] added return types --- src/Headers/Money.php | 10 +++++----- src/Headers/Number.php | 2 +- src/Headers/Rating.php | 2 +- src/Headers/Set.php | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Headers/Money.php b/src/Headers/Money.php index 6bfb3b5..26c9c73 100644 --- a/src/Headers/Money.php +++ b/src/Headers/Money.php @@ -21,33 +21,33 @@ public function __construct(string $label, string $value) ]; } - public static function make(string $label, string $value) + public static function make(string $label, string $value): Money { return new self($label, $value); } - public function prefix(string $prefix) + public function prefix(string $prefix): Money { $this->setOption('prefix', $prefix); return $this; } - public function suffix(string $suffix) + public function suffix(string $suffix): Money { $this->setOption('suffix', $suffix); return $this; } - public function centSeparator(string $separator) + public function centSeparator(string $separator): Money { $this->setOption('cent_separator', $separator); return $this; } - public function thousandSeparator(string $separator) + public function thousandSeparator(string $separator): Money { $this->setOption('thousand_separator', $separator); diff --git a/src/Headers/Number.php b/src/Headers/Number.php index d8400b6..255db2c 100644 --- a/src/Headers/Number.php +++ b/src/Headers/Number.php @@ -15,7 +15,7 @@ public function __construct(string $label, string $value) $this->setType('number'); } - public static function make(string $label, string $value) + public static function make(string $label, string $value): Number { return new self($label, $value); } diff --git a/src/Headers/Rating.php b/src/Headers/Rating.php index e49a4ac..20a40e4 100644 --- a/src/Headers/Rating.php +++ b/src/Headers/Rating.php @@ -16,7 +16,7 @@ public function __construct(string $label, string $value, array $options) $this->setType('rating'); } - public static function make(string $label, string $value, array $options) + public static function make(string $label, string $value, array $options): Rating { return new self($label, $value, $options); } diff --git a/src/Headers/Set.php b/src/Headers/Set.php index 3259b7c..29c91b0 100644 --- a/src/Headers/Set.php +++ b/src/Headers/Set.php @@ -16,7 +16,7 @@ public function __construct(string $label, string $value, string $separator) $this->setType('set'); } - public static function make(string $label, string $value, string $separator = ', ') + public static function make(string $label, string $value, string $separator = ', '): Set { return new self($label, $value, $separator); } From 8a8a883b71833e38576200e4fafec195e50e87d5 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 19 Aug 2022 14:02:45 +0000 Subject: [PATCH 027/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index a4947d2..6cff671 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":4047841771,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":3143774296,"src\/Filters\/Select.php":412827139,"src\/Headers\/Date.php":801899764,"src\/Headers\/Text.php":1963652945,"src\/Headers\/Headers.php":3282279307,"src\/Headers\/Boolean.php":3260714470,"src\/Headers\/Trend.php":1947377138,"src\/Headers\/Link.php":3399789503,"src\/Headers\/Set.php":186843820,"src\/Headers\/Money.php":3303539918,"src\/Headers\/Download.php":2796001948,"src\/Headers\/Rating.php":1094539246,"src\/Headers\/Label.php":3381470344,"src\/Headers\/InertiaLink.php":3761921318,"src\/Headers\/Number.php":844704962,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":4047841771,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":3143774296,"src\/Filters\/Select.php":412827139,"src\/Headers\/Date.php":801899764,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":3282279307,"src\/Headers\/Boolean.php":3260714470,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3399789503,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":2796001948,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":3381470344,"src\/Headers\/InertiaLink.php":3761921318,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From 967c6efa983af6fa04bfe6152173c6575c64c5e9 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 19 Aug 2022 16:04:00 +0200 Subject: [PATCH 028/132] added return types --- src/Headers/InertiaLink.php | 2 +- src/Headers/Label.php | 2 +- src/Headers/Link.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Headers/InertiaLink.php b/src/Headers/InertiaLink.php index 3fb8907..3ebff5c 100644 --- a/src/Headers/InertiaLink.php +++ b/src/Headers/InertiaLink.php @@ -17,7 +17,7 @@ public function __construct(string $label, string $value, string|null $name, str $this->setType('inertia_link'); } - public static function make(string $label, string $value, string|null $name, string|null $propName = null) + public static function make(string $label, string $value, string|null $name, string|null $propName = null): InertiaLink { return new self($label, $value, $name, $propName); } diff --git a/src/Headers/Label.php b/src/Headers/Label.php index f1b2e13..ac62698 100644 --- a/src/Headers/Label.php +++ b/src/Headers/Label.php @@ -16,7 +16,7 @@ public function __construct(string $label, string $value, array $options) $this->setType('label'); } - public static function make(string $label, string $value, array $options) + public static function make(string $label, string $value, array $options): Label { return new self($label, $value, $options); } diff --git a/src/Headers/Link.php b/src/Headers/Link.php index afb9a14..66a1880 100644 --- a/src/Headers/Link.php +++ b/src/Headers/Link.php @@ -16,7 +16,7 @@ public function __construct(string $label, string $value, bool $_blank) $this->setType('link'); } - public static function make(string $label, string $value, bool $_blank = false) + public static function make(string $label, string $value, bool $_blank = false): Link { return new self($label, $value, $_blank); } From 00deb5edf61ba1ba29575f78497dcf2320e8a812 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 19 Aug 2022 14:04:51 +0000 Subject: [PATCH 029/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 6cff671..110d477 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":4047841771,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":3143774296,"src\/Filters\/Select.php":412827139,"src\/Headers\/Date.php":801899764,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":3282279307,"src\/Headers\/Boolean.php":3260714470,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3399789503,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":2796001948,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":3381470344,"src\/Headers\/InertiaLink.php":3761921318,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":4047841771,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":3143774296,"src\/Filters\/Select.php":412827139,"src\/Headers\/Date.php":801899764,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":3282279307,"src\/Headers\/Boolean.php":3260714470,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":2796001948,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From 40b9cc1c1aa8635806d9d5febf8c92c1cebcfbfc Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 19 Aug 2022 16:11:37 +0200 Subject: [PATCH 030/132] added return types + argument type --- src/Headers/Headers.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Headers/Headers.php b/src/Headers/Headers.php index 46c9d1a..ae0c6fa 100644 --- a/src/Headers/Headers.php +++ b/src/Headers/Headers.php @@ -17,7 +17,11 @@ public function __construct() $this->headers = new Collection(); } - public static function add(...$headers) + /** + * @param mixed ...$headers + * @return Headers + */ + public static function add(...$headers): Headers { $class = new self(); @@ -28,7 +32,7 @@ public static function add(...$headers) return $class; } - public function push(Header $header) + public function push(Header $header): Headers { $this->headers->push($header); @@ -40,7 +44,7 @@ public function get(): Collection return $this->headers; } - public function toArray() + public function toArray(): Fluent { $class = new Fluent(); $class->offsetSet('data', $this->headers @@ -54,7 +58,7 @@ public function toArray() return $class; } - public function getOptions() + public function getOptions(): array { return []; } From afe37e0bf48e3f07e7a4b97be9459e9bd3908112 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 19 Aug 2022 14:12:11 +0000 Subject: [PATCH 031/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 110d477..1471162 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":4047841771,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":3143774296,"src\/Filters\/Select.php":412827139,"src\/Headers\/Date.php":801899764,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":3282279307,"src\/Headers\/Boolean.php":3260714470,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":2796001948,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":4047841771,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":3143774296,"src\/Filters\/Select.php":412827139,"src\/Headers\/Date.php":801899764,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":2514825064,"src\/Headers\/Boolean.php":3260714470,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":2796001948,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From 9acab11b181db883472c01df78219d27572fb931 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 19 Aug 2022 16:16:37 +0200 Subject: [PATCH 032/132] added return types --- src/Headers/Date.php | 2 +- src/Headers/Download.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Headers/Date.php b/src/Headers/Date.php index 5a81dc7..e8465d3 100644 --- a/src/Headers/Date.php +++ b/src/Headers/Date.php @@ -16,7 +16,7 @@ public function __construct(string $label, string $value, string $format) $this->setType('date'); } - public static function make(string $label, string $value, string $format = 'DD-MM-YYYY HH:mm') + public static function make(string $label, string $value, string $format = 'DD-MM-YYYY HH:mm'): Date { return new self($label, $value, $format); } diff --git a/src/Headers/Download.php b/src/Headers/Download.php index e70079a..33ee9ba 100644 --- a/src/Headers/Download.php +++ b/src/Headers/Download.php @@ -15,7 +15,7 @@ public function __construct(string $label, string $value) $this->setType('download'); } - public static function make(string $label, string $value) + public static function make(string $label, string $value): Download { return new self($label, $value); } From 37b2c49306872faa9f6516811addadfeddb25014 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 19 Aug 2022 16:16:53 +0200 Subject: [PATCH 033/132] added return type Boolean --- src/Headers/Boolean.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Headers/Boolean.php b/src/Headers/Boolean.php index d71c607..12f08ab 100644 --- a/src/Headers/Boolean.php +++ b/src/Headers/Boolean.php @@ -15,7 +15,7 @@ public function __construct(string $label, string $value) $this->setType('boolean'); } - public static function make(string $label, string $value) + public static function make(string $label, string $value): Boolean { return new self($label, $value); } From a02e9ab3afefb52e021808a3b7432816222aebb9 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 19 Aug 2022 14:17:20 +0000 Subject: [PATCH 034/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 1471162..d421dad 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":4047841771,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":3143774296,"src\/Filters\/Select.php":412827139,"src\/Headers\/Date.php":801899764,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":2514825064,"src\/Headers\/Boolean.php":3260714470,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":2796001948,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":4047841771,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":3143774296,"src\/Filters\/Select.php":412827139,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":2514825064,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From 817bba3a18df65e3cddddfe2409de1f692068791 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 19 Aug 2022 16:19:18 +0200 Subject: [PATCH 035/132] added argument type + return types --- src/Filters/Text.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Filters/Text.php b/src/Filters/Text.php index 5c8be60..1b3c7e2 100644 --- a/src/Filters/Text.php +++ b/src/Filters/Text.php @@ -15,12 +15,17 @@ public function __construct(string $label, string $field) $this->setType('text'); } - public static function make(string $label, string $field) + public static function make(string $label, string $field): Text { return new self($label, $field); } - public function apply(Builder $builder, $value) + /** + * @param Builder $builder + * @param mixed $value + * @return Builder + */ + public function apply(Builder $builder, $value): Builder { return $builder->where($this->getField(), $this->getOperator(), "%$value%"); } From 3aa516f14d31729f271ce9818fe799831607ddbf Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 19 Aug 2022 14:20:34 +0000 Subject: [PATCH 036/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index d421dad..27eb64e 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":4047841771,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":3143774296,"src\/Filters\/Select.php":412827139,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":2514825064,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":3143774296,"src\/Filters\/Select.php":412827139,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":2514825064,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From 3bf146cb72178eee313b0817db809eceeee05882 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 19 Aug 2022 16:27:08 +0200 Subject: [PATCH 037/132] added return types + argument types --- src/Filters/Select.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Filters/Select.php b/src/Filters/Select.php index c4317c1..adb33fa 100644 --- a/src/Filters/Select.php +++ b/src/Filters/Select.php @@ -15,17 +15,22 @@ public function __construct(string $label, string $field, array $values) $this->setOption('values', $values); } - public static function make(string $label, string $field, array $values) + public static function make(string $label, string $field, array $values): Select { return new self($label, $field, $values); } - public function multi(bool $multi = true) + public function multi(bool $multi = true): void { $this->setOption('multiple', $multi); } - public function apply(Builder $builder, $value) + /** + * @param Builder $builder + * @param mixed $value + * @return Builder + */ + public function apply(Builder $builder, $value): Builder { if ($this->options['multiple']) { return $builder->whereIn($this->field, $value); From 1c38745c9162bb396fa86adb35fcb50cdf3bcfe5 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 19 Aug 2022 14:27:33 +0000 Subject: [PATCH 038/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 27eb64e..7669d12 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":3143774296,"src\/Filters\/Select.php":412827139,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":2514825064,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":3143774296,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":2514825064,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From 629650e64813e4cd37c7b28f012529ae8efbe164 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 19 Aug 2022 16:33:13 +0200 Subject: [PATCH 039/132] added return types + argument types --- src/Filters/Filters.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/Filters/Filters.php b/src/Filters/Filters.php index b7af8b5..c64088a 100644 --- a/src/Filters/Filters.php +++ b/src/Filters/Filters.php @@ -15,7 +15,11 @@ public function __construct() $this->filters = new Collection(); } - public static function add(...$filters) + /** + * @param mixed ...$filters + * @return Filters + */ + public static function add(...$filters): Filters { $class = new self(); @@ -26,7 +30,7 @@ public static function add(...$filters) return $class; } - public function push(Filter $filter) + public function push(Filter $filter): Filters { $this->filters->push($filter); @@ -38,7 +42,7 @@ public function get(): Collection return $this->filters; } - public function toArray() + public function toArray(): stdClass { $class = new stdClass(); $class->data = $this->filters @@ -52,14 +56,14 @@ public function toArray() return $class; } - public function sideBarStarsAt(int $int) + public function sideBarStarsAt(int $int): Filters { $this->sideBarStarsAt = $int; return $this; } - public function getOptions() + public function getOptions(): array { return [ 'sidebar_starts_at' => $this->sideBarStarsAt, From 0f00093f8194f8784eb6e1d4e2be6ae9cca3bb39 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 19 Aug 2022 16:34:55 +0200 Subject: [PATCH 040/132] marked inconsequences in the code with a TODO toArray should return an array ... --- src/Filters/Filters.php | 2 +- src/Headers/Headers.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Filters/Filters.php b/src/Filters/Filters.php index c64088a..7bbee68 100644 --- a/src/Filters/Filters.php +++ b/src/Filters/Filters.php @@ -42,7 +42,7 @@ public function get(): Collection return $this->filters; } - public function toArray(): stdClass + public function toArray(): stdClass // TODO { $class = new stdClass(); $class->data = $this->filters diff --git a/src/Headers/Headers.php b/src/Headers/Headers.php index ae0c6fa..498a4f8 100644 --- a/src/Headers/Headers.php +++ b/src/Headers/Headers.php @@ -44,7 +44,7 @@ public function get(): Collection return $this->headers; } - public function toArray(): Fluent + public function toArray(): Fluent // TODO { $class = new Fluent(); $class->offsetSet('data', $this->headers From 2e7f4fac394c7d95294fa9bd9f9ddede1ccdca43 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 19 Aug 2022 15:04:26 +0000 Subject: [PATCH 041/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 7669d12..18c6138 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":3143774296,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":2514825064,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":843457220,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From 2c2a9eb319a4f1410d78bf03feab0a2a90561823 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 19 Aug 2022 17:08:32 +0200 Subject: [PATCH 042/132] added return type --- src/Filters/Filter.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Filters/Filter.php b/src/Filters/Filter.php index e0d0f62..e5c5a40 100644 --- a/src/Filters/Filter.php +++ b/src/Filters/Filter.php @@ -25,7 +25,7 @@ public function __construct(string $label, string $field) $this->filterMethods = new Collection(); } - public function __call($name, $arguments) + public function __call($name, $arguments): Filter { if (method_exists($this, $name)) { return $this->{$name}(...$arguments); @@ -36,33 +36,33 @@ public function __call($name, $arguments) return $this; } - public function setLabel(string $label) + public function setLabel(string $label): Filter { $this->label = $label; return $this; } - public function setField(string $field) + public function setField(string $field): Filter { $this->field = $field; return $this; } - public function setType(string $type) + public function setType(string $type): Filter { $this->type = $type; return $this; } - public function setOption(string $key, $value) + public function setOption(string $key, $value): void { $this->options[$key] = $value; } - public function toArray() + public function toArray(): array { return [ 'label' => $this->label, From 8d44d89c181bdc74ed07984edc6a0b09bb9617e4 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 19 Aug 2022 15:08:54 +0000 Subject: [PATCH 043/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 18c6138..7229805 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1453482139,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":843457220,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":2227304632,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":843457220,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From df20a4d27822bafb1776ea2c8e5ab076c6852180 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 19 Aug 2022 17:13:27 +0200 Subject: [PATCH 044/132] argument + return types --- src/Filters/Filter.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/Filters/Filter.php b/src/Filters/Filter.php index e5c5a40..0cf7d0d 100644 --- a/src/Filters/Filter.php +++ b/src/Filters/Filter.php @@ -25,7 +25,7 @@ public function __construct(string $label, string $field) $this->filterMethods = new Collection(); } - public function __call($name, $arguments): Filter + public function __call(string $name, array $arguments): Filter { if (method_exists($this, $name)) { return $this->{$name}(...$arguments); @@ -57,6 +57,11 @@ public function setType(string $type): Filter return $this; } + /** + * @param string $key + * @param mixed $value + * @return void + */ public function setOption(string $key, $value): void { $this->options[$key] = $value; @@ -100,6 +105,11 @@ public function setOperator(string $operator): self return $this; } + /** + * @param Builder $builder + * @param mixed $value + * @return Builder + */ public function apply(Builder $builder, $value) { return $builder->where($this->getField(), $this->getOperator(), $value); @@ -113,6 +123,9 @@ public function getFilterMethods(): Collection return $this->filterMethods; } + /** + * @return mixed + */ private function getValue() { return app('request')->input("filters.{$this->getField()}"); From 85c8e82baaa26f0c9b7cbf8d9b27b01699237755 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 19 Aug 2022 15:14:07 +0000 Subject: [PATCH 045/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 7229805..11f8199 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":2227304632,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":843457220,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1213338388,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":843457220,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From 7dc8d74abe1992e0e47e82a6edf9bbce1cf5d9d9 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 19 Aug 2022 17:20:25 +0200 Subject: [PATCH 046/132] added argument + return types --- src/Fields/Tabs.php | 12 ++++++++---- src/Fields/Text.php | 2 +- src/Filters/Boolean.php | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Fields/Tabs.php b/src/Fields/Tabs.php index 38a0359..1c3aeb2 100644 --- a/src/Fields/Tabs.php +++ b/src/Fields/Tabs.php @@ -10,14 +10,18 @@ final class Tabs extends Field { public string $type = 'tabs'; - public $tabs; + public Collection $tabs; public function __construct() { $this->tabs = new Collection(); } - public static function add(...$tabs) + /** + * @param mixed ...$tabs + * @return Tabs + */ + public static function add(...$tabs): Tabs { $class = new self(); @@ -28,7 +32,7 @@ public static function add(...$tabs) return $class; } - public function push(Tab $tab) + public function push(Tab $tab): Tabs { $this->tabs->push($tab); @@ -38,7 +42,7 @@ public function push(Tab $tab) /** * @return array */ - public function toArray() + public function toArray(): array { $array = parent::toArray(); $array['tabs'] = $this->tabs diff --git a/src/Fields/Text.php b/src/Fields/Text.php index fdc5d11..b326812 100644 --- a/src/Fields/Text.php +++ b/src/Fields/Text.php @@ -8,7 +8,7 @@ final class Text extends Field { - public static function make(string $name, string $label) + public static function make(string $name, string $label): Text { return new self($name, $label); } diff --git a/src/Filters/Boolean.php b/src/Filters/Boolean.php index fca2d3d..cc2d731 100644 --- a/src/Filters/Boolean.php +++ b/src/Filters/Boolean.php @@ -11,7 +11,7 @@ public function __construct(string $label, string $field) $this->setType('boolean'); } - public static function make(string $label, string $field) + public static function make(string $label, string $field): self { return new self($label, $field); } From 1304af64b2ed0382819b98b58918d618c6df18e2 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 19 Aug 2022 15:20:54 +0000 Subject: [PATCH 047/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 11f8199..80e9b80 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":1843933408,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1092686408,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1213338388,"src\/Filters\/Boolean.php":1579975008,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":843457220,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1213338388,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":843457220,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From 3a5d0ceb93691536515fbc0e9d9749abbb664a97 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 19 Aug 2022 17:25:29 +0200 Subject: [PATCH 048/132] fix for Property Libaro\Bread\Contracts\Field::$options (array) does not accept Illuminate\Support\Collection --- src/Contracts/Field.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Contracts/Field.php b/src/Contracts/Field.php index ee5d0a8..fdbbd67 100644 --- a/src/Contracts/Field.php +++ b/src/Contracts/Field.php @@ -16,7 +16,7 @@ abstract class Field ], ]; /** - * @var array + * @var mixed */ protected $options; From 4fbf3d41762e46b698fd83e2f9113818ea52f500 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 19 Aug 2022 15:25:56 +0000 Subject: [PATCH 049/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 80e9b80..ba046ca 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1309139671,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1213338388,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":843457220,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1213338388,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":843457220,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From 77bbc5eca6457a8b6030e0ba92883dc6fbc92deb Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 19 Aug 2022 17:28:41 +0200 Subject: [PATCH 050/132] added return types + argument types --- src/Fields/Tab.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Fields/Tab.php b/src/Fields/Tab.php index 1f1744d..b3743f0 100644 --- a/src/Fields/Tab.php +++ b/src/Fields/Tab.php @@ -11,15 +11,20 @@ final class Tab extends Field { public string $type = 'tab'; - public $fields; - protected $title; + public Collection $fields; + protected string $title; public function __construct() { $this->fields = new Collection(); } - public static function make($title, ...$fields) + /** + * @param $title + * @param Collection ...$fields + * @return Tab + */ + public static function make(string $title, ...$fields): Tab { $class = new self(); $class->setTitle($title); @@ -31,7 +36,7 @@ public static function make($title, ...$fields) return $class; } - public function setTitle(string $title) + public function setTitle(string $title): Tab { $this->title = $title; From 191ca52bde934858d7d61179ada8a6653c2e2deb Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 19 Aug 2022 15:29:05 +0000 Subject: [PATCH 051/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index ba046ca..a32357c 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":1915986237,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1213338388,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":843457220,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1213338388,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":843457220,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From f6798ffc4e17fe61f88e2a4d0889e8eedbb5c0d2 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 19 Aug 2022 17:30:15 +0200 Subject: [PATCH 052/132] added types --- src/Fields/Select.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Fields/Select.php b/src/Fields/Select.php index 1f42d8d..c16c248 100644 --- a/src/Fields/Select.php +++ b/src/Fields/Select.php @@ -10,7 +10,7 @@ final class Select extends Field { public string $type = 'select'; - public $multiple = true; + public bool $multiple = true; /** * @param string $name @@ -23,19 +23,19 @@ public function __construct(string $name, string $label, Collection $options) $this->options = $options; } - public static function make(string $name, string $label, Collection $options) + public static function make(string $name, string $label, Collection $options): Select { return new self($name, $label, $options); } - public function multiple() + public function multiple(): Select { $this->multiple = true; return $this; } - public function toArray() + public function toArray(): array { $array = parent::toArray(); $array['multiple'] = $this->multiple; From 840e00795141d14f33571b5a8aa00b4a6509cef0 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 19 Aug 2022 15:30:40 +0000 Subject: [PATCH 053/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index a32357c..c86622a 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":805500941,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1213338388,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":843457220,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1213338388,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":843457220,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From 95733c3025637f94bbf174577de902404659a521 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 19 Aug 2022 17:31:00 +0200 Subject: [PATCH 054/132] added return type --- src/Fields/Number.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Fields/Number.php b/src/Fields/Number.php index bb075aa..fcec9ca 100644 --- a/src/Fields/Number.php +++ b/src/Fields/Number.php @@ -20,7 +20,7 @@ public function __construct(string $name, string $label) $this->options = ['float' => true]; } - public static function make(string $name, string $label) + public static function make(string $name, string $label): Number { return new self($name, $label); } From 3dabf2d9ac9c08d0f3484d1bee516313b47de999 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 19 Aug 2022 15:31:28 +0000 Subject: [PATCH 055/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index c86622a..60a36b7 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":1422175931,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1213338388,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":843457220,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":2034541722,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1213338388,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":843457220,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From 40e41cc91b26116ec066a39a3bdf39858a9ef13f Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 19 Aug 2022 17:32:11 +0200 Subject: [PATCH 056/132] added types --- src/Fields/Image.php | 6 +++--- src/Fields/MultiSelect.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Fields/Image.php b/src/Fields/Image.php index 46e6cd5..a8e0afc 100644 --- a/src/Fields/Image.php +++ b/src/Fields/Image.php @@ -10,7 +10,7 @@ final class Image extends Field { public string $type = 'image'; - public $collection = 'images'; + public string $collection = 'images'; /** * @param string $name @@ -21,12 +21,12 @@ public function __construct(string $name, string $label) parent::__construct($name, $label); } - public static function make(string $name, string $label) + public static function make(string $name, string $label): Image { return new self($name, $label); } - public function toArray() + public function toArray(): array { $array = parent::toArray(); $array['collection'] = $this->collection; diff --git a/src/Fields/MultiSelect.php b/src/Fields/MultiSelect.php index 6c68887..95484a7 100644 --- a/src/Fields/MultiSelect.php +++ b/src/Fields/MultiSelect.php @@ -22,7 +22,7 @@ public function __construct(string $name, string $label, Collection $options) $this->options = $options; } - public static function make(string $name, string $label, Collection $options) + public static function make(string $name, string $label, Collection $options): MultiSelect { return new self($name, $label, $options); } From 48b362850422d70378c1d86aa24b82b249315859 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 19 Aug 2022 15:32:43 +0000 Subject: [PATCH 057/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 60a36b7..8464d6e 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":2505525512,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/MultiSelect.php":2511327694,"src\/Fields\/Number.php":2034541722,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1213338388,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":843457220,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":620903073,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Number.php":2034541722,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1213338388,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":843457220,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From cb992144531b2aa801952055e809a10bbbe4b4c3 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 19 Aug 2022 17:34:09 +0200 Subject: [PATCH 058/132] added types --- src/Fields/Fields.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/Fields/Fields.php b/src/Fields/Fields.php index 2e514d5..d489ea2 100644 --- a/src/Fields/Fields.php +++ b/src/Fields/Fields.php @@ -16,7 +16,11 @@ public function __construct() $this->fields = new Collection(); } - public static function add(...$fields) + /** + * @param mixed ...$fields + * @return Fields + */ + public static function add(...$fields): Fields { $class = new self(); @@ -27,7 +31,11 @@ public static function add(...$fields) return $class; } - public function push($field) + /** + * @param mixed $field + * @return $this + */ + public function push($field): Fields { $this->fields->push($field); @@ -39,7 +47,7 @@ public function get(): Collection return $this->fields; } - public function toArray() + public function toArray(): Fluent { $class = new Fluent(); $class->offsetSet('data', $this->fields @@ -53,7 +61,7 @@ public function toArray() return $class; } - public function getOptions() + public function getOptions(): array { return []; } From 9077adf671676ed9bd5d8bb3584a16ca9310ee6a Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 19 Aug 2022 15:34:42 +0000 Subject: [PATCH 059/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 8464d6e..c5d0028 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":620903073,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Fields.php":3082770791,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Number.php":2034541722,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1213338388,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":843457220,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":620903073,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Fields.php":1609685504,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Number.php":2034541722,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1213338388,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":843457220,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From 917fd1866d331c388f93bed5a495da718d971f2d Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 19 Aug 2022 17:35:56 +0200 Subject: [PATCH 060/132] added types --- src/Fields/Boolean.php | 6 +++--- src/Fields/Fields.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Fields/Boolean.php b/src/Fields/Boolean.php index de891c2..163236f 100644 --- a/src/Fields/Boolean.php +++ b/src/Fields/Boolean.php @@ -9,9 +9,9 @@ final class Boolean extends Field { public string $type = 'boolean'; - public $attributes = []; + public array $attributes = []; - public static function make(string $name, string $label, array $attributes = []) + public static function make(string $name, string $label, array $attributes = []): self { return new self($name, $label, $attributes); } @@ -22,7 +22,7 @@ public function __construct(string $name, string $label, array $attributes = []) $this->attributes = $attributes; } - public function toArray() + public function toArray(): array { $array = parent::toArray(); $array['attributes'] = $this->attributes; diff --git a/src/Fields/Fields.php b/src/Fields/Fields.php index d489ea2..e90a05c 100644 --- a/src/Fields/Fields.php +++ b/src/Fields/Fields.php @@ -47,7 +47,7 @@ public function get(): Collection return $this->fields; } - public function toArray(): Fluent + public function toArray(): Fluent // TODO { $class = new Fluent(); $class->offsetSet('data', $this->fields From bea7e181dd8ba0e5dae48c1f7806dbb12cad56d9 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 19 Aug 2022 15:36:30 +0000 Subject: [PATCH 061/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index c5d0028..8016a2f 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":620903073,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Fields.php":1609685504,"src\/Fields\/Boolean.php":1730865805,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Number.php":2034541722,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1213338388,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":843457220,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":620903073,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Fields.php":1495095600,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Number.php":2034541722,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1213338388,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":843457220,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From 11e0fb49f6bc27c5d9cbaa55cd6dae680876fc9d Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 19 Aug 2022 17:37:57 +0200 Subject: [PATCH 062/132] added types --- src/Contracts/Route.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Contracts/Route.php b/src/Contracts/Route.php index d76f574..fc93eb4 100644 --- a/src/Contracts/Route.php +++ b/src/Contracts/Route.php @@ -10,6 +10,10 @@ abstract class Route abstract public function __construct(string $name); + /** + * @param string $name + * @return static + */ public static function make(string $name) { return new static($name); @@ -20,7 +24,7 @@ public function getName(): string return $this->name; } - public function getType() + public function getType(): string { return strtolower(class_basename($this)); } From 97d7b958667ee6613efec25d98523b919cbfe9ff Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 19 Aug 2022 15:38:34 +0000 Subject: [PATCH 063/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 8016a2f..932fc34 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":620903073,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Fields.php":1495095600,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Number.php":2034541722,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/Route.php":341715827,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1213338388,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":843457220,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":620903073,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Fields.php":1495095600,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Number.php":2034541722,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1213338388,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":843457220,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From 7722ddc6ee78a2281967627e194ba6dc4b0865ce Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 19 Aug 2022 17:44:15 +0200 Subject: [PATCH 064/132] added types --- src/Contracts/Filter.php | 3 +++ src/Contracts/Renderer.php | 30 ++++++++++++++++++++++++++---- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/src/Contracts/Filter.php b/src/Contracts/Filter.php index 62340fc..8484357 100644 --- a/src/Contracts/Filter.php +++ b/src/Contracts/Filter.php @@ -120,6 +120,9 @@ public function getFilterMethods(): Collection return $this->filterMethods; } + /** + * @return mixed + */ private function getValue() { return app('request')->input("filters.{$this->getField()}"); diff --git a/src/Contracts/Renderer.php b/src/Contracts/Renderer.php index aa43817..c3bae74 100644 --- a/src/Contracts/Renderer.php +++ b/src/Contracts/Renderer.php @@ -13,12 +13,15 @@ abstract class Renderer implements Responsable { protected string $title = ''; protected string $action = ''; - protected $entity; /** * @var mixed */ + protected $entity; + /** + * @var mixed + */ protected $items; /** * @var mixed @@ -26,6 +29,10 @@ abstract class Renderer implements Responsable protected $resource; protected array $classes = []; protected ?Collection $components; + + /** + * @var mixed + */ protected $fields; protected ?Routes $routes = null; @@ -50,7 +57,7 @@ public function resource(string $resource): self return $this; } - public function with(array $array) + public function with(array $array): self { foreach ($array as $key => $value) { $this->{$key} = $value; @@ -59,7 +66,12 @@ public function with(array $array) return $this; } - public function classes($classes) + + /** + * @param mixed $classes + * @return $this + */ + public function classes($classes): self { if (is_string($classes)) { $classes = explode(' ', $classes); @@ -72,7 +84,7 @@ public function classes($classes) return $this; } - public function __call($name, array $arguments) + public function __call(string $name, array $arguments): self { if (method_exists($this, $name)) { return $this->{$name}(...$arguments); @@ -97,11 +109,17 @@ public function __call($name, array $arguments) } } + /** + * @return mixed + */ public function getEntity() { return $this->entity; } + /** + * @return mixed|string + */ protected function guessResource() { if ($this->resource) { @@ -123,6 +141,10 @@ protected function guessResource() return $this->resource; } + /** + * @param mixed ...$components + * @return $this + */ public function components(...$components) { foreach ($components as $i => $component) { From 5e2bdb8247539f0930fce6d5fd017164482fc9db Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 19 Aug 2022 15:44:42 +0000 Subject: [PATCH 065/132] Fix styling --- .php-cs-fixer.cache | 2 +- src/Contracts/Renderer.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 932fc34..8c7a871 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":620903073,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Fields.php":1495095600,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Number.php":2034541722,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":1002361455,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":2926764410,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1213338388,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":843457220,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":620903073,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Fields.php":1495095600,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Number.php":2034541722,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":2143273424,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":3381303110,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1213338388,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":843457220,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file diff --git a/src/Contracts/Renderer.php b/src/Contracts/Renderer.php index c3bae74..717b66e 100644 --- a/src/Contracts/Renderer.php +++ b/src/Contracts/Renderer.php @@ -66,7 +66,6 @@ public function with(array $array): self return $this; } - /** * @param mixed $classes * @return $this From 0e943d45bfa2b1eb4537f9cf8c26d206ac9e10ac Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 19 Aug 2022 17:45:01 +0200 Subject: [PATCH 066/132] phpstan level 6 => 7 --- phpstan.neon.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 0810ff4..15971da 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -2,7 +2,7 @@ includes: - ./vendor/nunomaduro/larastan/extension.neon parameters: - level: 6 + level: 7 paths: - src tmpDir: build/phpstan From 2ee3ca23c069c96d18af78d18491ae11151376cd Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 19 Aug 2022 17:54:48 +0200 Subject: [PATCH 067/132] foreach needs iterable --- src/Services/FilterService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Services/FilterService.php b/src/Services/FilterService.php index 0428698..bda5ee7 100644 --- a/src/Services/FilterService.php +++ b/src/Services/FilterService.php @@ -24,7 +24,7 @@ public function __invoke(Builder $builder, Filters $filters): Builder { $this->builder = $builder; $this->filters = $filters->get(); - $requestFilters = $this->request->query('filters', []); + $requestFilters = (array) $this->request->query('filters', []); foreach ($requestFilters as $field => $value) { $this->applyFilter($field, $value); } From 09833f9f62c278fa5a43d2335d00b0b0def9d861 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 19 Aug 2022 15:55:17 +0000 Subject: [PATCH 068/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 8c7a871..cc316ce 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":620903073,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Fields.php":1495095600,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Number.php":2034541722,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":2143273424,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":3381303110,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":495687234,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1213338388,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":843457220,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":620903073,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Fields.php":1495095600,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Number.php":2034541722,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":2143273424,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":3381303110,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":225186634,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1213338388,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":843457220,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From a21470919482bbb3c46e399ed93d74a132d6c486 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 26 Aug 2022 15:48:12 +0200 Subject: [PATCH 069/132] added TODO comment for hard to fix phpstan warnings --- src/Renderers/FormRenderer.php | 1 + src/Renderers/IndexRenderer.php | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Renderers/FormRenderer.php b/src/Renderers/FormRenderer.php index 4d90d37..9c9c10f 100644 --- a/src/Renderers/FormRenderer.php +++ b/src/Renderers/FormRenderer.php @@ -61,6 +61,7 @@ public static function render($entity = null): FormRenderer public function toResponse($request) { + // TODO: fix "Call to an undefined method Inertia\Response|Inertia\ResponseFactory::with()" return inertia('Bread::Form') ->with([ 'title' => $this->title, diff --git a/src/Renderers/IndexRenderer.php b/src/Renderers/IndexRenderer.php index 5406b76..b167248 100644 --- a/src/Renderers/IndexRenderer.php +++ b/src/Renderers/IndexRenderer.php @@ -38,6 +38,7 @@ public function items($items): self public function toResponse($request) { + // TODO : fix "Call to an undefined method Inertia\Response|Inertia\ResponseFactory::with()" return inertia('Bread::Index') ->with([ 'headers' => $this->headers->toArray(), From 97ae3e3e276ba6cae9ac01b0b8dcf40436f3cd39 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 26 Aug 2022 13:48:39 +0000 Subject: [PATCH 070/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index cc316ce..8d30e57 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.8","version":"3.9.5","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Components\/Components.php":2912041316,"src\/ValueObjects\/Types.php":976112391,"src\/Fields\/Image.php":620903073,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Fields.php":1495095600,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Number.php":2034541722,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/Filter.php":2143273424,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Renderer.php":3381303110,"src\/Services\/CreateCustomService.php":1704685833,"src\/Services\/FilterService.php":225186634,"src\/Services\/SortingService.php":3518762162,"src\/BreadServiceProvider.php":3682323247,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Update.php":4166386385,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Filter.php":1213338388,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Select.php":3820557334,"src\/Headers\/Date.php":791925921,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Headers.php":843457220,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Set.php":4116951602,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Label.php":2559479232,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Number.php":3468185039,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Renderers\/FormRenderer.php":1764004974,"src\/Renderers\/IndexRenderer.php":1366079229,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.9","version":"3.10.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":225186634,"src\/Services\/SortingService.php":3518762162,"src\/Services\/CreateCustomService.php":1704685833,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":3381303110,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Renderers\/IndexRenderer.php":3348542141,"src\/Renderers\/FormRenderer.php":3767326447,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":1495095600,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":843457220,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":2912041316,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From e6b5964ee61a19660c9f6c49b518a343ad897594 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 26 Aug 2022 15:48:26 +0200 Subject: [PATCH 071/132] cast to bool --- src/Services/CreateCustomService.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Services/CreateCustomService.php b/src/Services/CreateCustomService.php index 7a9359c..fed097b 100644 --- a/src/Services/CreateCustomService.php +++ b/src/Services/CreateCustomService.php @@ -10,10 +10,11 @@ class CreateCustomService { public static function isNameValid(string $name): bool { - return preg_match( + $isValid = preg_match( '/^[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*$/', $name ); + return (bool) $isValid; } public static function transformName(string $name): string From 60419181f1963ec64b2025a210d79d2168444fdc Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 26 Aug 2022 13:58:27 +0000 Subject: [PATCH 072/132] Fix styling --- .php-cs-fixer.cache | 2 +- src/Services/CreateCustomService.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 8d30e57..6461e8f 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.9","version":"3.10.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":225186634,"src\/Services\/SortingService.php":3518762162,"src\/Services\/CreateCustomService.php":1704685833,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":3381303110,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Renderers\/IndexRenderer.php":3348542141,"src\/Renderers\/FormRenderer.php":3767326447,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":1495095600,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":843457220,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":2912041316,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.9","version":"3.10.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":225186634,"src\/Services\/SortingService.php":3518762162,"src\/Services\/CreateCustomService.php":266108012,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":3381303110,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Renderers\/IndexRenderer.php":3348542141,"src\/Renderers\/FormRenderer.php":3767326447,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":1495095600,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":843457220,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":2912041316,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file diff --git a/src/Services/CreateCustomService.php b/src/Services/CreateCustomService.php index fed097b..f94ed41 100644 --- a/src/Services/CreateCustomService.php +++ b/src/Services/CreateCustomService.php @@ -14,6 +14,7 @@ public static function isNameValid(string $name): bool '/^[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*$/', $name ); + return (bool) $isValid; } From df25392e3d40ef8d3344798e8dc5f84e47d676fe Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 26 Aug 2022 16:15:00 +0200 Subject: [PATCH 073/132] fixed : Part $name (array|bool|string) of encapsed string cannot be cast to string --- src/Commands/CreateCustomField.php | 3 ++- src/Commands/CreateCustomFilter.php | 3 ++- src/Commands/CreateCustomHeader.php | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Commands/CreateCustomField.php b/src/Commands/CreateCustomField.php index 38aa273..6d021ec 100644 --- a/src/Commands/CreateCustomField.php +++ b/src/Commands/CreateCustomField.php @@ -17,7 +17,8 @@ public function handle(): int $name = $this->argument('name'); if (! CreateCustomService::isNameValid($name)) { - $this->error("Name: '$name' is not valid"); + $displayName = is_string($name) ? $name : ""; + $this->error("Name: '$displayName' is not valid"); return 0; } diff --git a/src/Commands/CreateCustomFilter.php b/src/Commands/CreateCustomFilter.php index f7e7494..50b04fb 100644 --- a/src/Commands/CreateCustomFilter.php +++ b/src/Commands/CreateCustomFilter.php @@ -17,7 +17,8 @@ public function handle(): int $name = $this->argument('name'); if (! CreateCustomService::isNameValid($name)) { - $this->error("Name: '$name' is not valid"); + $displayName = is_string($name) ? $name : ""; + $this->error("Name: '$displayName' is not valid"); return 0; } diff --git a/src/Commands/CreateCustomHeader.php b/src/Commands/CreateCustomHeader.php index fc4d3f3..2a29074 100644 --- a/src/Commands/CreateCustomHeader.php +++ b/src/Commands/CreateCustomHeader.php @@ -17,7 +17,8 @@ public function handle(): int $name = $this->argument('name'); if (! CreateCustomService::isNameValid($name)) { - $this->error("Name: '$name' is not valid"); + $displayName = is_string($name) ? $name : ""; + $this->error("Name: '$displayName' is not valid"); return 0; } From f748be4f47989bdf5edc221f4928e70564cffa3f Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 26 Aug 2022 16:15:18 +0200 Subject: [PATCH 074/132] fixed mixed return types --- src/Renderers/FormRenderer.php | 2 +- src/Services/CreateCustomService.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Renderers/FormRenderer.php b/src/Renderers/FormRenderer.php index 9c9c10f..bd8bea3 100644 --- a/src/Renderers/FormRenderer.php +++ b/src/Renderers/FormRenderer.php @@ -82,7 +82,7 @@ public function getClasses(): array return $this->classes; } - protected function guessResource(): string + protected function guessResource() { if ($this->resource) { return $this->resource; diff --git a/src/Services/CreateCustomService.php b/src/Services/CreateCustomService.php index f94ed41..a60215c 100644 --- a/src/Services/CreateCustomService.php +++ b/src/Services/CreateCustomService.php @@ -8,7 +8,7 @@ class CreateCustomService { - public static function isNameValid(string $name): bool + public static function isNameValid($name): bool { $isValid = preg_match( '/^[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*$/', @@ -18,7 +18,7 @@ public static function isNameValid(string $name): bool return (bool) $isValid; } - public static function transformName(string $name): string + public static function transformName($name): string { return Str::ucfirst(Str::camel($name)); } From 7b5c10cdb9b551ad6694539bb08e54a3e19dc275 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 26 Aug 2022 14:15:45 +0000 Subject: [PATCH 075/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 6461e8f..c9558d3 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.9","version":"3.10.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":225186634,"src\/Services\/SortingService.php":3518762162,"src\/Services\/CreateCustomService.php":266108012,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":3381303110,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":2772280546,"src\/Commands\/CreateCustomHeader.php":1362670939,"src\/Commands\/CreateCustomField.php":1830559918,"src\/Renderers\/IndexRenderer.php":3348542141,"src\/Renderers\/FormRenderer.php":3767326447,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":1495095600,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":843457220,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":2912041316,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.9","version":"3.10.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":225186634,"src\/Services\/SortingService.php":3518762162,"src\/Services\/CreateCustomService.php":2706448306,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":3381303110,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":3772025842,"src\/Commands\/CreateCustomHeader.php":2889374259,"src\/Commands\/CreateCustomField.php":951501162,"src\/Renderers\/IndexRenderer.php":3348542141,"src\/Renderers\/FormRenderer.php":3069102293,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":1495095600,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":843457220,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":2912041316,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From ddce1dcbb7ba543e585d21bf8135cd4929a8135f Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 26 Aug 2022 16:21:37 +0200 Subject: [PATCH 076/132] fixed argument params types --- src/Services/CreateCustomService.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Services/CreateCustomService.php b/src/Services/CreateCustomService.php index a60215c..3d66abb 100644 --- a/src/Services/CreateCustomService.php +++ b/src/Services/CreateCustomService.php @@ -8,6 +8,10 @@ class CreateCustomService { + /** + * @param mixed $name + * @return bool + */ public static function isNameValid($name): bool { $isValid = preg_match( @@ -18,6 +22,10 @@ public static function isNameValid($name): bool return (bool) $isValid; } + /** + * @param mixed $name + * @return string + */ public static function transformName($name): string { return Str::ucfirst(Str::camel($name)); From c77646aa41e58a87fffdc07723ed0a6b1393a68e Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 26 Aug 2022 14:22:03 +0000 Subject: [PATCH 077/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index c9558d3..7b38684 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.9","version":"3.10.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":225186634,"src\/Services\/SortingService.php":3518762162,"src\/Services\/CreateCustomService.php":2706448306,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":3381303110,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":3772025842,"src\/Commands\/CreateCustomHeader.php":2889374259,"src\/Commands\/CreateCustomField.php":951501162,"src\/Renderers\/IndexRenderer.php":3348542141,"src\/Renderers\/FormRenderer.php":3069102293,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":1495095600,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":843457220,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":2912041316,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.9","version":"3.10.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":225186634,"src\/Services\/SortingService.php":3518762162,"src\/Services\/CreateCustomService.php":1854673319,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":3381303110,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":3772025842,"src\/Commands\/CreateCustomHeader.php":2889374259,"src\/Commands\/CreateCustomField.php":951501162,"src\/Renderers\/IndexRenderer.php":3348542141,"src\/Renderers\/FormRenderer.php":3069102293,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":1495095600,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":843457220,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":2912041316,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From 612a0d39b92d142ae70404119011a23a8470f594 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 26 Aug 2022 16:26:09 +0200 Subject: [PATCH 078/132] ignoring 2 phpstan level 7 warnings that are hard to fix --- src/Renderers/FormRenderer.php | 2 ++ src/Renderers/IndexRenderer.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/Renderers/FormRenderer.php b/src/Renderers/FormRenderer.php index bd8bea3..1cc7cb4 100644 --- a/src/Renderers/FormRenderer.php +++ b/src/Renderers/FormRenderer.php @@ -62,6 +62,8 @@ public static function render($entity = null): FormRenderer public function toResponse($request) { // TODO: fix "Call to an undefined method Inertia\Response|Inertia\ResponseFactory::with()" + // temporarily just ignoring phpstan for this line: + /** @phpstan-ignore-next-line */ return inertia('Bread::Form') ->with([ 'title' => $this->title, diff --git a/src/Renderers/IndexRenderer.php b/src/Renderers/IndexRenderer.php index b167248..7886979 100644 --- a/src/Renderers/IndexRenderer.php +++ b/src/Renderers/IndexRenderer.php @@ -39,6 +39,8 @@ public function items($items): self public function toResponse($request) { // TODO : fix "Call to an undefined method Inertia\Response|Inertia\ResponseFactory::with()" + // temporarily just ignoring phpstan for this line: + /** @phpstan-ignore-next-line */ return inertia('Bread::Index') ->with([ 'headers' => $this->headers->toArray(), From 51030cbae682287443a0dd9885f34bc4b08bba38 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 26 Aug 2022 14:26:45 +0000 Subject: [PATCH 079/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 7b38684..f9cb9ed 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.9","version":"3.10.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":225186634,"src\/Services\/SortingService.php":3518762162,"src\/Services\/CreateCustomService.php":1854673319,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":3381303110,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":3772025842,"src\/Commands\/CreateCustomHeader.php":2889374259,"src\/Commands\/CreateCustomField.php":951501162,"src\/Renderers\/IndexRenderer.php":3348542141,"src\/Renderers\/FormRenderer.php":3069102293,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":1495095600,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":843457220,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":2912041316,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.9","version":"3.10.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":225186634,"src\/Services\/SortingService.php":3518762162,"src\/Services\/CreateCustomService.php":1854673319,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":3381303110,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":3772025842,"src\/Commands\/CreateCustomHeader.php":2889374259,"src\/Commands\/CreateCustomField.php":951501162,"src\/Renderers\/IndexRenderer.php":3806723113,"src\/Renderers\/FormRenderer.php":3330028036,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":1495095600,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":843457220,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":2912041316,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From aaad2a3f471690e298722826c830802d2e8867e1 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 26 Aug 2022 16:49:07 +0200 Subject: [PATCH 080/132] Cannot use array destructuring on array|null. --- src/Services/CreateCustomService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Services/CreateCustomService.php b/src/Services/CreateCustomService.php index 3d66abb..3afdccb 100644 --- a/src/Services/CreateCustomService.php +++ b/src/Services/CreateCustomService.php @@ -33,7 +33,7 @@ public static function transformName($name): string public static function copyFiles(string $name, int $type): array { - [$pathPhp, $pathVue] = Types::getPaths($type); + [$pathPhp, $pathVue] = Types::getPaths($type) ?? [] ; [$stubPhp, $stubVue] = Types::getStubs($type); self::copyStub($pathPhp, $stubPhp, $name, 'php'); From ab5142f05aa1764fd60b0a979d9ba7f05e99ffac Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 26 Aug 2022 16:58:40 +0200 Subject: [PATCH 081/132] check for null --- src/Contracts/Renderer.php | 10 ++++++---- src/Renderers/IndexRenderer.php | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Contracts/Renderer.php b/src/Contracts/Renderer.php index 717b66e..eb81d4a 100644 --- a/src/Contracts/Renderer.php +++ b/src/Contracts/Renderer.php @@ -128,7 +128,7 @@ protected function guessResource() $first = $this->items->first(); if ($first === null && $this->items instanceof LengthAwarePaginator) { - $path = explode('/', $this->items->path()); + $path = ($this->items->path()) ? explode('/', $this->items->path()) : []; $this->resource = $path[count($path) - 1]; } @@ -150,7 +150,9 @@ public function components(...$components) $class = new $component(); $methods = get_class_methods($class); foreach ($methods as $methodKey => $method) { - $this->components->put($method, $class->{$method}()); + if($this->components){ + $this->components->put($method, $class->{$method}()); + } } } @@ -159,12 +161,12 @@ public function components(...$components) public function getComponents(): array { - return $this->components->map(function ($components) { + return $this->components ? $this->components->map(function ($components) { if ($components === null) { return $components; } return $components->toArray(); - })->toArray(); + })->toArray() : []; } } diff --git a/src/Renderers/IndexRenderer.php b/src/Renderers/IndexRenderer.php index 7886979..fcd042d 100644 --- a/src/Renderers/IndexRenderer.php +++ b/src/Renderers/IndexRenderer.php @@ -43,7 +43,7 @@ public function toResponse($request) /** @phpstan-ignore-next-line */ return inertia('Bread::Index') ->with([ - 'headers' => $this->headers->toArray(), + 'headers' => $this->headers ? $this->headers->toArray() : [], 'filters' => optional($this->filters)->toArray() ?? [], 'actions' => $this->actions, 'items' => $this->items, From e32c3f1ad0bc7614f8011f5e3dd1014541fa4f8a Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 26 Aug 2022 15:02:21 +0000 Subject: [PATCH 082/132] Fix styling --- .php-cs-fixer.cache | 2 +- src/Contracts/Renderer.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index f9cb9ed..2ea999a 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.9","version":"3.10.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":225186634,"src\/Services\/SortingService.php":3518762162,"src\/Services\/CreateCustomService.php":1854673319,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":3381303110,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":3772025842,"src\/Commands\/CreateCustomHeader.php":2889374259,"src\/Commands\/CreateCustomField.php":951501162,"src\/Renderers\/IndexRenderer.php":3806723113,"src\/Renderers\/FormRenderer.php":3330028036,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":1495095600,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":843457220,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":2912041316,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.9","version":"3.10.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":225186634,"src\/Services\/SortingService.php":3518762162,"src\/Services\/CreateCustomService.php":1651437460,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":328165244,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":3772025842,"src\/Commands\/CreateCustomHeader.php":2889374259,"src\/Commands\/CreateCustomField.php":951501162,"src\/Renderers\/IndexRenderer.php":2412538807,"src\/Renderers\/FormRenderer.php":3330028036,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":1495095600,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":843457220,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":2912041316,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file diff --git a/src/Contracts/Renderer.php b/src/Contracts/Renderer.php index eb81d4a..b42fbe6 100644 --- a/src/Contracts/Renderer.php +++ b/src/Contracts/Renderer.php @@ -150,7 +150,7 @@ public function components(...$components) $class = new $component(); $methods = get_class_methods($class); foreach ($methods as $methodKey => $method) { - if($this->components){ + if ($this->components) { $this->components->put($method, $class->{$method}()); } } From cbe551e6956bb76f2f199b82e4bed84703b18520 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 26 Aug 2022 17:49:46 +0200 Subject: [PATCH 083/132] config for phstan level 9 --- phpstan.neon.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 15971da..1f25c2a 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -2,7 +2,7 @@ includes: - ./vendor/nunomaduro/larastan/extension.neon parameters: - level: 7 + level: 9 paths: - src tmpDir: build/phpstan From de8ec99a87dfeb3d3fb3ec4f2e7ce2a7182d3193 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 26 Aug 2022 17:59:46 +0200 Subject: [PATCH 084/132] check if var is mixed --- src/Services/SortingService.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Services/SortingService.php b/src/Services/SortingService.php index 543da22..a958415 100644 --- a/src/Services/SortingService.php +++ b/src/Services/SortingService.php @@ -25,9 +25,13 @@ public function __construct(Request $request) public function __invoke(Builder $builder, $defaultColumn, string $defaultDirection): Builder { if ($request = $this->request->get('sort')) { - $builder->orderBy($request['column'], $request['direction']); + if(is_array($request)){ + $builder->orderBy($request['column'], $request['direction']); + } } else { - $builder->orderBy($defaultColumn, $defaultDirection); + if(is_string($defaultColumn) && is_string($defaultDirection)){ + $builder->orderBy($defaultColumn, $defaultDirection); + } } return $builder; From 847e32f768d6dc19f16d8e223c67c7c57af126ab Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 26 Aug 2022 16:00:10 +0000 Subject: [PATCH 085/132] Fix styling --- .php-cs-fixer.cache | 2 +- src/Services/SortingService.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 2ea999a..a6d1270 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.9","version":"3.10.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":225186634,"src\/Services\/SortingService.php":3518762162,"src\/Services\/CreateCustomService.php":1651437460,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":328165244,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":3772025842,"src\/Commands\/CreateCustomHeader.php":2889374259,"src\/Commands\/CreateCustomField.php":951501162,"src\/Renderers\/IndexRenderer.php":2412538807,"src\/Renderers\/FormRenderer.php":3330028036,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":1495095600,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":843457220,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":2912041316,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.9","version":"3.10.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":225186634,"src\/Services\/SortingService.php":570185584,"src\/Services\/CreateCustomService.php":1651437460,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":328165244,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":3772025842,"src\/Commands\/CreateCustomHeader.php":2889374259,"src\/Commands\/CreateCustomField.php":951501162,"src\/Renderers\/IndexRenderer.php":2412538807,"src\/Renderers\/FormRenderer.php":3330028036,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":1495095600,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":843457220,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":2912041316,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file diff --git a/src/Services/SortingService.php b/src/Services/SortingService.php index a958415..fa59dca 100644 --- a/src/Services/SortingService.php +++ b/src/Services/SortingService.php @@ -25,11 +25,11 @@ public function __construct(Request $request) public function __invoke(Builder $builder, $defaultColumn, string $defaultDirection): Builder { if ($request = $this->request->get('sort')) { - if(is_array($request)){ + if (is_array($request)) { $builder->orderBy($request['column'], $request['direction']); } } else { - if(is_string($defaultColumn) && is_string($defaultDirection)){ + if (is_string($defaultColumn) && is_string($defaultDirection)) { $builder->orderBy($defaultColumn, $defaultDirection); } } From d3bc0a5ec4e2ec7864a8d0f56e72cc62ea1edc6f Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 2 Sep 2022 15:57:26 +0200 Subject: [PATCH 086/132] phpstan level 9 --- src/Components/Components.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Components/Components.php b/src/Components/Components.php index b040613..0fc13c0 100644 --- a/src/Components/Components.php +++ b/src/Components/Components.php @@ -39,8 +39,12 @@ public function get(): Collection return $this->components; } + // TODO : fix phpstan errors with this ? + // https://stackoverflow.com/questions/66282988/how-to-get-phpstan-to-infer-the-type-for-my-laravel-collection-pipeline public function toArray(): array { + // TODO + /** @phpstan-ignore-next-line */ return $this->components->map(function (Component $component) { return $component->toArray(); })->toArray(); From aae96948ccd5d9dd6d79a7bce011ad2959aefc6f Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 2 Sep 2022 15:57:35 +0200 Subject: [PATCH 087/132] phpstan level 9 --- src/Contracts/Renderer.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/Contracts/Renderer.php b/src/Contracts/Renderer.php index b42fbe6..f9d37b3 100644 --- a/src/Contracts/Renderer.php +++ b/src/Contracts/Renderer.php @@ -76,8 +76,10 @@ public function classes($classes): self $classes = explode(' ', $classes); } - foreach ($classes as $class) { - $this->classes[] = $class; + if (is_iterable($classes)) { + foreach ($classes as $class) { + $this->classes[] = $class; + } } return $this; @@ -93,7 +95,7 @@ public function __call(string $name, array $arguments): self $class = $arguments[0]; if (is_string($class)) { $class = app()->make($arguments[0]); - if (! $class instanceof Invokables) { + if (!$class instanceof Invokables) { throw new \Exception('Class must implement Invokables.'); } $this->$name = $class($this); @@ -125,6 +127,8 @@ protected function guessResource() return $this->resource; } + // TODO + /** @phpstan-ignore-next-line */ $first = $this->items->first(); if ($first === null && $this->items instanceof LengthAwarePaginator) { @@ -166,7 +170,9 @@ public function getComponents(): array return $components; } - return $components->toArray(); + // TODO: check by Johan if this is ok (code change for phpstan level 9) + return $components; +// return $components->toArray(); })->toArray() : []; } } From 8d1da33dc5877f7f67abf04a2c027dd74412fae5 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 2 Sep 2022 15:57:43 +0200 Subject: [PATCH 088/132] phpstan level 9 --- src/Fields/Fields.php | 10 +++++++++- src/Fields/Tab.php | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/Fields/Fields.php b/src/Fields/Fields.php index e90a05c..a18f9ec 100644 --- a/src/Fields/Fields.php +++ b/src/Fields/Fields.php @@ -6,9 +6,14 @@ use Illuminate\Support\Collection; use Illuminate\Support\Fluent; +use Libaro\Bread\Contracts\Field; class Fields { + + /** + * @var Collection + */ private Collection $fields; public function __construct() @@ -51,7 +56,10 @@ public function toArray(): Fluent // TODO { $class = new Fluent(); $class->offsetSet('data', $this->fields - ->map(function ($field) { + // TODO + /** @phpstan-ignore-next-line */ + ->map(function (Field $field) { +// \PHPStan\dumpType($field); return $field->toArray(); }) ->toArray()); diff --git a/src/Fields/Tab.php b/src/Fields/Tab.php index b3743f0..854cc27 100644 --- a/src/Fields/Tab.php +++ b/src/Fields/Tab.php @@ -50,6 +50,9 @@ public function toArray() { $array = parent::toArray(); $array['title'] = $this->title; + + // TODO + /** @phpstan-ignore-next-line */ $array['fields'] = $this->fields->map(function (Field $field) { return $field->toArray(); })->toArray(); From 92b7197adc01d4e3665412527c7c12620f55cd00 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 2 Sep 2022 13:58:10 +0000 Subject: [PATCH 089/132] Fix styling --- .php-cs-fixer.cache | 2 +- src/Contracts/Renderer.php | 2 +- src/Fields/Fields.php | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index a6d1270..44c664d 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.9","version":"3.10.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":225186634,"src\/Services\/SortingService.php":570185584,"src\/Services\/CreateCustomService.php":1651437460,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":328165244,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":3772025842,"src\/Commands\/CreateCustomHeader.php":2889374259,"src\/Commands\/CreateCustomField.php":951501162,"src\/Renderers\/IndexRenderer.php":2412538807,"src\/Renderers\/FormRenderer.php":3330028036,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":1495095600,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":3679075721,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":843457220,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":2912041316,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.9","version":"3.10.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":225186634,"src\/Services\/SortingService.php":570185584,"src\/Services\/CreateCustomService.php":1651437460,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":1560041470,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":3772025842,"src\/Commands\/CreateCustomHeader.php":2889374259,"src\/Commands\/CreateCustomField.php":951501162,"src\/Renderers\/IndexRenderer.php":2412538807,"src\/Renderers\/FormRenderer.php":3330028036,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":1332854718,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":4231807031,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":843457220,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":251782310,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file diff --git a/src/Contracts/Renderer.php b/src/Contracts/Renderer.php index f9d37b3..a3c525f 100644 --- a/src/Contracts/Renderer.php +++ b/src/Contracts/Renderer.php @@ -95,7 +95,7 @@ public function __call(string $name, array $arguments): self $class = $arguments[0]; if (is_string($class)) { $class = app()->make($arguments[0]); - if (!$class instanceof Invokables) { + if (! $class instanceof Invokables) { throw new \Exception('Class must implement Invokables.'); } $this->$name = $class($this); diff --git a/src/Fields/Fields.php b/src/Fields/Fields.php index a18f9ec..e1d8022 100644 --- a/src/Fields/Fields.php +++ b/src/Fields/Fields.php @@ -10,7 +10,6 @@ class Fields { - /** * @var Collection */ From 96ac6cc21af924b1bb780e3be055456ecd9f4390 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 2 Sep 2022 16:03:59 +0200 Subject: [PATCH 090/132] phpstan level 9 --- src/Fields/Tabs.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Fields/Tabs.php b/src/Fields/Tabs.php index 1c3aeb2..0d2b3dd 100644 --- a/src/Fields/Tabs.php +++ b/src/Fields/Tabs.php @@ -10,6 +10,9 @@ final class Tabs extends Field { public string $type = 'tabs'; + /** + * @var Collection + */ public Collection $tabs; public function __construct() @@ -18,7 +21,7 @@ public function __construct() } /** - * @param mixed ...$tabs + * @param Tab ...$tabs * @return Tabs */ public static function add(...$tabs): Tabs From ee6a6b6dfe0ef1448b4c9d5d3ae66256df0e929e Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 2 Sep 2022 16:09:04 +0200 Subject: [PATCH 091/132] phpstan level 9 --- src/Fields/Tabs.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Fields/Tabs.php b/src/Fields/Tabs.php index 0d2b3dd..6d534ca 100644 --- a/src/Fields/Tabs.php +++ b/src/Fields/Tabs.php @@ -49,6 +49,8 @@ public function toArray(): array { $array = parent::toArray(); $array['tabs'] = $this->tabs + // TODO + /** @phpstan-ignore-next-line */ ->map(function (Field $tab) { return $tab->toArray(); }) From 6083070ab9f3fe4c63a3a44373d3990cd27c9fa8 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 2 Sep 2022 16:09:11 +0200 Subject: [PATCH 092/132] phpstan level 9 --- src/Filters/Filters.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Filters/Filters.php b/src/Filters/Filters.php index 7bbee68..77dbdf8 100644 --- a/src/Filters/Filters.php +++ b/src/Filters/Filters.php @@ -16,7 +16,7 @@ public function __construct() } /** - * @param mixed ...$filters + * @param Filter ...$filters * @return Filters */ public static function add(...$filters): Filters @@ -46,6 +46,8 @@ public function toArray(): stdClass // TODO { $class = new stdClass(); $class->data = $this->filters + // TODO + /** @phpstan-ignore-next-line */ ->map(function (Filter $filter) { return $filter->toArray(); }) From fe44a46e33b87ce29cfbcf2e34c94a8aa323070f Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 2 Sep 2022 16:09:17 +0200 Subject: [PATCH 093/132] phpstan level 9 --- src/Filters/Text.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Filters/Text.php b/src/Filters/Text.php index 1b3c7e2..967e814 100644 --- a/src/Filters/Text.php +++ b/src/Filters/Text.php @@ -22,11 +22,15 @@ public static function make(string $label, string $field): Text /** * @param Builder $builder - * @param mixed $value + * @param string $value * @return Builder */ public function apply(Builder $builder, $value): Builder { - return $builder->where($this->getField(), $this->getOperator(), "%$value%"); +// \PHPStan\dumpType($value); + + + return $builder + ->where($this->getField(), $this->getOperator(), "%$value%"); } } From 5933de8df94286a1b2594e76eec118c36952eb53 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 2 Sep 2022 16:09:24 +0200 Subject: [PATCH 094/132] phpstan level 9 --- src/Headers/Headers.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Headers/Headers.php b/src/Headers/Headers.php index 498a4f8..a53cf93 100644 --- a/src/Headers/Headers.php +++ b/src/Headers/Headers.php @@ -18,7 +18,7 @@ public function __construct() } /** - * @param mixed ...$headers + * @param Header ...$headers * @return Headers */ public static function add(...$headers): Headers From c9f87e234ce64eb3932511baef47983ea777f717 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 2 Sep 2022 14:09:51 +0000 Subject: [PATCH 095/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 44c664d..4900584 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.9","version":"3.10.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":225186634,"src\/Services\/SortingService.php":570185584,"src\/Services\/CreateCustomService.php":1651437460,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":1560041470,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":995231948,"src\/Filters\/Text.php":3186702824,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":3772025842,"src\/Commands\/CreateCustomHeader.php":2889374259,"src\/Commands\/CreateCustomField.php":951501162,"src\/Renderers\/IndexRenderer.php":2412538807,"src\/Renderers\/FormRenderer.php":3330028036,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":1332854718,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":4231807031,"src\/Fields\/Tabs.php":1147516973,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":843457220,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":251782310,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.9","version":"3.10.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":225186634,"src\/Services\/SortingService.php":570185584,"src\/Services\/CreateCustomService.php":1651437460,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":1560041470,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":3704717280,"src\/Filters\/Text.php":1721742153,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":3772025842,"src\/Commands\/CreateCustomHeader.php":2889374259,"src\/Commands\/CreateCustomField.php":951501162,"src\/Renderers\/IndexRenderer.php":2412538807,"src\/Renderers\/FormRenderer.php":3330028036,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":1332854718,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":4231807031,"src\/Fields\/Tabs.php":1798477685,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":822629233,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":251782310,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From 82c1cadbbf53736d825360a12133fc2bb0ade69d Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 2 Sep 2022 16:11:21 +0200 Subject: [PATCH 096/132] phpstan level 9 --- src/Headers/Headers.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Headers/Headers.php b/src/Headers/Headers.php index a53cf93..89bde22 100644 --- a/src/Headers/Headers.php +++ b/src/Headers/Headers.php @@ -48,6 +48,8 @@ public function toArray(): Fluent // TODO { $class = new Fluent(); $class->offsetSet('data', $this->headers + // TODO + /** @phpstan-ignore-next-line */ ->map(function (Header $header) { return $header->toArray(); }) From cc05d15c24cf730ce6cbe248c2af1bb28b5eedc9 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 2 Sep 2022 16:11:57 +0200 Subject: [PATCH 097/132] phpstan level 9 return type of optional is mixed, but optional is in helper file out of our reach, so we can not change the return type of optional --- src/Renderers/FormRenderer.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Renderers/FormRenderer.php b/src/Renderers/FormRenderer.php index 1cc7cb4..ede9647 100644 --- a/src/Renderers/FormRenderer.php +++ b/src/Renderers/FormRenderer.php @@ -68,9 +68,13 @@ public function toResponse($request) ->with([ 'title' => $this->title, 'entity' => $this->entity, + // TODO + /** @phpstan-ignore-next-line */ 'fields' => optional($this->fields)->toArray() ?? [], 'action' => $this->action, 'method' => $this->getMethod(), + // TODO + /** @phpstan-ignore-next-line */ 'routes' => optional($this->routes)->toArray() ?? [], 'resource' => $this->guessResource(), 'classes' => $this->getClasses(), From 5128964d2245662b168918f02eb2ca8b8053f0e9 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 2 Sep 2022 16:12:05 +0200 Subject: [PATCH 098/132] phpstan level 9 --- src/Renderers/IndexRenderer.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Renderers/IndexRenderer.php b/src/Renderers/IndexRenderer.php index fcd042d..e510c78 100644 --- a/src/Renderers/IndexRenderer.php +++ b/src/Renderers/IndexRenderer.php @@ -44,10 +44,14 @@ public function toResponse($request) return inertia('Bread::Index') ->with([ 'headers' => $this->headers ? $this->headers->toArray() : [], + // TODO + /** @phpstan-ignore-next-line */ 'filters' => optional($this->filters)->toArray() ?? [], 'actions' => $this->actions, 'items' => $this->items, 'title' => $this->title, + // TODO + /** @phpstan-ignore-next-line */ 'routes' => optional($this->routes)->toArray() ?? [], 'resource' => $this->guessResource(), 'deleteMessage' => $this->deleteMessage, From 32517bf3e9f8dfb5728fae858e0c18698afb04bb Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 2 Sep 2022 14:12:59 +0000 Subject: [PATCH 099/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 4900584..a3d6cab 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.9","version":"3.10.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":225186634,"src\/Services\/SortingService.php":570185584,"src\/Services\/CreateCustomService.php":1651437460,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":1560041470,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":3704717280,"src\/Filters\/Text.php":1721742153,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":3772025842,"src\/Commands\/CreateCustomHeader.php":2889374259,"src\/Commands\/CreateCustomField.php":951501162,"src\/Renderers\/IndexRenderer.php":2412538807,"src\/Renderers\/FormRenderer.php":3330028036,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":1332854718,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":4231807031,"src\/Fields\/Tabs.php":1798477685,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":822629233,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":251782310,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.9","version":"3.10.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":225186634,"src\/Services\/SortingService.php":570185584,"src\/Services\/CreateCustomService.php":1651437460,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":1560041470,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":3704717280,"src\/Filters\/Text.php":1721742153,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":3772025842,"src\/Commands\/CreateCustomHeader.php":2889374259,"src\/Commands\/CreateCustomField.php":951501162,"src\/Renderers\/IndexRenderer.php":818203592,"src\/Renderers\/FormRenderer.php":677792611,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":1332854718,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":4231807031,"src\/Fields\/Tabs.php":1798477685,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":1103181937,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":251782310,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From 14b1a79583c64c518b8cce4367c8da5726ae3198 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 2 Sep 2022 16:48:09 +0200 Subject: [PATCH 100/132] phpstan level 9 --- src/Routes/Routes.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Routes/Routes.php b/src/Routes/Routes.php index 1ba8cca..c1d7e7e 100644 --- a/src/Routes/Routes.php +++ b/src/Routes/Routes.php @@ -41,6 +41,8 @@ public function get(): Collection public function toArray(): array { + // TODO + /** @phpstan-ignore-next-line */ return $this->routes->mapWithKeys(function (Route $route) { return [ $route->getType() => $route->toArray(), From 7ec39b87ec96f464f6d1db753a5b70a08b394b60 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 2 Sep 2022 16:48:33 +0200 Subject: [PATCH 101/132] phpstan level 9 --- src/Commands/CreateCustomField.php | 4 ++-- src/Services/CreateCustomService.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Commands/CreateCustomField.php b/src/Commands/CreateCustomField.php index 6d021ec..e315575 100644 --- a/src/Commands/CreateCustomField.php +++ b/src/Commands/CreateCustomField.php @@ -15,10 +15,10 @@ class CreateCustomField extends Command public function handle(): int { $name = $this->argument('name'); + $name = is_string($name) ? $name : ''; if (! CreateCustomService::isNameValid($name)) { - $displayName = is_string($name) ? $name : ""; - $this->error("Name: '$displayName' is not valid"); + $this->error("Name: '$name' is not valid"); return 0; } diff --git a/src/Services/CreateCustomService.php b/src/Services/CreateCustomService.php index 3afdccb..d595f0c 100644 --- a/src/Services/CreateCustomService.php +++ b/src/Services/CreateCustomService.php @@ -9,7 +9,7 @@ class CreateCustomService { /** - * @param mixed $name + * @param string $name * @return bool */ public static function isNameValid($name): bool From a89dd090dac93e4c6b11b6d96f7ec4dad335cf96 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 2 Sep 2022 16:50:34 +0200 Subject: [PATCH 102/132] phpstan level 9 --- src/Commands/CreateCustomFilter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Commands/CreateCustomFilter.php b/src/Commands/CreateCustomFilter.php index 50b04fb..850edce 100644 --- a/src/Commands/CreateCustomFilter.php +++ b/src/Commands/CreateCustomFilter.php @@ -15,10 +15,10 @@ class CreateCustomFilter extends Command public function handle(): int { $name = $this->argument('name'); + $name = is_string($name) ? $name : ''; if (! CreateCustomService::isNameValid($name)) { - $displayName = is_string($name) ? $name : ""; - $this->error("Name: '$displayName' is not valid"); + $this->error("Name: '$name' is not valid"); return 0; } From 583afd8558181e23e019346ee7ab27779ceb1fee Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 2 Sep 2022 14:51:02 +0000 Subject: [PATCH 103/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index a3d6cab..16de237 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.9","version":"3.10.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":225186634,"src\/Services\/SortingService.php":570185584,"src\/Services\/CreateCustomService.php":1651437460,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":1560041470,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":1589338573,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":3704717280,"src\/Filters\/Text.php":1721742153,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":3772025842,"src\/Commands\/CreateCustomHeader.php":2889374259,"src\/Commands\/CreateCustomField.php":951501162,"src\/Renderers\/IndexRenderer.php":818203592,"src\/Renderers\/FormRenderer.php":677792611,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":1332854718,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":4231807031,"src\/Fields\/Tabs.php":1798477685,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":1103181937,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":251782310,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.9","version":"3.10.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":225186634,"src\/Services\/SortingService.php":570185584,"src\/Services\/CreateCustomService.php":4286936727,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":1560041470,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":2202500581,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":3704717280,"src\/Filters\/Text.php":1721742153,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":1671250702,"src\/Commands\/CreateCustomHeader.php":2889374259,"src\/Commands\/CreateCustomField.php":4000417138,"src\/Renderers\/IndexRenderer.php":818203592,"src\/Renderers\/FormRenderer.php":677792611,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":1332854718,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":4231807031,"src\/Fields\/Tabs.php":1798477685,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":1103181937,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":251782310,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From 2e1e5dde887f1714c828328be13e246aab193591 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 2 Sep 2022 16:57:13 +0200 Subject: [PATCH 104/132] phpstan level 9 --- src/Services/CreateCustomService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Services/CreateCustomService.php b/src/Services/CreateCustomService.php index d595f0c..8959d8f 100644 --- a/src/Services/CreateCustomService.php +++ b/src/Services/CreateCustomService.php @@ -23,7 +23,7 @@ public static function isNameValid($name): bool } /** - * @param mixed $name + * @param string $name * @return string */ public static function transformName($name): string From 4011e3f8d766e45028f75607e90538b97ae384b1 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 2 Sep 2022 16:57:22 +0200 Subject: [PATCH 105/132] phpstan level 9 --- src/Commands/CreateCustomHeader.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Commands/CreateCustomHeader.php b/src/Commands/CreateCustomHeader.php index 2a29074..0ac61e7 100644 --- a/src/Commands/CreateCustomHeader.php +++ b/src/Commands/CreateCustomHeader.php @@ -15,10 +15,10 @@ class CreateCustomHeader extends Command public function handle(): int { $name = $this->argument('name'); + $name = is_string($name) ? $name : ''; - if (! CreateCustomService::isNameValid($name)) { - $displayName = is_string($name) ? $name : ""; - $this->error("Name: '$displayName' is not valid"); + if (!CreateCustomService::isNameValid($name)) { + $this->error("Name: '$name' is not valid"); return 0; } @@ -27,7 +27,7 @@ public function handle(): int [$php, $vue] = CreateCustomService::copyFiles($name, Types::Header); - if (! $php) { + if (!$php) { $this->error("Custom Header: '$name' could not be created"); return 0; From c73ea5c963710f6b5265e5ec33d4174440392da1 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 2 Sep 2022 14:57:43 +0000 Subject: [PATCH 106/132] Fix styling --- .php-cs-fixer.cache | 2 +- src/Commands/CreateCustomHeader.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 16de237..d8406b1 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.9","version":"3.10.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":225186634,"src\/Services\/SortingService.php":570185584,"src\/Services\/CreateCustomService.php":4286936727,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":1560041470,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":2202500581,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":3704717280,"src\/Filters\/Text.php":1721742153,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":1671250702,"src\/Commands\/CreateCustomHeader.php":2889374259,"src\/Commands\/CreateCustomField.php":4000417138,"src\/Renderers\/IndexRenderer.php":818203592,"src\/Renderers\/FormRenderer.php":677792611,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":1332854718,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":4231807031,"src\/Fields\/Tabs.php":1798477685,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":1103181937,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":251782310,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.9","version":"3.10.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":225186634,"src\/Services\/SortingService.php":570185584,"src\/Services\/CreateCustomService.php":3045546300,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":1560041470,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":2202500581,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":3704717280,"src\/Filters\/Text.php":1721742153,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":1671250702,"src\/Commands\/CreateCustomHeader.php":250823473,"src\/Commands\/CreateCustomField.php":4000417138,"src\/Renderers\/IndexRenderer.php":818203592,"src\/Renderers\/FormRenderer.php":677792611,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":1332854718,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":4231807031,"src\/Fields\/Tabs.php":1798477685,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":1103181937,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":251782310,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file diff --git a/src/Commands/CreateCustomHeader.php b/src/Commands/CreateCustomHeader.php index 0ac61e7..ff271e9 100644 --- a/src/Commands/CreateCustomHeader.php +++ b/src/Commands/CreateCustomHeader.php @@ -17,7 +17,7 @@ public function handle(): int $name = $this->argument('name'); $name = is_string($name) ? $name : ''; - if (!CreateCustomService::isNameValid($name)) { + if (! CreateCustomService::isNameValid($name)) { $this->error("Name: '$name' is not valid"); return 0; @@ -27,7 +27,7 @@ public function handle(): int [$php, $vue] = CreateCustomService::copyFiles($name, Types::Header); - if (!$php) { + if (! $php) { $this->error("Custom Header: '$name' could not be created"); return 0; From e79f3aa7d64b72de6cdfa2502d97cbc971b962c2 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 2 Sep 2022 17:10:39 +0200 Subject: [PATCH 107/132] phpstan level 9 : zero errors reached zero errors at all levels, BUT with ignoring some hard to fix warnings (such as map on mixed) --- src/Contracts/Renderer.php | 2 +- src/Services/FilterService.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Contracts/Renderer.php b/src/Contracts/Renderer.php index a3c525f..d343aa0 100644 --- a/src/Contracts/Renderer.php +++ b/src/Contracts/Renderer.php @@ -128,7 +128,7 @@ protected function guessResource() } // TODO - /** @phpstan-ignore-next-line */ +// /** @phpstan-ignore-next-line */ $first = $this->items->first(); if ($first === null && $this->items instanceof LengthAwarePaginator) { diff --git a/src/Services/FilterService.php b/src/Services/FilterService.php index bda5ee7..50b6614 100644 --- a/src/Services/FilterService.php +++ b/src/Services/FilterService.php @@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Builder; use Illuminate\Http\Request; use Illuminate\Support\Collection; +use Libaro\Bread\Contracts\Filter; use Libaro\Bread\Filters\Filters; final class FilterService @@ -43,6 +44,7 @@ private function applyFilter($field, $value): void return $filter->getField() === $field; }); + /** @var Filter $filter */ $filterMethods = $filter->getFilterMethods(); if ($filterMethods->count() > 0) { foreach ($filterMethods as $method => $params) { From 7d56b8267bbd947d29c92d720817839ce597cdeb Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 2 Sep 2022 15:11:02 +0000 Subject: [PATCH 108/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index d8406b1..76a33fc 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.9","version":"3.10.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":225186634,"src\/Services\/SortingService.php":570185584,"src\/Services\/CreateCustomService.php":3045546300,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":1560041470,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":2202500581,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":3704717280,"src\/Filters\/Text.php":1721742153,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":1671250702,"src\/Commands\/CreateCustomHeader.php":250823473,"src\/Commands\/CreateCustomField.php":4000417138,"src\/Renderers\/IndexRenderer.php":818203592,"src\/Renderers\/FormRenderer.php":677792611,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":1332854718,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":4231807031,"src\/Fields\/Tabs.php":1798477685,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":1103181937,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":251782310,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.9","version":"3.10.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":3242563327,"src\/Services\/SortingService.php":570185584,"src\/Services\/CreateCustomService.php":3045546300,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":221605306,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":2202500581,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":3704717280,"src\/Filters\/Text.php":1721742153,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":1671250702,"src\/Commands\/CreateCustomHeader.php":250823473,"src\/Commands\/CreateCustomField.php":4000417138,"src\/Renderers\/IndexRenderer.php":818203592,"src\/Renderers\/FormRenderer.php":677792611,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":1332854718,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":4231807031,"src\/Fields\/Tabs.php":1798477685,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":1103181937,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":251782310,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From e7079574b832eb0a95706c7d2d7100dc2a518c67 Mon Sep 17 00:00:00 2001 From: Johan Cleve Date: Fri, 9 Sep 2022 13:31:34 +0200 Subject: [PATCH 109/132] Optional cannot be used in combination with mixed an toArray --- src/Renderers/IndexRenderer.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Renderers/IndexRenderer.php b/src/Renderers/IndexRenderer.php index e510c78..bf2fcc3 100644 --- a/src/Renderers/IndexRenderer.php +++ b/src/Renderers/IndexRenderer.php @@ -44,15 +44,11 @@ public function toResponse($request) return inertia('Bread::Index') ->with([ 'headers' => $this->headers ? $this->headers->toArray() : [], - // TODO - /** @phpstan-ignore-next-line */ - 'filters' => optional($this->filters)->toArray() ?? [], + 'filters' => $this->filters ? $this->filters->toArray() : [], 'actions' => $this->actions, 'items' => $this->items, 'title' => $this->title, - // TODO - /** @phpstan-ignore-next-line */ - 'routes' => optional($this->routes)->toArray() ?? [], + 'routes' => $this->routes ? $this->routes->toArray() : [], 'resource' => $this->guessResource(), 'deleteMessage' => $this->deleteMessage, 'components' => $this->getComponents(), From 2817da85da5adbfeffe214b144a1ab61db4f81dd Mon Sep 17 00:00:00 2001 From: Johan Cleve Date: Fri, 9 Sep 2022 13:33:58 +0200 Subject: [PATCH 110/132] Use static render method on Inertia class --- src/Renderers/IndexRenderer.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Renderers/IndexRenderer.php b/src/Renderers/IndexRenderer.php index bf2fcc3..488d8e5 100644 --- a/src/Renderers/IndexRenderer.php +++ b/src/Renderers/IndexRenderer.php @@ -4,6 +4,7 @@ namespace Libaro\Bread\Renderers; +use Inertia\Inertia; use Libaro\Bread\Contracts\Renderer; use Libaro\Bread\Filters\Filters; use Libaro\Bread\Headers\Headers; @@ -36,12 +37,8 @@ public function items($items): self return $this; } - public function toResponse($request) { - // TODO : fix "Call to an undefined method Inertia\Response|Inertia\ResponseFactory::with()" - // temporarily just ignoring phpstan for this line: - /** @phpstan-ignore-next-line */ - return inertia('Bread::Index') + return Inertia::render('Bread::Index') ->with([ 'headers' => $this->headers ? $this->headers->toArray() : [], 'filters' => $this->filters ? $this->filters->toArray() : [], From 4df59f3384c4b0b017da5baef12177c2b478e6e1 Mon Sep 17 00:00:00 2001 From: Johan Cleve Date: Fri, 9 Sep 2022 13:34:55 +0200 Subject: [PATCH 111/132] Add return type --- src/Renderers/IndexRenderer.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Renderers/IndexRenderer.php b/src/Renderers/IndexRenderer.php index 488d8e5..e909dd1 100644 --- a/src/Renderers/IndexRenderer.php +++ b/src/Renderers/IndexRenderer.php @@ -5,9 +5,11 @@ namespace Libaro\Bread\Renderers; use Inertia\Inertia; +use Illuminate\Http\JsonResponse; use Libaro\Bread\Contracts\Renderer; use Libaro\Bread\Filters\Filters; use Libaro\Bread\Headers\Headers; +use Symfony\Component\HttpFoundation\Response; final class IndexRenderer extends Renderer { @@ -37,6 +39,7 @@ public function items($items): self return $this; } + public function toResponse($request): JsonResponse|Response { return Inertia::render('Bread::Index') ->with([ From eed10a172741bbaf4d871df00db04a65f80b9e5c Mon Sep 17 00:00:00 2001 From: Johan Cleve Date: Fri, 9 Sep 2022 13:36:47 +0200 Subject: [PATCH 112/132] Codestyle --- src/Renderers/IndexRenderer.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Renderers/IndexRenderer.php b/src/Renderers/IndexRenderer.php index e909dd1..86b620a 100644 --- a/src/Renderers/IndexRenderer.php +++ b/src/Renderers/IndexRenderer.php @@ -1,14 +1,13 @@ Date: Fri, 9 Sep 2022 13:38:12 +0200 Subject: [PATCH 113/132] Use static render method on Inertia class --- src/Renderers/FormRenderer.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Renderers/FormRenderer.php b/src/Renderers/FormRenderer.php index ede9647..c902ab4 100644 --- a/src/Renderers/FormRenderer.php +++ b/src/Renderers/FormRenderer.php @@ -4,6 +4,7 @@ namespace Libaro\Bread\Renderers; +use Inertia\Inertia; use Illuminate\Database\Eloquent\Model; use Libaro\Bread\Contracts\Renderer; @@ -61,10 +62,7 @@ public static function render($entity = null): FormRenderer public function toResponse($request) { - // TODO: fix "Call to an undefined method Inertia\Response|Inertia\ResponseFactory::with()" - // temporarily just ignoring phpstan for this line: - /** @phpstan-ignore-next-line */ - return inertia('Bread::Form') + return Inertia::render('Bread::Form') ->with([ 'title' => $this->title, 'entity' => $this->entity, From e69c2353e49c530f72469caa0f915fd72ec6ed1d Mon Sep 17 00:00:00 2001 From: Johan Cleve Date: Fri, 9 Sep 2022 13:55:26 +0200 Subject: [PATCH 114/132] Optional cannot be used in combination with mixed an toArray --- src/Renderers/FormRenderer.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Renderers/FormRenderer.php b/src/Renderers/FormRenderer.php index c902ab4..6f7555a 100644 --- a/src/Renderers/FormRenderer.php +++ b/src/Renderers/FormRenderer.php @@ -66,14 +66,10 @@ public function toResponse($request) ->with([ 'title' => $this->title, 'entity' => $this->entity, - // TODO - /** @phpstan-ignore-next-line */ - 'fields' => optional($this->fields)->toArray() ?? [], + 'fields' => $this->fields ? $this->fields->toArray() : [], 'action' => $this->action, 'method' => $this->getMethod(), - // TODO - /** @phpstan-ignore-next-line */ - 'routes' => optional($this->routes)->toArray() ?? [], + 'routes' => $this->routes ? $this->routes->toArray() : [], 'resource' => $this->guessResource(), 'classes' => $this->getClasses(), 'components' => $this->getComponents(), From c7a0d037d19d8cc1ca52806655f40f5053e3238d Mon Sep 17 00:00:00 2001 From: Johan Cleve Date: Fri, 9 Sep 2022 13:55:58 +0200 Subject: [PATCH 115/132] Set type to Fields --- src/Contracts/Renderer.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Contracts/Renderer.php b/src/Contracts/Renderer.php index d343aa0..7e8723c 100644 --- a/src/Contracts/Renderer.php +++ b/src/Contracts/Renderer.php @@ -4,6 +4,7 @@ namespace Libaro\Bread\Contracts; +use Libaro\Bread\Fields\Fields; use Illuminate\Contracts\Support\Responsable; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; @@ -30,8 +31,9 @@ abstract class Renderer implements Responsable protected array $classes = []; protected ?Collection $components; + /** - * @var mixed + * @var ?Fields */ protected $fields; protected ?Routes $routes = null; From 5cf5cfb710b2b169ba8ea5987ba82d95cbdff4c6 Mon Sep 17 00:00:00 2001 From: Johan Cleve Date: Fri, 9 Sep 2022 13:56:32 +0200 Subject: [PATCH 116/132] Codestyle --- src/Renderers/FormRenderer.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Renderers/FormRenderer.php b/src/Renderers/FormRenderer.php index 6f7555a..ba170a4 100644 --- a/src/Renderers/FormRenderer.php +++ b/src/Renderers/FormRenderer.php @@ -1,12 +1,11 @@ Date: Fri, 9 Sep 2022 15:00:38 +0200 Subject: [PATCH 117/132] Ignore phpstan warning toArray on mixed --- src/Contracts/Renderer.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Contracts/Renderer.php b/src/Contracts/Renderer.php index 7e8723c..f5520f7 100644 --- a/src/Contracts/Renderer.php +++ b/src/Contracts/Renderer.php @@ -97,7 +97,7 @@ public function __call(string $name, array $arguments): self $class = $arguments[0]; if (is_string($class)) { $class = app()->make($arguments[0]); - if (! $class instanceof Invokables) { + if (!$class instanceof Invokables) { throw new \Exception('Class must implement Invokables.'); } $this->$name = $class($this); @@ -172,9 +172,8 @@ public function getComponents(): array return $components; } - // TODO: check by Johan if this is ok (code change for phpstan level 9) - return $components; -// return $components->toArray(); + /** @phpstan-ignore-next-line */ + return $components->toArray(); })->toArray() : []; } } From 85f337e0ae8d84ce1ab0ad7f716c0c7736bc9704 Mon Sep 17 00:00:00 2001 From: Johan Cleve Date: Fri, 9 Sep 2022 15:41:35 +0200 Subject: [PATCH 118/132] Make collection typed --- src/Components/Components.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Components/Components.php b/src/Components/Components.php index 0fc13c0..ee759b8 100644 --- a/src/Components/Components.php +++ b/src/Components/Components.php @@ -9,6 +9,9 @@ final class Components { + /** + * @var Collection + */ private Collection $components; public function __construct() @@ -39,12 +42,8 @@ public function get(): Collection return $this->components; } - // TODO : fix phpstan errors with this ? - // https://stackoverflow.com/questions/66282988/how-to-get-phpstan-to-infer-the-type-for-my-laravel-collection-pipeline public function toArray(): array { - // TODO - /** @phpstan-ignore-next-line */ return $this->components->map(function (Component $component) { return $component->toArray(); })->toArray(); From 7676e4634a2f95170ead83528b103ebf3066ef26 Mon Sep 17 00:00:00 2001 From: Johan Cleve Date: Fri, 9 Sep 2022 15:41:58 +0200 Subject: [PATCH 119/132] Codestyle --- src/Contracts/Renderer.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Contracts/Renderer.php b/src/Contracts/Renderer.php index f5520f7..7e61700 100644 --- a/src/Contracts/Renderer.php +++ b/src/Contracts/Renderer.php @@ -129,8 +129,7 @@ protected function guessResource() return $this->resource; } - // TODO -// /** @phpstan-ignore-next-line */ + /** @phpstan-ignore-next-line */ $first = $this->items->first(); if ($first === null && $this->items instanceof LengthAwarePaginator) { @@ -172,7 +171,7 @@ public function getComponents(): array return $components; } - /** @phpstan-ignore-next-line */ + /** @phpstan-ignore-next-line */ return $components->toArray(); })->toArray() : []; } From 3019c7d18705d3ad723dddf28bbcd7f0fadc8c60 Mon Sep 17 00:00:00 2001 From: johan-libaro Date: Fri, 9 Sep 2022 13:42:27 +0000 Subject: [PATCH 120/132] Fix styling --- .php-cs-fixer.cache | 2 +- src/Contracts/Renderer.php | 4 ++-- src/Renderers/FormRenderer.php | 3 ++- src/Renderers/IndexRenderer.php | 5 +++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 76a33fc..cd03914 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.9","version":"3.10.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":3242563327,"src\/Services\/SortingService.php":570185584,"src\/Services\/CreateCustomService.php":3045546300,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":221605306,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":2202500581,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":3704717280,"src\/Filters\/Text.php":1721742153,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":1671250702,"src\/Commands\/CreateCustomHeader.php":250823473,"src\/Commands\/CreateCustomField.php":4000417138,"src\/Renderers\/IndexRenderer.php":818203592,"src\/Renderers\/FormRenderer.php":677792611,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":1332854718,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":4231807031,"src\/Fields\/Tabs.php":1798477685,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":1103181937,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":251782310,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.10","version":"3.11.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":3242563327,"src\/Services\/SortingService.php":570185584,"src\/Services\/CreateCustomService.php":3045546300,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":2450971325,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":2202500581,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":3704717280,"src\/Filters\/Text.php":1721742153,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":1671250702,"src\/Commands\/CreateCustomHeader.php":250823473,"src\/Commands\/CreateCustomField.php":4000417138,"src\/Renderers\/IndexRenderer.php":1195470683,"src\/Renderers\/FormRenderer.php":1601248856,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":1332854718,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":4231807031,"src\/Fields\/Tabs.php":1798477685,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":1103181937,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":3025943152,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file diff --git a/src/Contracts/Renderer.php b/src/Contracts/Renderer.php index 7e61700..8f936f2 100644 --- a/src/Contracts/Renderer.php +++ b/src/Contracts/Renderer.php @@ -4,10 +4,10 @@ namespace Libaro\Bread\Contracts; -use Libaro\Bread\Fields\Fields; use Illuminate\Contracts\Support\Responsable; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; +use Libaro\Bread\Fields\Fields; use Libaro\Bread\Routes\Routes; abstract class Renderer implements Responsable @@ -97,7 +97,7 @@ public function __call(string $name, array $arguments): self $class = $arguments[0]; if (is_string($class)) { $class = app()->make($arguments[0]); - if (!$class instanceof Invokables) { + if (! $class instanceof Invokables) { throw new \Exception('Class must implement Invokables.'); } $this->$name = $class($this); diff --git a/src/Renderers/FormRenderer.php b/src/Renderers/FormRenderer.php index ba170a4..50d76a1 100644 --- a/src/Renderers/FormRenderer.php +++ b/src/Renderers/FormRenderer.php @@ -1,11 +1,12 @@ Date: Fri, 9 Sep 2022 15:53:01 +0200 Subject: [PATCH 121/132] Remove todo comments --- src/Fields/Fields.php | 2 +- src/Filters/Filters.php | 2 +- src/Headers/Headers.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Fields/Fields.php b/src/Fields/Fields.php index e1d8022..ba48ade 100644 --- a/src/Fields/Fields.php +++ b/src/Fields/Fields.php @@ -51,7 +51,7 @@ public function get(): Collection return $this->fields; } - public function toArray(): Fluent // TODO + public function toArray(): Fluent { $class = new Fluent(); $class->offsetSet('data', $this->fields diff --git a/src/Filters/Filters.php b/src/Filters/Filters.php index 77dbdf8..a00a8e9 100644 --- a/src/Filters/Filters.php +++ b/src/Filters/Filters.php @@ -42,7 +42,7 @@ public function get(): Collection return $this->filters; } - public function toArray(): stdClass // TODO + public function toArray(): stdClass { $class = new stdClass(); $class->data = $this->filters diff --git a/src/Headers/Headers.php b/src/Headers/Headers.php index 89bde22..f41fb2d 100644 --- a/src/Headers/Headers.php +++ b/src/Headers/Headers.php @@ -44,7 +44,7 @@ public function get(): Collection return $this->headers; } - public function toArray(): Fluent // TODO + public function toArray(): Fluent { $class = new Fluent(); $class->offsetSet('data', $this->headers From f3e0b8fa3d322b6132cc86f0da030030d55ac4bf Mon Sep 17 00:00:00 2001 From: johan-libaro Date: Fri, 9 Sep 2022 13:54:04 +0000 Subject: [PATCH 122/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index cd03914..56dcece 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.10","version":"3.11.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":3242563327,"src\/Services\/SortingService.php":570185584,"src\/Services\/CreateCustomService.php":3045546300,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":2450971325,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":2202500581,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":3704717280,"src\/Filters\/Text.php":1721742153,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":1671250702,"src\/Commands\/CreateCustomHeader.php":250823473,"src\/Commands\/CreateCustomField.php":4000417138,"src\/Renderers\/IndexRenderer.php":1195470683,"src\/Renderers\/FormRenderer.php":1601248856,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":1332854718,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":4231807031,"src\/Fields\/Tabs.php":1798477685,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":1103181937,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":3025943152,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.10","version":"3.11.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":3242563327,"src\/Services\/SortingService.php":570185584,"src\/Services\/CreateCustomService.php":3045546300,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":2450971325,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":2202500581,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":578202204,"src\/Filters\/Text.php":1721742153,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":1671250702,"src\/Commands\/CreateCustomHeader.php":250823473,"src\/Commands\/CreateCustomField.php":4000417138,"src\/Renderers\/IndexRenderer.php":1195470683,"src\/Renderers\/FormRenderer.php":1601248856,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":2878625313,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":4231807031,"src\/Fields\/Tabs.php":1798477685,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":199487243,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":3025943152,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From b759e40c7c2e657e556f2f4d65e6d6c42b90c771 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 9 Sep 2022 16:37:13 +0200 Subject: [PATCH 123/132] reverted breaking changes, while still passing phpstan validations --- src/Contracts/Field.php | 3 ++- src/Fields/Boolean.php | 2 +- src/Fields/Image.php | 2 +- src/Fields/MultiSelect.php | 2 +- src/Fields/Number.php | 2 +- src/Fields/Select.php | 2 +- src/Fields/Tab.php | 2 +- src/Fields/Tabs.php | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/Contracts/Field.php b/src/Contracts/Field.php index fdbbd67..8cf5434 100644 --- a/src/Contracts/Field.php +++ b/src/Contracts/Field.php @@ -6,7 +6,8 @@ abstract class Field { - public string $type = 'text'; + /** @var string $type */ + public $type = 'text'; public string $label = ''; public string $name = ''; public bool $editable = true; diff --git a/src/Fields/Boolean.php b/src/Fields/Boolean.php index 163236f..5136978 100644 --- a/src/Fields/Boolean.php +++ b/src/Fields/Boolean.php @@ -8,7 +8,7 @@ final class Boolean extends Field { - public string $type = 'boolean'; + public $type = 'boolean'; public array $attributes = []; public static function make(string $name, string $label, array $attributes = []): self diff --git a/src/Fields/Image.php b/src/Fields/Image.php index a8e0afc..7f51c4e 100644 --- a/src/Fields/Image.php +++ b/src/Fields/Image.php @@ -8,7 +8,7 @@ final class Image extends Field { - public string $type = 'image'; + public $type = 'image'; public string $collection = 'images'; diff --git a/src/Fields/MultiSelect.php b/src/Fields/MultiSelect.php index 95484a7..ee63ba5 100644 --- a/src/Fields/MultiSelect.php +++ b/src/Fields/MultiSelect.php @@ -9,7 +9,7 @@ final class MultiSelect extends Field { - public string $type = 'multiSelect'; + public $type = 'multiSelect'; /** * @param string $name diff --git a/src/Fields/Number.php b/src/Fields/Number.php index fcec9ca..a50f4dd 100644 --- a/src/Fields/Number.php +++ b/src/Fields/Number.php @@ -8,7 +8,7 @@ final class Number extends Field { - public string $type = 'number'; + public $type = 'number'; /** * @param string $name diff --git a/src/Fields/Select.php b/src/Fields/Select.php index c16c248..add3c61 100644 --- a/src/Fields/Select.php +++ b/src/Fields/Select.php @@ -9,7 +9,7 @@ final class Select extends Field { - public string $type = 'select'; + public $type = 'select'; public bool $multiple = true; /** diff --git a/src/Fields/Tab.php b/src/Fields/Tab.php index 854cc27..e82a75e 100644 --- a/src/Fields/Tab.php +++ b/src/Fields/Tab.php @@ -9,7 +9,7 @@ final class Tab extends Field { - public string $type = 'tab'; + public $type = 'tab'; public Collection $fields; protected string $title; diff --git a/src/Fields/Tabs.php b/src/Fields/Tabs.php index 6d534ca..5b7e0f3 100644 --- a/src/Fields/Tabs.php +++ b/src/Fields/Tabs.php @@ -9,7 +9,7 @@ final class Tabs extends Field { - public string $type = 'tabs'; + public $type = 'tabs'; /** * @var Collection */ From 9431be29d7633cf397756804a2bda785f63068d2 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 9 Sep 2022 14:37:38 +0000 Subject: [PATCH 124/132] Fix styling --- .php-cs-fixer.cache | 2 +- src/Contracts/Field.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 56dcece..f1646ac 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.10","version":"3.11.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":3242563327,"src\/Services\/SortingService.php":570185584,"src\/Services\/CreateCustomService.php":3045546300,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":2450971325,"src\/Contracts\/Field.php":1569118118,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":2202500581,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":578202204,"src\/Filters\/Text.php":1721742153,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":1671250702,"src\/Commands\/CreateCustomHeader.php":250823473,"src\/Commands\/CreateCustomField.php":4000417138,"src\/Renderers\/IndexRenderer.php":1195470683,"src\/Renderers\/FormRenderer.php":1601248856,"src\/Fields\/Number.php":2034541722,"src\/Fields\/MultiSelect.php":3611059174,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":620903073,"src\/Fields\/Fields.php":2878625313,"src\/Fields\/Boolean.php":1054238975,"src\/Fields\/Tab.php":4231807031,"src\/Fields\/Tabs.php":1798477685,"src\/Fields\/Select.php":2381496197,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":199487243,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":3025943152,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.10","version":"3.11.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":3242563327,"src\/Services\/SortingService.php":570185584,"src\/Services\/CreateCustomService.php":3045546300,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":2450971325,"src\/Contracts\/Field.php":4212146176,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":2202500581,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":578202204,"src\/Filters\/Text.php":1721742153,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":1671250702,"src\/Commands\/CreateCustomHeader.php":250823473,"src\/Commands\/CreateCustomField.php":4000417138,"src\/Renderers\/IndexRenderer.php":1195470683,"src\/Renderers\/FormRenderer.php":1601248856,"src\/Fields\/Number.php":124780854,"src\/Fields\/MultiSelect.php":2655589068,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":4032533664,"src\/Fields\/Fields.php":2878625313,"src\/Fields\/Boolean.php":710075004,"src\/Fields\/Tab.php":2696720571,"src\/Fields\/Tabs.php":2154895706,"src\/Fields\/Select.php":2269241859,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":199487243,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":3025943152,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file diff --git a/src/Contracts/Field.php b/src/Contracts/Field.php index 8cf5434..c9c92ca 100644 --- a/src/Contracts/Field.php +++ b/src/Contracts/Field.php @@ -6,8 +6,8 @@ abstract class Field { - /** @var string $type */ - public $type = 'text'; + /** @var string */ + public $type = 'text'; public string $label = ''; public string $name = ''; public bool $editable = true; From b77456c0983e3d0938febb58bb5d2591eca0a63d Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 9 Sep 2022 16:38:39 +0200 Subject: [PATCH 125/132] code cleanup --- src/Fields/Fields.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Fields/Fields.php b/src/Fields/Fields.php index ba48ade..855cb52 100644 --- a/src/Fields/Fields.php +++ b/src/Fields/Fields.php @@ -58,7 +58,6 @@ public function toArray(): Fluent // TODO /** @phpstan-ignore-next-line */ ->map(function (Field $field) { -// \PHPStan\dumpType($field); return $field->toArray(); }) ->toArray()); From e2bfc474c7e46b822801d40ab6f7c1b291bc1c15 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 9 Sep 2022 14:39:04 +0000 Subject: [PATCH 126/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index f1646ac..ef332b5 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.10","version":"3.11.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":3242563327,"src\/Services\/SortingService.php":570185584,"src\/Services\/CreateCustomService.php":3045546300,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":2450971325,"src\/Contracts\/Field.php":4212146176,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":2202500581,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":578202204,"src\/Filters\/Text.php":1721742153,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":1671250702,"src\/Commands\/CreateCustomHeader.php":250823473,"src\/Commands\/CreateCustomField.php":4000417138,"src\/Renderers\/IndexRenderer.php":1195470683,"src\/Renderers\/FormRenderer.php":1601248856,"src\/Fields\/Number.php":124780854,"src\/Fields\/MultiSelect.php":2655589068,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":4032533664,"src\/Fields\/Fields.php":2878625313,"src\/Fields\/Boolean.php":710075004,"src\/Fields\/Tab.php":2696720571,"src\/Fields\/Tabs.php":2154895706,"src\/Fields\/Select.php":2269241859,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":199487243,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":3025943152,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.10","version":"3.11.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":3242563327,"src\/Services\/SortingService.php":570185584,"src\/Services\/CreateCustomService.php":3045546300,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":2450971325,"src\/Contracts\/Field.php":4212146176,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":2202500581,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":578202204,"src\/Filters\/Text.php":1721742153,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":1671250702,"src\/Commands\/CreateCustomHeader.php":250823473,"src\/Commands\/CreateCustomField.php":4000417138,"src\/Renderers\/IndexRenderer.php":1195470683,"src\/Renderers\/FormRenderer.php":1601248856,"src\/Fields\/Number.php":124780854,"src\/Fields\/MultiSelect.php":2655589068,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":4032533664,"src\/Fields\/Fields.php":321670220,"src\/Fields\/Boolean.php":710075004,"src\/Fields\/Tab.php":2696720571,"src\/Fields\/Tabs.php":2154895706,"src\/Fields\/Select.php":2269241859,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":199487243,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":3025943152,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From 6c54d7a73d36bfc7902672dc49da31bac9011c5c Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 9 Sep 2022 16:43:57 +0200 Subject: [PATCH 127/132] made collection typed for map --- src/Fields/Fields.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Fields/Fields.php b/src/Fields/Fields.php index 855cb52..497cbc6 100644 --- a/src/Fields/Fields.php +++ b/src/Fields/Fields.php @@ -11,7 +11,7 @@ class Fields { /** - * @var Collection + * @var Collection */ private Collection $fields; @@ -21,7 +21,7 @@ public function __construct() } /** - * @param mixed ...$fields + * @param Field ...$fields * @return Fields */ public static function add(...$fields): Fields @@ -36,10 +36,10 @@ public static function add(...$fields): Fields } /** - * @param mixed $field + * @param Field $field * @return $this */ - public function push($field): Fields + public function push(Field $field): Fields { $this->fields->push($field); @@ -55,8 +55,6 @@ public function toArray(): Fluent { $class = new Fluent(); $class->offsetSet('data', $this->fields - // TODO - /** @phpstan-ignore-next-line */ ->map(function (Field $field) { return $field->toArray(); }) From d2adbfe6269a85e466c09dd8881cdf70e9bb62f5 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 9 Sep 2022 14:44:28 +0000 Subject: [PATCH 128/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index ef332b5..b4f4f24 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.10","version":"3.11.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":3242563327,"src\/Services\/SortingService.php":570185584,"src\/Services\/CreateCustomService.php":3045546300,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":2450971325,"src\/Contracts\/Field.php":4212146176,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":2202500581,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":578202204,"src\/Filters\/Text.php":1721742153,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":1671250702,"src\/Commands\/CreateCustomHeader.php":250823473,"src\/Commands\/CreateCustomField.php":4000417138,"src\/Renderers\/IndexRenderer.php":1195470683,"src\/Renderers\/FormRenderer.php":1601248856,"src\/Fields\/Number.php":124780854,"src\/Fields\/MultiSelect.php":2655589068,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":4032533664,"src\/Fields\/Fields.php":321670220,"src\/Fields\/Boolean.php":710075004,"src\/Fields\/Tab.php":2696720571,"src\/Fields\/Tabs.php":2154895706,"src\/Fields\/Select.php":2269241859,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":199487243,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":3025943152,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.10","version":"3.11.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":3242563327,"src\/Services\/SortingService.php":570185584,"src\/Services\/CreateCustomService.php":3045546300,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":2450971325,"src\/Contracts\/Field.php":4212146176,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":2202500581,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":578202204,"src\/Filters\/Text.php":1721742153,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":1671250702,"src\/Commands\/CreateCustomHeader.php":250823473,"src\/Commands\/CreateCustomField.php":4000417138,"src\/Renderers\/IndexRenderer.php":1195470683,"src\/Renderers\/FormRenderer.php":1601248856,"src\/Fields\/Number.php":124780854,"src\/Fields\/MultiSelect.php":2655589068,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":4032533664,"src\/Fields\/Fields.php":3572158689,"src\/Fields\/Boolean.php":710075004,"src\/Fields\/Tab.php":2696720571,"src\/Fields\/Tabs.php":2154895706,"src\/Fields\/Select.php":2269241859,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":199487243,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":3025943152,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From 2b28faa714da0fd7e25c05d39ea1d158a14b9d7f Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 9 Sep 2022 16:49:42 +0200 Subject: [PATCH 129/132] made collection typed for ->map(...) --- src/Fields/Tab.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Fields/Tab.php b/src/Fields/Tab.php index e82a75e..cc3de79 100644 --- a/src/Fields/Tab.php +++ b/src/Fields/Tab.php @@ -11,7 +11,10 @@ final class Tab extends Field { public $type = 'tab'; - public Collection $fields; + /** + * @var Collection + */ + public $fields; protected string $title; public function __construct() @@ -21,7 +24,7 @@ public function __construct() /** * @param $title - * @param Collection ...$fields + * @param Field ...$fields * @return Tab */ public static function make(string $title, ...$fields): Tab @@ -51,8 +54,6 @@ public function toArray() $array = parent::toArray(); $array['title'] = $this->title; - // TODO - /** @phpstan-ignore-next-line */ $array['fields'] = $this->fields->map(function (Field $field) { return $field->toArray(); })->toArray(); From fcf84c6683a7b732fa0b203a01a0194d45a45ff5 Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 9 Sep 2022 14:50:35 +0000 Subject: [PATCH 130/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index b4f4f24..9e65647 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.10","version":"3.11.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":3242563327,"src\/Services\/SortingService.php":570185584,"src\/Services\/CreateCustomService.php":3045546300,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":2450971325,"src\/Contracts\/Field.php":4212146176,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":2202500581,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":578202204,"src\/Filters\/Text.php":1721742153,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":1671250702,"src\/Commands\/CreateCustomHeader.php":250823473,"src\/Commands\/CreateCustomField.php":4000417138,"src\/Renderers\/IndexRenderer.php":1195470683,"src\/Renderers\/FormRenderer.php":1601248856,"src\/Fields\/Number.php":124780854,"src\/Fields\/MultiSelect.php":2655589068,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":4032533664,"src\/Fields\/Fields.php":3572158689,"src\/Fields\/Boolean.php":710075004,"src\/Fields\/Tab.php":2696720571,"src\/Fields\/Tabs.php":2154895706,"src\/Fields\/Select.php":2269241859,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":199487243,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":3025943152,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.10","version":"3.11.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":3242563327,"src\/Services\/SortingService.php":570185584,"src\/Services\/CreateCustomService.php":3045546300,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":2450971325,"src\/Contracts\/Field.php":4212146176,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":2202500581,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":578202204,"src\/Filters\/Text.php":1721742153,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":1671250702,"src\/Commands\/CreateCustomHeader.php":250823473,"src\/Commands\/CreateCustomField.php":4000417138,"src\/Renderers\/IndexRenderer.php":1195470683,"src\/Renderers\/FormRenderer.php":1601248856,"src\/Fields\/Number.php":124780854,"src\/Fields\/MultiSelect.php":2655589068,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":4032533664,"src\/Fields\/Fields.php":3572158689,"src\/Fields\/Boolean.php":710075004,"src\/Fields\/Tab.php":3137926331,"src\/Fields\/Tabs.php":2154895706,"src\/Fields\/Select.php":2269241859,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":199487243,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":3025943152,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file From 1915cc5dfa5e7fe8fc7832fa018270342f319fd8 Mon Sep 17 00:00:00 2001 From: Tim Vande Walle Date: Fri, 9 Sep 2022 16:55:56 +0200 Subject: [PATCH 131/132] made collection typed for ->map(...) --- src/Fields/Tabs.php | 4 +--- src/Filters/Filters.php | 7 ++++--- src/Headers/Headers.php | 7 ++++--- src/Routes/Routes.php | 7 ++++--- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/Fields/Tabs.php b/src/Fields/Tabs.php index 5b7e0f3..27d0319 100644 --- a/src/Fields/Tabs.php +++ b/src/Fields/Tabs.php @@ -11,7 +11,7 @@ final class Tabs extends Field { public $type = 'tabs'; /** - * @var Collection + * @var Collection */ public Collection $tabs; @@ -49,8 +49,6 @@ public function toArray(): array { $array = parent::toArray(); $array['tabs'] = $this->tabs - // TODO - /** @phpstan-ignore-next-line */ ->map(function (Field $tab) { return $tab->toArray(); }) diff --git a/src/Filters/Filters.php b/src/Filters/Filters.php index a00a8e9..a946129 100644 --- a/src/Filters/Filters.php +++ b/src/Filters/Filters.php @@ -7,7 +7,10 @@ class Filters { - private Collection $filters; + /** + * @var Collection + */ + private $filters; private int $sideBarStarsAt = 5; public function __construct() @@ -46,8 +49,6 @@ public function toArray(): stdClass { $class = new stdClass(); $class->data = $this->filters - // TODO - /** @phpstan-ignore-next-line */ ->map(function (Filter $filter) { return $filter->toArray(); }) diff --git a/src/Headers/Headers.php b/src/Headers/Headers.php index f41fb2d..c808c23 100644 --- a/src/Headers/Headers.php +++ b/src/Headers/Headers.php @@ -10,7 +10,10 @@ final class Headers { - protected Collection $headers; + /** + * @var Collection + */ + protected $headers; public function __construct() { @@ -48,8 +51,6 @@ public function toArray(): Fluent { $class = new Fluent(); $class->offsetSet('data', $this->headers - // TODO - /** @phpstan-ignore-next-line */ ->map(function (Header $header) { return $header->toArray(); }) diff --git a/src/Routes/Routes.php b/src/Routes/Routes.php index c1d7e7e..fe4fc2b 100644 --- a/src/Routes/Routes.php +++ b/src/Routes/Routes.php @@ -9,7 +9,10 @@ final class Routes { - protected Collection $routes; + /** + * @var Collection + */ + protected $routes; public function __construct() { @@ -41,8 +44,6 @@ public function get(): Collection public function toArray(): array { - // TODO - /** @phpstan-ignore-next-line */ return $this->routes->mapWithKeys(function (Route $route) { return [ $route->getType() => $route->toArray(), From 6f9f51eb92ae03d59a6db257e25fad4f9b269a0f Mon Sep 17 00:00:00 2001 From: TimLibaro Date: Fri, 9 Sep 2022 14:56:31 +0000 Subject: [PATCH 132/132] Fix styling --- .php-cs-fixer.cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 9e65647..01da114 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.1.10","version":"3.11.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":3242563327,"src\/Services\/SortingService.php":570185584,"src\/Services\/CreateCustomService.php":3045546300,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":2450971325,"src\/Contracts\/Field.php":4212146176,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":2202500581,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":578202204,"src\/Filters\/Text.php":1721742153,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":1671250702,"src\/Commands\/CreateCustomHeader.php":250823473,"src\/Commands\/CreateCustomField.php":4000417138,"src\/Renderers\/IndexRenderer.php":1195470683,"src\/Renderers\/FormRenderer.php":1601248856,"src\/Fields\/Number.php":124780854,"src\/Fields\/MultiSelect.php":2655589068,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":4032533664,"src\/Fields\/Fields.php":3572158689,"src\/Fields\/Boolean.php":710075004,"src\/Fields\/Tab.php":3137926331,"src\/Fields\/Tabs.php":2154895706,"src\/Fields\/Select.php":2269241859,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":199487243,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":3025943152,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file +{"php":"8.1.10","version":"3.11.0","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"sort_algorithm":"alpha"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline","keep_multiple_spaces_after_comma":true},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"not_operator_with_successor_space":true,"trailing_comma_in_multiline":true,"phpdoc_scalar":true,"unary_operator_spaces":true,"binary_operator_spaces":true,"blank_line_before_statement":{"statements":["break","continue","declare","return","throw","try"]},"phpdoc_single_line_var_spacing":true,"phpdoc_var_without_name":true,"class_attributes_separation":{"elements":{"method":"one"}}},"hashes":{"src\/Services\/FilterService.php":3242563327,"src\/Services\/SortingService.php":570185584,"src\/Services\/CreateCustomService.php":3045546300,"src\/ValueObjects\/Types.php":976112391,"src\/BreadServiceProvider.php":3682323247,"src\/Contracts\/Component.php":413477820,"src\/Contracts\/Route.php":1994232514,"src\/Contracts\/Header.php":1729022448,"src\/Contracts\/Invokables.php":3589802302,"src\/Contracts\/FormComponents.php":2006127091,"src\/Contracts\/Renderer.php":2450971325,"src\/Contracts\/Field.php":4212146176,"src\/Contracts\/ComponentsInterface.php":957920066,"src\/Contracts\/IndexComponents.php":1435574258,"src\/Contracts\/Filter.php":2143273424,"src\/Routes\/Create.php":1695394094,"src\/Routes\/Destroy.php":1458008311,"src\/Routes\/Update.php":4166386385,"src\/Routes\/Store.php":460891973,"src\/Routes\/Routes.php":2675183373,"src\/Routes\/Index.php":2907359599,"src\/Routes\/Edit.php":3991995671,"src\/Filters\/Filters.php":3707575036,"src\/Filters\/Text.php":1721742153,"src\/Filters\/Boolean.php":1951698771,"src\/Filters\/Select.php":3820557334,"src\/Filters\/Filter.php":1213338388,"src\/Commands\/CreateCustomFilter.php":1671250702,"src\/Commands\/CreateCustomHeader.php":250823473,"src\/Commands\/CreateCustomField.php":4000417138,"src\/Renderers\/IndexRenderer.php":1195470683,"src\/Renderers\/FormRenderer.php":1601248856,"src\/Fields\/Number.php":124780854,"src\/Fields\/MultiSelect.php":2655589068,"src\/Fields\/Text.php":3296465271,"src\/Fields\/Image.php":4032533664,"src\/Fields\/Fields.php":3572158689,"src\/Fields\/Boolean.php":710075004,"src\/Fields\/Tab.php":3137926331,"src\/Fields\/Tabs.php":3422655071,"src\/Fields\/Select.php":2269241859,"src\/Headers\/Number.php":3468185039,"src\/Headers\/Text.php":3453491020,"src\/Headers\/Link.php":3708658392,"src\/Headers\/Money.php":1414716803,"src\/Headers\/Boolean.php":1436861502,"src\/Headers\/Date.php":791925921,"src\/Headers\/Label.php":2559479232,"src\/Headers\/Download.php":1670883268,"src\/Headers\/Headers.php":1828549759,"src\/Headers\/InertiaLink.php":3847878985,"src\/Headers\/Rating.php":2195370648,"src\/Headers\/Trend.php":3244001513,"src\/Headers\/Set.php":4116951602,"src\/Components\/Components.php":3025943152,"tests\/Pest.php":1399058707,"tests\/TestCase.php":51090682}} \ No newline at end of file