From 8489f2ef91539cd62b277f0d9e3aafcbeeca2921 Mon Sep 17 00:00:00 2001
From: Yevgeny Tomenko <skie@mail.ru>
Date: Sun, 17 Nov 2024 03:00:05 +0300
Subject: [PATCH 1/4] implements container.formGroupClass parameter to pass or
 disable class different from form-group to containers

---
 src/View/Helper/FormHelper.php | 69 +++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/src/View/Helper/FormHelper.php b/src/View/Helper/FormHelper.php
index b7d5c6ab..bbc2f0e8 100644
--- a/src/View/Helper/FormHelper.php
+++ b/src/View/Helper/FormHelper.php
@@ -148,28 +148,27 @@ class FormHelper extends CoreFormHelper
             '{{input}}{{label}}',
         'datetimeContainer' =>
             '<div{{containerAttrs}} ' .
-                'class="{{containerClass}}form-group {{type}}{{required}}">{{content}}{{help}}</div>',
+                'class="{{containerClass}}{{formGroupClass}} {{type}}{{required}}">{{content}}{{help}}</div>',
         'datetimeContainerError' =>
             '<div{{containerAttrs}} ' .
-                'class="{{containerClass}}form-group {{formGroupPosition}}{{type}}{{required}} is-invalid">' .
+                'class="{{containerClass}}{{formGroupClass}} {{formGroupPosition}}{{type}}{{required}} is-invalid">' .
                     '{{content}}{{error}}{{help}}</div>',
         'datetimeLabel' =>
             '<label{{attrs}}>{{text}}{{tooltip}}</label>',
         'inputContainer' =>
             '<div{{containerAttrs}} ' .
-                'class="{{containerClass}}form-group {{type}}{{required}}">{{content}}{{help}}</div>',
+                'class="{{containerClass}}{{formGroupClass}} {{type}}{{required}}">{{content}}{{help}}</div>',
         'inputContainerError' =>
             '<div{{containerAttrs}} ' .
-                'class="{{containerClass}}form-group {{formGroupPosition}}{{type}}{{required}} is-invalid">' .
+                'class="{{containerClass}}{{formGroupClass}} {{formGroupPosition}}{{type}}{{required}} is-invalid">' .
                     '{{content}}{{error}}{{help}}</div>',
         'checkboxContainer' =>
             '<div{{containerAttrs}} ' .
-                'class="{{containerClass}}form-group form-check{{variant}} ' .
-                    '{{type}}{{required}}">{{content}}{{help}}</div>',
+                'class="{{containerClass}}{{formGroupClass}} form-check{{variant}} {{type}}{{required}}">{{content}}{{help}}</div>',
         'checkboxContainerError' =>
             '<div{{containerAttrs}} ' .
-                'class="{{containerClass}}form-group form-check{{variant}} ' .
-                    '{{formGroupPosition}}{{type}}{{required}} is-invalid">{{content}}{{error}}{{help}}</div>',
+                'class="{{containerClass}}{{formGroupClass}} form-check{{variant}} {{formGroupPosition}}{{type}}{{required}} is-invalid">' .
+                    '{{content}}{{error}}{{help}}</div>',
         'checkboxInlineContainer' =>
             '<div{{containerAttrs}} ' .
                 'class="{{containerClass}}form-check{{variant}} form-check-inline align-top {{type}}{{required}}">' .
@@ -185,11 +184,11 @@ class FormHelper extends CoreFormHelper
         'checkboxInlineWrapper' =>
             '<div class="form-check{{variant}} form-check-inline">{{label}}</div>',
         'radioContainer' =>
-            '<div{{containerAttrs}} class="{{containerClass}}form-group {{type}}{{required}}" role="group" ' .
+            '<div{{containerAttrs}} class="{{containerClass}}{{formGroupClass}} {{type}}{{required}}" role="group" ' .
                 'aria-labelledby="{{groupId}}">{{content}}{{help}}</div>',
         'radioContainerError' =>
             '<div{{containerAttrs}} ' .
-                'class="{{containerClass}}form-group {{formGroupPosition}}{{type}}{{required}} is-invalid" ' .
+                'class="{{containerClass}}{{formGroupClass}} {{formGroupPosition}}{{type}}{{required}} is-invalid" ' .
                     'role="group" aria-labelledby="{{groupId}}">{{content}}{{error}}{{help}}</div>',
         'radioLabel' =>
             '<label{{attrs}}>{{text}}{{tooltip}}</label>',
