Fix bugs in ChoiceType's name

src/Kris/LaravelFormBuilder/Fields/ChoiceType.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace  Kris\LaravelFormBuilder\Fields;
+namespace Kris\LaravelFormBuilder\Fields;
 
 use Illuminate\Support\Arr;
 
@@ -28,25 +28,46 @@ protected function getTemplate()
     }
 
     /**
-     * Determine which choice type to use.
-     *
-     * @return string
+     * @inheritdoc
      */
-    protected function determineChoiceField()
+    protected function prepareOptions(array $options = [])
     {
-        $expanded = $this->options['expanded'];
-        $multiple = $this->options['multiple'];
+        parent::prepareOptions($options);
+
+        $expanded = $this->getOption('expanded', false);
+        $multiple = $this->getOption('multiple', false);
+
+        Arr::forget($this->options, ['attr.multiple']);
 
         if (!$expanded && $multiple) {
-            $this->options['attr']['multiple'] = true;
+            $this->setOption('attr.multiple', true);
         }
 
-        if ($expanded && !$multiple) {
-            return $this->choiceType = 'radio';
+        if ($this->getOption('attr.multiple') && !$this->getOption('tmp.multipleBracesSet')) {
+            $this->name = $this->name . '[]';
+            $this->setOption('tmp.multipleBracesSet', true);
         }
 
-        if ($expanded && $multiple) {
-            return $this->choiceType = 'checkbox';
+        if (!$this->getOption('attr.multiple') && $this->getOption('tmp.multipleBracesSet')) {
+            $this->name = preg_replace('/\[\]$/u', '', $this->name);
+            $this->setOption('tmp.multipleBracesSet', false);
+        }
+
+        return $this->options;
+    }
+
+    /**
+     * Determine which choice type to use.
+     *
+     * @return string
+     */
+    protected function determineChoiceField()
+    {
+        $expanded = $this->getOption('expanded', false);
+        $multiple = $this->getOption('multiple', false);
+
+        if ($expanded) {
+            return $this->choiceType = $multiple ? 'checkbox' : 'radio';
         }
 
         return $this->choiceType = 'select';
@@ -107,7 +128,7 @@ protected function buildCheckableChildren($fieldType)
     {
         $multiple = $this->getOption('multiple') ? '[]' : '';
 
-        $attr = $this->options['attr']?? [];
+        $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;

src/Kris/LaravelFormBuilder/Fields/FormField.php

@@ -306,6 +306,11 @@ protected function prepareOptions(array $options = [])
             $this->setOption('tmp.multipleBracesSet', true);
         }
 
+        if (!$this->getOption('attr.multiple') && $this->getOption('tmp.multipleBracesSet')) {
+            $this->name = preg_replace('/\[\]$/u', '', $this->name);
+            $this->setOption('tmp.multipleBracesSet', false);
+        }
+
         if ($this->parent->haveErrorsEnabled()) {
             $this->addErrorClass();
         }
@@ -406,7 +411,7 @@ protected function normalizeRules($rules)
      *
      * @param array $first first set of rules
      * @param array $second second set of rules
-     * @return array merged set of rules without duplicates 
+     * @return array merged set of rules without duplicates
      */
     protected function mergeRules($first, $second)
     {

src/Kris/LaravelFormBuilder/Fields/ParentType.php

@@ -60,7 +60,14 @@ public function setValue($val)
      */
     public function render(array $options = [], $showLabel = true, $showField = true, $showError = true)
     {
-        $options['children'] = $this->children;
+        if (!empty($options)) {
+            $this->prepareOptions($options);
+
+            $this->createChildren();
+        }
+
+        $this->setOption('children', $this->getChildren());
+
         return parent::render($options, $showLabel, $showField, $showError);
     }
 

src/Kris/LaravelFormBuilder/Form.php

@@ -171,7 +171,7 @@ public function rebuildForm()
         if ($this->isPlain()) {
             foreach ($this->fields as $name => $field) {
                 // Remove any temp variables added in previous instance
-                $options =  Arr::except($field->getOptions(), 'tmp');
+                $options = Arr::except($field->getOptions(), 'tmp');
                 $this->add($name, $field->getType(), $options);
             }
         } else {
@@ -187,7 +187,7 @@ public function rebuildForm()
      */
     protected function isPlain()
     {
-        if($this->formBuilder === null) {
+        if ($this->formBuilder === null) {
             throw new \RuntimeException('FormBuilder is not set');
         }
 
@@ -251,7 +251,6 @@ protected function addField(FormField $field, $modify = false)
             $this->preventDuplicate($field->getRealName());
         }
 
-
         if ($field->getType() == 'file') {
             $this->formOptions['files'] = true;
         }
@@ -399,8 +398,12 @@ public function modify($name, $type = 'text', array $options = [], $overwriteOpt
     {
         // If we don't want to overwrite options, we merge them with old options.
         if ($overwriteOptions === false && $this->has($name)) {
+            $fieldOptions = $this->getField($name)->getOptions();
+
+            Arr::forget($fieldOptions, ['tmp']);
+
             $options = $this->formHelper->mergeOptions(
-                $this->getField($name)->getOptions(),
+                $fieldOptions,
                 $options
             );
         }
@@ -878,7 +881,7 @@ public function getData($name = null, $default = null)
      * will be switched to protected in 1.7.
      * @param $data
      * @return $this
-     **/
+     */
     public function addData(array $data)
     {
         foreach ($data as $key => $value) {
@@ -988,7 +991,7 @@ public function setTranslationTemplate($template)
      * Render the form.
      *
      * @param array $options
-     * @param string $fields
+     * @param string[] $fields
      * @param bool $showStart
      * @param bool $showFields
      * @param bool $showEnd
@@ -1052,16 +1055,9 @@ protected function getTemplate()
      */
     protected function getUnrenderedFields()
     {
-        $unrenderedFields = [];
-
-        foreach ($this->fields as $field) {
-            if (!$field->isRendered()) {
-                $unrenderedFields[] = $field;
-                continue;
-            }
-        }
-
-        return $unrenderedFields;
+        return array_filter($this->fields, function ($field) {
+            return !$field->isRendered();
+        });
     }
 
     /**
@@ -1086,9 +1082,7 @@ protected function preventDuplicate($name)
      */
     protected function getFieldType($type)
     {
-        $fieldType = $this->formHelper->getFieldType($type);
-
-        return $fieldType;
+        return $this->formHelper->getFieldType($type);
     }
 
     /**
@@ -1480,6 +1474,7 @@ public function getFilters()
     public function lockFiltering()
     {
         $this->lockFiltering = true;
+
         return $this;
     }
 
@@ -1491,6 +1486,7 @@ public function lockFiltering()
     public function unlockFiltering()
     {
         $this->lockFiltering = false;
+
         return $this;
     }
 
@@ -1502,7 +1498,7 @@ public function unlockFiltering()
      */
     public function isFilteringLocked()
     {
-        return !$this->lockFiltering ? false : true;
+        return (bool)$this->lockFiltering;
     }
 
     /**