From d7425a6de8623a6efbd97bd9a36173127d5bcf2f Mon Sep 17 00:00:00 2001 From: balajidharma Date: Sat, 27 Jul 2024 22:34:34 -0400 Subject: [PATCH] Removed LaravelCollective related codes --- config/form-builder.php | 46 +++++- resources/views/button.php | 7 +- resources/views/buttongroup.php | 4 +- resources/views/checkbox.php | 20 ++- resources/views/checkboxes.php | 47 ------ resources/views/child_form.php | 2 +- resources/views/choice.php | 46 ++++++ resources/views/collection.php | 2 +- resources/views/datalist.php | 7 - resources/views/form.php | 10 +- resources/views/label.php | 10 ++ resources/views/radio.php | 7 +- resources/views/radios.php | 32 ---- resources/views/select.php | 28 +++- resources/views/static.php | 2 +- resources/views/text.php | 16 +- resources/views/textarea.php | 7 +- src/Fields/CheckableType.php | 41 +++++ src/Fields/CheckboxType.php | 2 +- src/Fields/CheckboxesType.php | 22 --- src/Fields/ChoiceType.php | 185 +++++++++++++++++++++++ src/Filters/FilterResolver.php | 6 +- src/Form.php | 70 +-------- src/FormBuilder.php | 2 +- src/FormBuilderServiceProvider.php | 17 +-- src/FormHelper.php | 18 +-- src/helpers.php | 22 +++ src/tests/Console/FormGeneratorTest.php | 2 +- src/tests/Fields/CollectionTypeTest.php | 24 +-- src/tests/Filters/FilterResolverTest.php | 4 +- src/tests/FormBuilderTest.php | 2 +- src/tests/FormBuilderTestCase.php | 4 +- src/tests/FormTest.php | 6 +- 33 files changed, 449 insertions(+), 271 deletions(-) delete mode 100644 resources/views/checkboxes.php create mode 100644 resources/views/choice.php delete mode 100644 resources/views/datalist.php create mode 100644 resources/views/label.php delete mode 100644 resources/views/radios.php create mode 100644 src/Fields/CheckableType.php delete mode 100644 src/Fields/CheckboxesType.php create mode 100644 src/Fields/ChoiceType.php diff --git a/config/form-builder.php b/config/form-builder.php index 5897075..08597c3 100644 --- a/config/form-builder.php +++ b/config/form-builder.php @@ -19,23 +19,63 @@ 'error_class' => 'text-danger', 'required_class' => 'required', 'help_block_tag' => 'p', + + // Override a class from a field. + //'text' => [ + // 'wrapper_class' => 'form-field-text', + // 'label_class' => 'form-field-text-label', + // 'field_class' => 'form-field-text-field', + //] + //'radio' => [ + // 'choice_options' => [ + // 'wrapper' => ['class' => 'form-radio'], + // 'label' => ['class' => 'form-radio-label'], + // 'field' => ['class' => 'form-radio-field'], + // ] + //], + // + // 'choice' => [ + // 'choice_options' => [ + // 'wrapper_class' => 'choice-wrapper-class', + // 'label_class' => 'choice-label-class', + // 'field_class' => 'choice-field-class' + // + // # For choice type you may overwrite default choice options for each variant (checkbox, radio or select) + // 'checkbox' => [ + // 'wrapper_class' => 'choice-checkbox-wrapper-class', + // 'label_class' => 'choice-checkbox-label-class', + // 'field_class' => 'choice-checkbox-field-class', + // ] + // ] + //] + // Templates 'templates' => [ - 'datalist' => 'laravel-form-builder::datalist', 'form' => 'laravel-form-builder::form', 'text' => 'laravel-form-builder::text', 'textarea' => 'laravel-form-builder::textarea', 'button' => 'laravel-form-builder::button', 'buttongroup' => 'laravel-form-builder::buttongroup', 'radio' => 'laravel-form-builder::radio', - 'radios' => 'laravel-form-builder::radios', 'checkbox' => 'laravel-form-builder::checkbox', - 'checkboxes' => 'laravel-form-builder::checkboxes', 'select' => 'laravel-form-builder::select', + 'choice' => 'laravel-form-builder::choice', 'repeated' => 'laravel-form-builder::repeated', 'child_form' => 'laravel-form-builder::child_form', 'collection' => 'laravel-form-builder::collection', 'static' => 'laravel-form-builder::static', ], + + // Remove the laravel-form-builder:: prefix above when using template_prefix + 'template_prefix' => '', + + 'default_namespace' => '', + + 'custom_fields' => [ + // 'datetime' => App\Forms\Fields\Datetime::class + ], ], + 'plain_form_class' => \BalajiDharma\LaravelFormBuilder\Form::class, + 'form_builder_class' => \BalajiDharma\LaravelFormBuilder\FormBuilder::class, + 'form_helper_class' => \BalajiDharma\LaravelFormBuilder\FormHelper::class, ]; diff --git a/resources/views/button.php b/resources/views/button.php index 56eb559..1d3aebd 100644 --- a/resources/views/button.php +++ b/resources/views/button.php @@ -3,12 +3,7 @@ diff --git a/resources/views/buttongroup.php b/resources/views/buttongroup.php index 551473f..0567ed2 100644 --- a/resources/views/buttongroup.php +++ b/resources/views/buttongroup.php @@ -7,7 +7,9 @@ - + diff --git a/resources/views/checkbox.php b/resources/views/checkbox.php index 06a25c8..7235d11 100644 --- a/resources/views/checkbox.php +++ b/resources/views/checkbox.php @@ -5,14 +5,22 @@ - - - - - + - + diff --git a/resources/views/checkboxes.php b/resources/views/checkboxes.php deleted file mode 100644 index 5a91546..0000000 --- a/resources/views/checkboxes.php +++ /dev/null @@ -1,47 +0,0 @@ - - -
> - - - - - - - - -
- $label) { - $id = $name.'_'.$value; - ?> -
- -
- -
- - - - - - - - -
- - diff --git a/resources/views/child_form.php b/resources/views/child_form.php index bd18364..3065b97 100644 --- a/resources/views/child_form.php +++ b/resources/views/child_form.php @@ -5,7 +5,7 @@ - + diff --git a/resources/views/choice.php b/resources/views/choice.php new file mode 100644 index 0000000..354024e --- /dev/null +++ b/resources/views/choice.php @@ -0,0 +1,46 @@ + + +
> + + + + + + + render(); ?> + + + + + + +
$val) { ?> + + + > + + + + render($options['choice_options'], true, true, false) ?> + + + +
+ + + + + + + + + + + +
+ + \ No newline at end of file diff --git a/resources/views/collection.php b/resources/views/collection.php index 026b025..1b39adf 100644 --- a/resources/views/collection.php +++ b/resources/views/collection.php @@ -5,7 +5,7 @@ - + diff --git a/resources/views/datalist.php b/resources/views/datalist.php deleted file mode 100644 index a330590..0000000 --- a/resources/views/datalist.php +++ /dev/null @@ -1,7 +0,0 @@ - - $label) { ?> - - - diff --git a/resources/views/form.php b/resources/views/form.php index 840a22e..36f5504 100644 --- a/resources/views/form.php +++ b/resources/views/form.php @@ -1,11 +1,9 @@
$val) { ?> - - + + enctype="multipart/form-data" + + > diff --git a/resources/views/label.php b/resources/views/label.php new file mode 100644 index 0000000..d19c9c5 --- /dev/null +++ b/resources/views/label.php @@ -0,0 +1,10 @@ + + + \ No newline at end of file diff --git a/resources/views/radio.php b/resources/views/radio.php index 9fd7f1d..21d9d4b 100644 --- a/resources/views/radio.php +++ b/resources/views/radio.php @@ -5,10 +5,13 @@ - + + + /> - + diff --git a/resources/views/radios.php b/resources/views/radios.php deleted file mode 100644 index 7613011..0000000 --- a/resources/views/radios.php +++ /dev/null @@ -1,32 +0,0 @@ - - -
> - - - - - - - - -
- $label) { - $id = $name.'_'.$value; - ?> -
- $id]); ?> - -
- -
- - - - - - - - -
- - diff --git a/resources/views/select.php b/resources/views/select.php index 0073409..9883007 100644 --- a/resources/views/select.php +++ b/resources/views/select.php @@ -4,13 +4,35 @@ + - + + render(); ?> + + + $options['empty_value']] : null; ?> - + + @@ -20,4 +42,4 @@ - + \ No newline at end of file diff --git a/resources/views/static.php b/resources/views/static.php index 899a2ed..6e8aa3a 100644 --- a/resources/views/static.php +++ b/resources/views/static.php @@ -5,7 +5,7 @@ - + diff --git a/resources/views/text.php b/resources/views/text.php index 7c06a2d..3257ace 100644 --- a/resources/views/text.php +++ b/resources/views/text.php @@ -5,24 +5,12 @@ - + $val) { ?> - - + /> diff --git a/resources/views/textarea.php b/resources/views/textarea.php index a9d7272..931ff64 100644 --- a/resources/views/textarea.php +++ b/resources/views/textarea.php @@ -5,11 +5,14 @@ - + - + + diff --git a/src/Fields/CheckableType.php b/src/Fields/CheckableType.php new file mode 100644 index 0000000..1a93c99 --- /dev/null +++ b/src/Fields/CheckableType.php @@ -0,0 +1,41 @@ +type; + } + + /** + * {@inheritdoc} + */ + public function getDefaults() + { + return [ + 'attr' => ['id' => $this->getName()], + 'value' => self::DEFAULT_VALUE, + 'checked' => null, + ]; + } + + /** + * {@inheritdoc} + */ + protected function isValidValue($value) + { + return $value !== null; + } +} diff --git a/src/Fields/CheckboxType.php b/src/Fields/CheckboxType.php index 4841fd4..4429ade 100644 --- a/src/Fields/CheckboxType.php +++ b/src/Fields/CheckboxType.php @@ -25,7 +25,7 @@ protected function getTemplate() public function getDefaults() { return [ - 'attr' => ['class' => null, 'id' => $this->getName()], + 'attr' => ['id' => $this->getName()], 'value' => self::DEFAULT_VALUE, 'checked' => null, ]; diff --git a/src/Fields/CheckboxesType.php b/src/Fields/CheckboxesType.php deleted file mode 100644 index 779327b..0000000 --- a/src/Fields/CheckboxesType.php +++ /dev/null @@ -1,22 +0,0 @@ -modelKeys(); - } - - parent::setValue($value); - } -} diff --git a/src/Fields/ChoiceType.php b/src/Fields/ChoiceType.php new file mode 100644 index 0000000..16982c7 --- /dev/null +++ b/src/Fields/ChoiceType.php @@ -0,0 +1,185 @@ +options['expanded']; + $multiple = $this->options['multiple']; + + if (! $expanded && $multiple) { + $this->options['attr']['multiple'] = true; + } + + if ($expanded && ! $multiple) { + return $this->choiceType = 'radio'; + } + + if ($expanded && $multiple) { + return $this->choiceType = 'checkbox'; + } + + return $this->choiceType = 'select'; + } + + /** + * {@inheritdoc} + */ + protected function getDefaults() + { + return [ + 'choices' => null, + 'selected' => null, + 'expanded' => false, + 'multiple' => false, + 'choice_options' => [ + 'wrapper' => false, + 'is_child' => true, + ], + ]; + } + + /** + * Create children depending on choice type. + * + * @return void + */ + protected function createChildren() + { + if (($data_override = $this->getOption('data_override')) && $data_override instanceof \Closure) { + $this->options['choices'] = $data_override($this->options['choices'], $this); + } + + $this->children = []; + $this->determineChoiceField(); + + $fieldType = $this->formHelper->getFieldType($this->choiceType); + + switch ($this->choiceType) { + case 'radio': + case 'checkbox': + $this->buildCheckableChildren($fieldType); + break; + default: + $this->buildSelect($fieldType); + break; + } + } + + /** + * Build checkable children fields from choice type. + * + * @param string $fieldType + * @return void + */ + protected function buildCheckableChildren($fieldType) + { + $multiple = $this->getOption('multiple') ? '[]' : ''; + + $attr = $this->options['attr'] ?? []; + $attr = Arr::except($attr, ['class', 'multiple', 'id', 'name']); + foreach ((array) $this->options['choices'] as $key => $choice) { + $id = str_replace('.', '_', $this->getNameKey()).'_'.$key; + $options = $this->formHelper->mergeOptions( + $this->getOption('choice_options'), + [ + 'attr' => array_merge(['id' => $id], $this->options['option_attributes'][$key] ?? $attr), + 'label_attr' => ['for' => $id], + 'label' => $choice, + 'checked' => in_array($key, (array) $this->options[$this->valueProperty]), + 'value' => $key, + ] + ); + $this->children[] = new $fieldType( + $this->name.$multiple, + $this->choiceType, + $this->parent, + $options + ); + } + } + + /** + * Build select field from choice. + * + * @param string $fieldType + */ + protected function buildSelect($fieldType) + { + $this->children[] = new $fieldType( + $this->name, + $this->choiceType, + $this->parent, + $this->formHelper->mergeOptions($this->options, ['is_child' => true]) + ); + } + + /** + * Creates default wrapper classes for the form element. + * + * @return array + */ + protected function setDefaultClasses(array $options = []) + { + $defaults = parent::setDefaultClasses($options); + $choice_type = $this->determineChoiceField(); + Arr::forget($defaults, 'attr.class'); + + $wrapper_class = $this->formHelper->getConfig($this->type.'.'.$choice_type.'_wrapper_class', ''); + if ($wrapper_class) { + $defaults['wrapper']['class'] = (isset($defaults['wrapper']['class']) ? $defaults['wrapper']['class'].' ' : '').$wrapper_class; + } + + $choice_wrapper_class = $this->formHelper->getConfig( + $this->type.'.choice_options.wrapper_class', + $this->formHelper->getConfig($this->type.'.choice_options.'.$choice_type.'.wrapper_class', '') + ); + $choice_label_class = $this->formHelper->getConfig( + $this->type.'.choice_options.label_class', + $this->formHelper->getConfig($this->type.'.choice_options.'.$choice_type.'.label_class', '') + ); + $choice_field_class = $this->formHelper->getConfig( + $this->type.'.choice_options.field_class', + $this->formHelper->getConfig($this->type.'.choice_options.'.$choice_type.'.field_class', '') + ); + + if ($choice_wrapper_class) { + $defaults['choice_options']['wrapper']['class'] = $choice_wrapper_class; + } + if ($choice_label_class) { + $defaults['choice_options']['label_attr']['class'] = $choice_label_class; + } + if ($choice_field_class) { + $defaults['choice_options']['attr']['class'] = $choice_field_class; + } + + return $defaults; + } +} diff --git a/src/Filters/FilterResolver.php b/src/Filters/FilterResolver.php index dde4ce6..95703bc 100644 --- a/src/Filters/FilterResolver.php +++ b/src/Filters/FilterResolver.php @@ -29,14 +29,14 @@ public static function instance($filter) } if (class_exists($filter)) { - return self::validateFilterInstance(new $filter()); + return self::validateFilterInstance(new $filter); } if ($filter = FilterResolver::resolveFromCollection($filter)) { return self::validateFilterInstance($filter); } - $ex = new UnableToResolveFilterException(); + $ex = new UnableToResolveFilterException; throw $ex; } @@ -48,7 +48,7 @@ public static function instance($filter) private static function validateFilterInstance($filter) { if (! $filter instanceof FilterInterface) { - $ex = new InvalidInstanceException(); + $ex = new InvalidInstanceException; throw $ex; } diff --git a/src/Form.php b/src/Form.php index 73c72be..9e03745 100644 --- a/src/Form.php +++ b/src/Form.php @@ -151,13 +151,6 @@ class Form */ protected $errorBag = 'default'; - /** - * Define the isEdit for the form. - * - * @var bool - */ - protected $isEdit = false; - /** * The form methods that should be spoofed, in uppercase. * @@ -838,46 +831,11 @@ public function setClientValidationEnabled($enable) /** * Add any aditional data that field needs (ex. array of choices). * - * @deprecated deprecated since 1.6.20, will be removed in 1.7 - use 3rd param on create, or 2nd on plain method to pass data - * will be switched to protected in 1.7. - * - * @param string $name * @param mixed $data */ - public function setData($name, $data) + public function setData($data) { - $this->data[$name] = $data; - } - - /** - * Get single additional data. - * - * @param string $name - * @param null $default - * @return mixed - */ - public function getData($name = null, $default = null) - { - if (is_null($name)) { - return $this->data; - } - - return Arr::get($this->data, $name, $default); - } - - /** - * Add multiple peices of data at once. - * - * @deprecated deprecated since 1.6.12, will be removed in 1.7 - use 3rd param on create, or 2nd on plain method to pass data - * will be switched to protected in 1.7. - * - * @return $this - **/ - public function addData(array $data) - { - foreach ($data as $key => $value) { - $this->setData($key, $value); - } + $this->data = $data; return $this; } @@ -1508,27 +1466,6 @@ public function getRawValues() return $rawValues; } - /** - * Get the form isEdit - * - * @return bool - */ - public function getIsEdit() - { - return $this->isEdit; - } - - /** - * Set the form isEdit - * - * @param bool $isEdit - * @return void - */ - public function setIsEdit($isEdit) - { - $this->isEdit = $isEdit; - } - /** * Get the form appendage for the given method. * @@ -1545,9 +1482,6 @@ public function getAppendage($method) if (in_array($method, $this->spoofedMethods)) { $this->add('_method', 'hidden', ['value' => $method, 'label' => false, 'wrapper' => false]); $this->setFormOption('method', 'POST'); - if ($method === 'PUT') { - $this->setIsEdit(true); - } } // If the method is something other than GET we will go ahead and attach the diff --git a/src/FormBuilder.php b/src/FormBuilder.php index 5b830f2..68bb63b 100644 --- a/src/FormBuilder.php +++ b/src/FormBuilder.php @@ -186,7 +186,7 @@ public function plain(array $options = [], array $data = []) public function setDependenciesAndOptions($instance, array $options = [], array $data = []) { return $instance - ->addData($data) + ->setData($data) ->setRequest($this->container->make('request')) ->setFormHelper($this->formHelper) ->setEventDispatcher($this->eventDispatcher) diff --git a/src/FormBuilderServiceProvider.php b/src/FormBuilderServiceProvider.php index ca438a7..de44712 100644 --- a/src/FormBuilderServiceProvider.php +++ b/src/FormBuilderServiceProvider.php @@ -106,17 +106,6 @@ public function boot() __DIR__.'/../resources/views' => resource_path('views/vendor/laravel-form-builder'), ], 'views'); } - - /*$form = $this->app[static::FORM_ABSTRACT]; - - $form->macro('customLabel', function($name, $value, $options = [], $escape_html = true) use ($form) { - if (isset($options['for']) && $for = $options['for']) { - unset($options['for']); - return $form->label($for, $value, $options, $escape_html); - } - - return $form->label($name, $value, $options, $escape_html); - });*/ } /** @@ -134,7 +123,7 @@ public function provides() */ protected function getPlainFormClass() { - return $this->app['config']->get('laravel-form-builder.plain_form_class', Form::class); + return $this->app['config']->get('form-builder.plain_form_class', Form::class); } /** @@ -145,7 +134,7 @@ protected function getFormBuilderClass() $expectedClass = FormBuilder::class; $defaultClass = FormBuilder::class; - $class = $this->app['config']->get('laravel-form-builder.form_builder_class', $defaultClass); + $class = $this->app['config']->get('form-builder.form_builder_class', $defaultClass); if (! class_exists($class)) { throw new InvalidArgumentException("Class {$class} does not exist"); @@ -166,7 +155,7 @@ protected function getFormHelperClass() $expectedClass = FormHelper::class; $defaultClass = FormHelper::class; - $class = $this->app['config']->get('laravel-form-builder.form_helper_class', $defaultClass); + $class = $this->app['config']->get('form-builder.form_helper_class', $defaultClass); if (! class_exists($class)) { throw new InvalidArgumentException("Class {$class} does not exist"); diff --git a/src/FormHelper.php b/src/FormHelper.php index 7664b4b..0a366a3 100644 --- a/src/FormHelper.php +++ b/src/FormHelper.php @@ -3,7 +3,7 @@ namespace BalajiDharma\LaravelFormBuilder; use BalajiDharma\LaravelFormBuilder\Events\AfterCollectingFieldRules; -use BalajiDharma\LaravelFormBuilder\Fields\CheckboxType; +use BalajiDharma\LaravelFormBuilder\Fields\CheckableType; use BalajiDharma\LaravelFormBuilder\Fields\FormField; use Illuminate\Contracts\Support\MessageBag; use Illuminate\Contracts\View\Factory as View; @@ -70,11 +70,11 @@ class FormHelper 'buttongroup' => 'ButtonGroupType', 'submit' => 'ButtonType', 'reset' => 'ButtonType', - 'radios' => 'RadiosType', - 'checkbox' => 'CheckboxType', - 'checkboxes' => 'CheckboxesType', + 'radio' => 'CheckableType', + 'checkbox' => 'CheckableType', + 'choice' => 'ChoiceType', 'form' => 'ChildFormType', - 'datalist' => 'DatalistType', + 'entity' => 'EntityType', 'collection' => 'CollectionType', 'repeated' => 'RepeatedType', 'static' => 'StaticType', @@ -232,7 +232,7 @@ public function hasCustomField($name) /** * @param object $model - * @return object|null + * @return object|array|null */ public function convertModelToArray($model) { @@ -300,7 +300,7 @@ public function getFieldValidationRules(FormField $field) /** * @param FormField[] $fields - * @return array + * @return Rules */ public function mergeFieldsRules($fields) { @@ -335,7 +335,7 @@ public function getBoolableFields(Form $form) { $fields = []; foreach ($form->getFields() as $name => $field) { - if ($field instanceof CheckboxType && $field->getOption('value') == CheckboxType::DEFAULT_VALUE) { + if ($field instanceof CheckableType && $field->getOption('value') == CheckableType::DEFAULT_VALUE) { $fields[] = $this->transformToDotSyntax($name); } } @@ -432,7 +432,7 @@ public function appendMessagesWithPrefix(MessageBag $messageBag, $prefix, array */ public function transformToDotSyntax($string) { - return str_replace(['.', '[]', '[', ']'], ['_', '', '.', ''], $string); + return str_replace(['.', '[]', '[', ']'], ['_', '', '.', ''], $string ?? ''); } /** diff --git a/src/helpers.php b/src/helpers.php index 1cd30d0..87a25b4 100644 --- a/src/helpers.php +++ b/src/helpers.php @@ -36,6 +36,13 @@ function helpBlockPath() } +if (! function_exists('labelBlockPath')) { + function labelBlockPath() + { + return getFormBuilderViewPath('label.php'); + } +} + if (! function_exists('form')) { function form(Form $form, array $options = []) @@ -134,3 +141,18 @@ function form_fields(Form $form, array $options = []) } } + +if (! function_exists('render_form_attributes')) { + function render_form_attributes(array $attributes) + { + if (empty($attributes)) { + return ''; + } + $attr = ''; + foreach ($attributes as $key => $value) { + $attr .= $key.'="'.$value.'" '; + } + + return $attr; + } +} diff --git a/src/tests/Console/FormGeneratorTest.php b/src/tests/Console/FormGeneratorTest.php index f90820f..4a3daff 100644 --- a/src/tests/Console/FormGeneratorTest.php +++ b/src/tests/Console/FormGeneratorTest.php @@ -12,7 +12,7 @@ class FormGeneratorTest extends TestCase public function setUp(): void { - $this->formGenerator = new FormGenerator(); + $this->formGenerator = new FormGenerator; } /** @test */ diff --git a/src/tests/Fields/CollectionTypeTest.php b/src/tests/Fields/CollectionTypeTest.php index 60ce6ab..956976b 100644 --- a/src/tests/Fields/CollectionTypeTest.php +++ b/src/tests/Fields/CollectionTypeTest.php @@ -109,13 +109,13 @@ public function it_creates_collection_with_child_form() /** @test */ public function it_creates_collection_with_child_form_with_correct_model() { - $model = new DummyEloquentModel(); + $model = new DummyEloquentModel; $form = clone $this->plainForm; $form->setModel($model); $data = new \Illuminate\Support\Collection([ - new DummyEloquentModel2(), - new DummyEloquentModel2(), + new DummyEloquentModel2, + new DummyEloquentModel2, ]); $options = [ @@ -139,11 +139,11 @@ public function it_creates_collection_with_child_form_with_correct_model() public function it_creates_collection_with_child_form_with_correct_model_properties() { $items = new \Illuminate\Support\Collection([ - (new DummyEloquentModel2())->forceFill(['id' => 1, 'foo' => 'bar']), - (new DummyEloquentModel2())->forceFill(['id' => 2, 'foo' => 'baz']), + (new DummyEloquentModel2)->forceFill(['id' => 1, 'foo' => 'bar']), + (new DummyEloquentModel2)->forceFill(['id' => 2, 'foo' => 'baz']), ]); - $model = (new DummyEloquentModel())->forceFill(['id' => 11]); + $model = (new DummyEloquentModel)->forceFill(['id' => 11]); $model->setRelation('items', $items); $form = $this->formBuilder->create('\LaravelFormBuilderCollectionTypeTest\Forms\NamespacedDummyFormCollectionForm', [ @@ -231,7 +231,7 @@ public function it_uses_empty_model_for_empty_row_child_form() { $items = new \Illuminate\Support\Collection([]); - $model = (new DummyEloquentModel())->forceFill(['id' => 11]); + $model = (new DummyEloquentModel)->forceFill(['id' => 11]); $model->setRelation('items', $items); $form = $this->formBuilder->create('\LaravelFormBuilderCollectionTypeTest\Forms\NamespacedDummyFormCollectionForm', [ @@ -247,10 +247,10 @@ public function it_uses_empty_model_for_empty_row_child_form() public function it_uses_empty_model_for_proto_child_forms() { $items = new \Illuminate\Support\Collection([ - (new DummyEloquentModel2())->forceFill(['id' => 21, 'foo' => 'bar 21']), + (new DummyEloquentModel2)->forceFill(['id' => 21, 'foo' => 'bar 21']), ]); - $model = (new DummyEloquentModel())->forceFill(['id' => 21]); + $model = (new DummyEloquentModel)->forceFill(['id' => 21]); $model->setRelation('items', $items); $form = $this->formBuilder->create('\LaravelFormBuilderCollectionTypeTest\Forms\NamespacedDummyFormCollectionForm', [ @@ -267,10 +267,10 @@ public function it_uses_empty_model_for_proto_child_forms() public function it_uses_empty_model_for_new_collection_children_after_validation_error() { $items = new \Illuminate\Support\Collection([ - (new DummyEloquentModel2())->forceFill(['id' => 31, 'foo' => 'bar31']), + (new DummyEloquentModel2)->forceFill(['id' => 31, 'foo' => 'bar31']), ]); - $model = (new DummyEloquentModel())->forceFill(['id' => 31]); + $model = (new DummyEloquentModel)->forceFill(['id' => 31]); $model->setRelation('items', $items); $this->session([ @@ -323,7 +323,7 @@ public function buildForm() 'prefer_input' => true, 'empty_row' => true, 'empty_model' => function () { - return (new DummyEloquentModel2())->forceFill(['_custom' => true]); + return (new DummyEloquentModel2)->forceFill(['_custom' => true]); }, 'options' => [ 'class' => NamespacedDummyFormCollectionChildForm::class, diff --git a/src/tests/Filters/FilterResolverTest.php b/src/tests/Filters/FilterResolverTest.php index a707ba5..85b3f4d 100644 --- a/src/tests/Filters/FilterResolverTest.php +++ b/src/tests/Filters/FilterResolverTest.php @@ -18,7 +18,7 @@ public function it_resolve_alias_based_filter() public function it_resolve_object_based_filter() { $expected = \Kris\LaravelFormBuilder\Filters\FilterInterface::class; - $filterObj = new Trim(); + $filterObj = new Trim; $resolver = $this->filtersResolver; $resolvedFilterObj = $resolver::instance($filterObj); @@ -39,7 +39,7 @@ public function it_throws_an_exception_if_object_is_not_instance_of_filterinterf { $this->expectException(\Kris\LaravelFormBuilder\Filters\Exception\InvalidInstanceException::class); - $invalidFilterObj = new stdClass(); + $invalidFilterObj = new stdClass; $resolver = $this->filtersResolver; $resolver::instance($invalidFilterObj); } diff --git a/src/tests/FormBuilderTest.php b/src/tests/FormBuilderTest.php index c849ffb..2ffe3bf 100644 --- a/src/tests/FormBuilderTest.php +++ b/src/tests/FormBuilderTest.php @@ -150,7 +150,7 @@ public function it_can_set_form_helper_once_and_call_build_form() /** @test */ public function it_appends_default_namespace_from_config_on_building() { - $form = new LaravelFormBuilderTest\Forms\NamespacedDummyForm(); + $form = new LaravelFormBuilderTest\Forms\NamespacedDummyForm; $config = $this->config; $config['default_namespace'] = 'LaravelFormBuilderTest\Forms'; $formHelper = new FormHelper($this->view, $this->translator, $config); diff --git a/src/tests/FormBuilderTestCase.php b/src/tests/FormBuilderTestCase.php index 1b76a23..5cce804 100644 --- a/src/tests/FormBuilderTestCase.php +++ b/src/tests/FormBuilderTestCase.php @@ -188,7 +188,7 @@ public function setUp(): void $this->request->setLaravelSession($this->app['session.store']); $this->validatorFactory = $this->app['validator']; $this->eventDispatcher = $this->app['events']; - $this->model = new TestModel(); + $this->model = new TestModel; $this->config = include __DIR__.'/../src/config/config.php'; $this->formHelper = new FormHelper($this->view, $this->translator, $this->config); @@ -196,7 +196,7 @@ public function setUp(): void $this->plainForm = $this->formBuilder->plain(); - $this->filtersResolver = new FilterResolver(); + $this->filtersResolver = new FilterResolver; } public function tearDown(): void diff --git a/src/tests/FormTest.php b/src/tests/FormTest.php index 051c647..dd17464 100644 --- a/src/tests/FormTest.php +++ b/src/tests/FormTest.php @@ -1127,11 +1127,11 @@ public function it_returns_binded_field_filters() $expected = [ 'test_field' => [ - 'Trim' => new \Kris\LaravelFormBuilder\Filters\Collection\Trim(), - 'Uppercase' => new \Kris\LaravelFormBuilder\Filters\Collection\Uppercase(), + 'Trim' => new \Kris\LaravelFormBuilder\Filters\Collection\Trim, + 'Uppercase' => new \Kris\LaravelFormBuilder\Filters\Collection\Uppercase, ], 'test_field2' => [ - 'Uppercase' => new \Kris\LaravelFormBuilder\Filters\Collection\Uppercase(), + 'Uppercase' => new \Kris\LaravelFormBuilder\Filters\Collection\Uppercase, ], ];