@@ -204,11 +203,11 @@ class FormHelper extends CoreFormHelper
         'inputGroupText' =>
             '<span class="input-group-text">{{content}}</span>',
         'multicheckboxContainer' =>
-            '<div{{containerAttrs}} class="{{containerClass}}form-group {{type}}{{required}}" role="group" ' .
+            '<div{{containerAttrs}} class="{{containerClass}}{{formGroupClass}} {{type}}{{required}}" role="group" ' .
                 'aria-labelledby="{{groupId}}">{{content}}{{help}}</div>',
         'multicheckboxContainerError' =>
             '<div{{containerAttrs}} ' .
-                'class="{{containerClass}}form-group {{formGroupPosition}}{{type}}{{required}} is-invalid" ' .
+                'class="{{containerClass}}{{formGroupClass}} {{formGroupPosition}}{{type}}{{required}} is-invalid" ' .
                     'role="group" aria-labelledby="{{groupId}}">{{content}}{{error}}{{help}}</div>',
         'multicheckboxLabel' =>
             '<label{{attrs}}>{{text}}{{tooltip}}</label>',
@@ -244,31 +243,31 @@ class FormHelper extends CoreFormHelper
                         '{{formGroupPosition}}{{type}}{{required}} is-invalid">{{content}}{{error}}{{help}}</div>',
             'datetimeContainer' =>
                 '<div{{containerAttrs}} ' .
-                    'class="{{containerClass}}form-group {{formGroupPosition}}{{type}}{{required}}">' .
+                    'class="{{containerClass}}{{formGroupClass}} {{formGroupPosition}}{{type}}{{required}}">' .
                         '{{content}}{{help}}</div>',
             'datetimeContainerError' =>
                 '<div{{containerAttrs}} ' .
-                    'class="{{containerClass}}form-group {{formGroupPosition}}{{type}}{{required}} is-invalid">' .
+                    'class="{{containerClass}}{{formGroupClass}} {{formGroupPosition}}{{type}}{{required}} is-invalid">' .
                         '{{content}}{{error}}{{help}}</div>',
             'datetimeLabel' =>
                 '<label{{attrs}}>{{text}}{{tooltip}}</label>',
             'radioContainer' =>
                 '<div{{containerAttrs}} ' .
-                    'class="{{containerClass}}form-group {{formGroupPosition}}{{type}}{{required}}" role="group" ' .
+                    'class="{{containerClass}}{{formGroupClass}} {{formGroupPosition}}{{type}}{{required}}" role="group" ' .
                         'aria-labelledby="{{groupId}}">{{content}}{{help}}</div>',
             'radioContainerError' =>
                 '<div{{containerAttrs}} ' .
-                    'class="{{containerClass}}form-group {{formGroupPosition}}{{type}}{{required}} is-invalid" ' .
+                    'class="{{containerClass}}{{formGroupClass}} {{formGroupPosition}}{{type}}{{required}} is-invalid" ' .
                         'role="group" aria-labelledby="{{groupId}}">{{content}}{{error}}{{help}}</div>',
             'radioLabel' =>
                 '<span{{attrs}}>{{text}}{{tooltip}}</span>',
             'multicheckboxContainer' =>
                 '<div{{containerAttrs}} ' .
-                    'class="{{containerClass}}form-group d-flex {{formGroupPosition}}{{type}}{{required}}" ' .
+                    'class="{{containerClass}}{{formGroupClass}} d-flex {{formGroupPosition}}{{type}}{{required}}" ' .
                         'role="group" aria-labelledby="{{groupId}}">{{content}}{{help}}</div>',
             'multicheckboxContainerError' =>
                 '<div{{containerAttrs}} ' .
-                    'class="{{containerClass}}form-group d-flex ' .
+                    'class="{{containerClass}}{{formGroupClass}} d-flex ' .
                         '{{formGroupPosition}}{{type}}{{required}} is-invalid" ' .
                             'role="group" aria-labelledby="{{groupId}}">{{content}}{{error}}{{help}}</div>',
             'multicheckboxLabel' =>
@@ -289,47 +288,47 @@ class FormHelper extends CoreFormHelper
                 '<div class="%s"><div class="form-check{{variant}}">{{input}}{{label}}{{error}}{{help}}</div></div>',
             'datetimeContainer' =>
                 '<div{{containerAttrs}} ' .
