Fix ActiveField::checkbox()/radio() dropping label for extensions with enclosedByLabel=false. (#21057)

Author: terabytesoftw

framework/CHANGELOG.md

@@ -154,6 +154,7 @@ Yii Framework 2 Change Log
 - Bug #16043: Fix `yii\db\oci\Schema::findColumns()` to report `null` size for `DATE`, `TIMESTAMP` and `INTERVAL` columns instead of their internal storage byte length (terabytesoftw)
 - Bug #12763: Apply an explicitly configured PostgreSQL `defaultSchema` as the session `search_path` when opening the connection (terabytesoftw)
 - Bug #19852: Use the connection passed to `ActiveQuery` result methods for schema reflection and typecasting while populating records (terabytesoftw)
+- Bug #21110: Fix `ActiveField::checkbox()`/`radio()` dropping label for extensions with `enclosedByLabel=false` (terabytesoftw)
 
 2.0.56 under development
 ------------------------

framework/widgets/ActiveField.php

@@ -575,12 +575,12 @@ public function radio($options = [], $enclosedByLabel = true)
         $this->addAriaAttributes($options);
         $this->adjustLabelFor($options);
 
-        if (!$enclosedByLabel) {
+        if ($enclosedByLabel || (array_key_exists('label', $options) && $options['label'] === false)) {
+            $this->parts['{label}'] ??= '';
+        } else {
             $options = $this->generateLabel($options);
         }
 
-        $this->parts['{label}'] ??= '';
-
         $this->parts['{input}'] = Html::activeRadio($this->model, $this->attribute, $options);
 
         return $this;
@@ -622,12 +622,12 @@ public function checkbox($options = [], $enclosedByLabel = true)
         $this->addAriaAttributes($options);
         $this->adjustLabelFor($options);
 
-        if (!$enclosedByLabel) {
+        if ($enclosedByLabel || (array_key_exists('label', $options) && $options['label'] === false)) {
+            $this->parts['{label}'] ??= '';
+        } else {
             $options = $this->generateLabel($options);
         }
 
-        $this->parts['{label}'] ??= '';
-
         $this->parts['{input}'] = Html::activeCheckbox($this->model, $this->attribute, $options);
 
         return $this;

tests/framework/widgets/ActiveFieldTest.php

@@ -1028,6 +1028,28 @@ public function testCheckboxEnclosedByLabelFalse(array $options, string $expecte
         );
     }
 
+    public function testRadioEnclosedByLabelFalseWithoutLabelOption(): void
+    {
+        $this->activeField->radio([], false);
+
+        self::assertArrayNotHasKey(
+            '{label}',
+            $this->activeField->parts,
+            'Label part must remain unset so render() generates it from the model.',
+        );
+    }
+
+    public function testCheckboxEnclosedByLabelFalseWithoutLabelOption(): void
+    {
+        $this->activeField->checkbox([], false);
+
+        self::assertArrayNotHasKey(
+            '{label}',
+            $this->activeField->parts,
+            'Label part must remain unset so render() generates it from the model.',
+        );
+    }
+
     public function testRadioEnclosedByLabelFalsePreservesExistingLabel(): void
     {
         $this->activeField->label('Existing Label');