-                    'class="{{containerClass}}form-group row {{type}}{{required}}">{{content}}</div>',
+                    'class="{{containerClass}}{{formGroupClass}} row {{type}}{{required}}">{{content}}</div>',
             'datetimeContainerError' =>
                 '<div{{containerAttrs}} ' .
-                    'class="{{containerClass}}form-group row {{formGroupPosition}}{{type}}{{required}} is-invalid">' .
+                    'class="{{containerClass}}{{formGroupClass}} row {{formGroupPosition}}{{type}}{{required}} is-invalid">' .
                         '{{content}}</div>',
             'datetimeLabel' =>
                 '<label{{attrs}}>{{text}}{{tooltip}}</label>',
             'checkboxInlineFormGroup' =>
                 '<div class="%s"><div class="form-check{{variant}} form-check-inline">{{input}}{{label}}</div></div>',
             'submitContainer' =>
-                '<div{{containerAttrs}} class="{{containerClass}}form-group row">' .
+                '<div{{containerAttrs}} class="{{containerClass}}{{formGroupClass}} row">' .
                     '<div class="%s">{{content}}</div></div>',
             'inputContainer' =>
-                '<div{{containerAttrs}} class="{{containerClass}}form-group row {{type}}{{required}}">' .
+                '<div{{containerAttrs}} class="{{containerClass}}{{formGroupClass}} row {{type}}{{required}}">' .
                     '{{content}}</div>',
             'inputContainerError' =>
                 '<div{{containerAttrs}} ' .
-                    'class="{{containerClass}}form-group row {{formGroupPosition}}{{type}}{{required}} is-invalid">' .
+                    'class="{{containerClass}}{{formGroupClass}} row {{formGroupPosition}}{{type}}{{required}} is-invalid">' .
                         '{{content}}</div>',
             'checkboxContainer' =>
-                '<div{{containerAttrs}} class="{{containerClass}}form-group row {{type}}{{required}}">' .
+                '<div{{containerAttrs}} class="{{containerClass}}{{formGroupClass}} row {{type}}{{required}}">' .
                     '{{content}}</div>',
             'checkboxContainerError' =>
                 '<div{{containerAttrs}} ' .
-                    'class="{{containerClass}}form-group row {{formGroupPosition}}{{type}}{{required}} is-invalid">' .
+                    'class="{{containerClass}}{{formGroupClass}} row {{formGroupPosition}}{{type}}{{required}} is-invalid">' .
                         '{{content}}</div>',
             'radioContainer' =>
-                '<div{{containerAttrs}} class="{{containerClass}}form-group row {{type}}{{required}}" role="group" ' .
+                '<div{{containerAttrs}} class="{{containerClass}}{{formGroupClass}} row {{type}}{{required}}" role="group" ' .
                     'aria-labelledby="{{groupId}}">{{content}}</div>',
             'radioContainerError' =>
                 '<div{{containerAttrs}} ' .
-                    'class="{{containerClass}}form-group row {{formGroupPosition}}{{type}}{{required}} is-invalid" ' .
+                    'class="{{containerClass}}{{formGroupClass}} row {{formGroupPosition}}{{type}}{{required}} is-invalid" ' .
                         'role="group" aria-labelledby="{{groupId}}">{{content}}</div>',
             'radioLabel' =>
                 '<label{{attrs}}>{{text}}{{tooltip}}</label>',
             'multicheckboxContainer' =>
-                '<div{{containerAttrs}} class="{{containerClass}}form-group row {{type}}{{required}}" role="group" ' .
+                '<div{{containerAttrs}} class="{{containerClass}}{{formGroupClass}} row {{type}}{{required}}" role="group" ' .
                     'aria-labelledby="{{groupId}}">{{content}}</div>',
             'multicheckboxContainerError' =>
                 '<div{{containerAttrs}} ' .
-                    'class="{{containerClass}}form-group row {{formGroupPosition}}{{type}}{{required}} is-invalid" ' .
+                    'class="{{containerClass}}{{formGroupClass}} row {{formGroupPosition}}{{type}}{{required}} is-invalid" ' .
                         'role="group" aria-labelledby="{{groupId}}">{{content}}</div>',
             'multicheckboxLabel' =>
                 '<label{{attrs}}>{{text}}{{tooltip}}</label>',
@@ -658,13 +657,15 @@ protected function _containerOptions(?string $fieldName, array $options): array
             $options['container'] = $this->injectClasses('form-floating', (array)($options['container'] ?? []));
         }
 
-        if (!isset($options['container'])) {
-            return $options;
-        }
-
-        $containerOptions = $options['container'];
+        $containerOptions = $options['container'] ?? [];
         unset($options['container']);
 
+        $options['templateVars']['formGroupClass'] = 'form-group';
+        if (isset($containerOptions['formGroupClass'])) {
+            $options['templateVars']['formGroupClass'] = $containerOptions['formGroupClass'];
+            unset($containerOptions['formGroupClass']);
+        }
+
         if (isset($containerOptions['class'])) {
             $options['templateVars']['containerClass'] = $containerOptions['class'] . ' ';
             unset($containerOptions['class']);

From 800d6adb22b6bf3a06f63652a32e54a058ed7956 Mon Sep 17 00:00:00 2001
From: Yevgeny Tomenko <skie@mail.ru>
Date: Sun, 17 Nov 2024 03:36:43 +0300
Subject: [PATCH 2/4] fix line length issue

---
 src/View/Helper/FormHelper.php | 67 ++++++++++++++++++++++------------
 1 file changed, 43 insertions(+), 24 deletions(-)

diff --git a/src/View/Helper/FormHelper.php b/src/View/Helper/FormHelper.php
index bbc2f0e8..0c286d16 100644
--- a/src/View/Helper/FormHelper.php
+++ b/src/View/Helper/FormHelper.php
@@ -164,11 +164,13 @@ class FormHelper extends CoreFormHelper
                     '{{content}}{{error}}{{help}}</div>',
         'checkboxContainer' =>
             '<div{{containerAttrs}} ' .
-                'class="{{containerClass}}{{formGroupClass}} form-check{{variant}} {{type}}{{required}}">{{content}}{{help}}</div>',
+                'class="{{containerClass}}{{formGroupClass}} form-check{{variant}} ' .
+                '{{type}}{{required}}">{{content}}{{help}}</div>',
         'checkboxContainerError' =>
             '<div{{containerAttrs}} ' .
-                'class="{{containerClass}}{{formGroupClass}} form-check{{variant}} {{formGroupPosition}}{{type}}{{required}} is-invalid">' .
-                    '{{content}}{{error}}{{help}}</div>',
+                'class="{{containerClass}}{{formGroupClass}} form-check{{variant}} ' .
+                '{{formGroupPosition}}{{type}}{{required}} is-invalid">' .
+                '{{content}}{{error}}{{help}}</div>',
         'checkboxInlineContainer' =>
             '<div{{containerAttrs}} ' .
                 'class="{{containerClass}}form-check{{variant}} form-check-inline align-top {{type}}{{required}}">' .
@@ -247,18 +249,23 @@ class FormHelper extends CoreFormHelper
                         '{{content}}{{help}}</div>',
             'datetimeContainerError' =>
                 '<div{{containerAttrs}} ' .
-                    'class="{{containerClass}}{{formGroupClass}} {{formGroupPosition}}{{type}}{{required}} is-invalid">' .
-                        '{{content}}{{error}}{{help}}</div>',
+                    'class="{{containerClass}}{{formGroupClass}} ' .
+                    '{{formGroupPosition}}{{type}}{{required}} is-invalid">' .
+                    '{{content}}{{error}}{{help}}</div>',
             'datetimeLabel' =>
                 '<label{{attrs}}>{{text}}{{tooltip}}</label>',
             'radioContainer' =>
                 '<div{{containerAttrs}} ' .
-                    'class="{{containerClass}}{{formGroupClass}} {{formGroupPosition}}{{type}}{{required}}" role="group" ' .
-                        'aria-labelledby="{{groupId}}">{{content}}{{help}}</div>',
+                    'class="{{containerClass}}{{formGroupClass}} ' .
+                    '{{formGroupPosition}}{{type}}{{required}}" ' .
+                    'role="group" aria-labelledby="{{groupId}}">' .
+                    '{{content}}{{help}}</div>',
             'radioContainerError' =>
                 '<div{{containerAttrs}} ' .
-                    'class="{{containerClass}}{{formGroupClass}} {{formGroupPosition}}{{type}}{{required}} is-invalid" ' .
-                        'role="group" aria-labelledby="{{groupId}}">{{content}}{{error}}{{help}}</div>',
+                    'class="{{containerClass}}{{formGroupClass}} ' .
+                    '{{formGroupPosition}}{{type}}{{required}} is-invalid" ' .
+                    'role="group" aria-labelledby="{{groupId}}">' .
+                    '{{content}}{{error}}{{help}}</div>',
             'radioLabel' =>
                 '<span{{attrs}}>{{text}}{{tooltip}}</span>',
             'multicheckboxContainer' =>
@@ -291,8 +298,9 @@ class FormHelper extends CoreFormHelper
                     'class="{{containerClass}}{{formGroupClass}} row {{type}}{{required}}">{{content}}</div>',
             'datetimeContainerError' =>
                 '<div{{containerAttrs}} ' .
-                    'class="{{containerClass}}{{formGroupClass}} row {{formGroupPosition}}{{type}}{{required}} is-invalid">' .
-                        '{{content}}</div>',
+                    'class="{{containerClass}}{{formGroupClass}} row ' .
+                    '{{formGroupPosition}}{{type}}{{required}} is-invalid">' .
+                    '{{content}}</div>',
             'datetimeLabel' =>
                 '<label{{attrs}}>{{text}}{{tooltip}}</label>',
             'checkboxInlineFormGroup' =>
@@ -305,31 +313,42 @@ class FormHelper extends CoreFormHelper
                     '{{content}}</div>',
             'inputContainerError' =>
                 '<div{{containerAttrs}} ' .
-                    'class="{{containerClass}}{{formGroupClass}} row {{formGroupPosition}}{{type}}{{required}} is-invalid">' .
-                        '{{content}}</div>',
+                    'class="{{containerClass}}{{formGroupClass}} row ' .
+                    '{{formGroupPosition}}{{type}}{{required}} is-invalid">' .
+                    '{{content}}</div>',
             'checkboxContainer' =>
-                '<div{{containerAttrs}} class="{{containerClass}}{{formGroupClass}} row {{type}}{{required}}">' .
+                '<div{{containerAttrs}} ' .
+                    'class="{{containerClass}}{{formGroupClass}} row {{type}}{{required}}">' .
                     '{{content}}</div>',
             'checkboxContainerError' =>
                 '<div{{containerAttrs}} ' .
-                    'class="{{containerClass}}{{formGroupClass}} row {{formGroupPosition}}{{type}}{{required}} is-invalid">' .
-                        '{{content}}</div>',
+                    'class="{{containerClass}}{{formGroupClass}} row ' .
+                    '{{formGroupPosition}}{{type}}{{required}} is-invalid">' .
+                    '{{content}}</div>',
             'radioContainer' =>
-                '<div{{containerAttrs}} class="{{containerClass}}{{formGroupClass}} row {{type}}{{required}}" role="group" ' .
-                    'aria-labelledby="{{groupId}}">{{content}}</div>',
+                '<div{{containerAttrs}} ' .
+                    'class="{{containerClass}}{{formGroupClass}} row {{type}}{{required}}" ' .
+                    'role="group" aria-labelledby="{{groupId}}">' .
+                    '{{content}}</div>',
             'radioContainerError' =>
                 '<div{{containerAttrs}} ' .
-                    'class="{{containerClass}}{{formGroupClass}} row {{formGroupPosition}}{{type}}{{required}} is-invalid" ' .
-                        'role="group" aria-labelledby="{{groupId}}">{{content}}</div>',
+                    'class="{{containerClass}}{{formGroupClass}} row ' .
+                    '{{formGroupPosition}}{{type}}{{required}} is-invalid" ' .
+                    'role="group" aria-labelledby="{{groupId}}">' .
+                    '{{content}}</div>',
             'radioLabel' =>
                 '<label{{attrs}}>{{text}}{{tooltip}}</label>',
             'multicheckboxContainer' =>
-                '<div{{containerAttrs}} class="{{containerClass}}{{formGroupClass}} row {{type}}{{required}}" role="group" ' .
-                    'aria-labelledby="{{groupId}}">{{content}}</div>',
+                '<div{{containerAttrs}} ' .
+                    'class="{{containerClass}}{{formGroupClass}} row {{type}}{{required}}" ' .
+                    'role="group" aria-labelledby="{{groupId}}">' .
+                    '{{content}}</div>',
             'multicheckboxContainerError' =>
                 '<div{{containerAttrs}} ' .
-                    'class="{{containerClass}}{{formGroupClass}} row {{formGroupPosition}}{{type}}{{required}} is-invalid" ' .
-                        'role="group" aria-labelledby="{{groupId}}">{{content}}</div>',
+                    'class="{{containerClass}}{{formGroupClass}} row ' .
+                    '{{formGroupPosition}}{{type}}{{required}} is-invalid" ' .
+                    'role="group" aria-labelledby="{{groupId}}">' .
+                    '{{content}}</div>',
             'multicheckboxLabel' =>
                 '<label{{attrs}}>{{text}}{{tooltip}}</label>',
         ],

From 074628e77d45f7c070575b0b5e56b33d66a96e96 Mon Sep 17 00:00:00 2001
From: Yevgeny Tomenko <skie@mail.ru>
Date: Sun, 17 Nov 2024 03:48:00 +0300
Subject: [PATCH 3/4] added tests cases covering custom form-group

---
 tests/TestCase/View/Helper/FormHelperTest.php | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/tests/TestCase/View/Helper/FormHelperTest.php b/tests/TestCase/View/Helper/FormHelperTest.php
index 0996be03..aa01ab5a 100644
--- a/tests/TestCase/View/Helper/FormHelperTest.php
+++ b/tests/TestCase/View/Helper/FormHelperTest.php
@@ -1822,4 +1822,56 @@ public function testFloatingLabelPlaceholderGenerationForIdField()
         ];
         $this->assertHtml($expected, $result);
     }
+
+    public function testFormGroupClassOverride()
+    {
+        $this->article['required']['title'] = false;
+        $this->Form->create($this->article);
+
+        $result = $this->Form->control('title', [
+            'container' => [
+                'formGroupClass' => 'custom-form-group',
+            ],
+        ]);
+        $expected = [
+            ['div' => ['class' => 'mb-3 custom-form-group text']],
+                ['label' => ['class' => 'form-label', 'for' => 'title']],
+                    'Title',
+                '/label',
+                'input' => [
+                    'type' => 'text',
+                    'name' => 'title',
+                    'id' => 'title',
+                    'class' => 'form-control',
+                ],
+            '/div',
+        ];
+        $this->assertHtml($expected, $result);
+    }
+
+    public function testFormGroupClassEmpty()
+    {
+        $this->article['required']['title'] = false;
+        $this->Form->create($this->article);
+
+        $result = $this->Form->control('title', [
+            'container' => [
+                'formGroupClass' => '',
+            ],
+        ]);
+        $expected = [
+            ['div' => ['class' => 'mb-3  text']],
+                ['label' => ['class' => 'form-label', 'for' => 'title']],
+                    'Title',
+                '/label',
+                'input' => [
+                    'type' => 'text',
+                    'name' => 'title',
+                    'id' => 'title',
+                    'class' => 'form-control',
+                ],
+            '/div',
+        ];
+        $this->assertHtml($expected, $result);
+    }
 }

From 810d6eb5c60080be87c39ecfa105af9140f66e44 Mon Sep 17 00:00:00 2001
From: Yevgeny Tomenko <skie@mail.ru>
Date: Wed, 20 Nov 2024 07:52:40 +0300
Subject: [PATCH 4/4] simplify form-group detection logic

---
 src/View/Helper/FormHelper.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/View/Helper/FormHelper.php b/src/View/Helper/FormHelper.php
index 7824b335..fa58ef3b 100644
--- a/src/View/Helper/FormHelper.php
+++ b/src/View/Helper/FormHelper.php
@@ -601,11 +601,8 @@ protected function _containerOptions(?string $fieldName, array $options): array
         $containerOptions = $options['container'] ?? [];
         unset($options['container']);
 
-        $options['templateVars']['formGroupClass'] = 'form-group';
-        if (isset($containerOptions['formGroupClass'])) {
-            $options['templateVars']['formGroupClass'] = $containerOptions['formGroupClass'];
-            unset($containerOptions['formGroupClass']);
-        }
+        $options['templateVars']['formGroupClass'] = $containerOptions['formGroupClass'] ?? 'form-group';
+        unset($containerOptions['formGroupClass']);
 
         if (isset($containerOptions['class'])) {
             $options['templateVars']['containerClass'] = $containerOptions['class'] . ' ';