Minor refactor RadioList::renderUncheckInput() and CheckboxList::renderUncheckInput() (#259)

vjik · web-flow · commit c5efa8cf64d0 · 2025-12-12T22:44:19.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - New #249: Add `Tag::addStyle()` and `Tag::removeStyle()` methods (@vjik)
 - New #252: Add `Color` class, `Html::color()` and `Input::color()` methods (@razvbir)
+- Enh #259: Minor refactor `RadioList::renderUncheckInput()` and `CheckboxList::renderUncheckInput()` methods (@vjik)
 
 ## 3.11.0 June 10, 2025
 
diff --git a/src/Widget/CheckboxList/CheckboxList.php b/src/Widget/CheckboxList/CheckboxList.php
@@ -318,7 +318,7 @@ public function render(): string
 
         $html = [];
         if ($this->uncheckValue !== null) {
-            $html[] = $this->renderUncheckInput();
+            $html[] = $this->renderUncheckInput($this->uncheckValue);
         }
         if (!empty($this->containerTag)) {
             $html[] = Html::openTag($this->containerTag, $this->containerAttributes);
@@ -333,12 +333,12 @@ public function render(): string
         return implode("\n", $html);
     }
 
-    private function renderUncheckInput(): string
+    private function renderUncheckInput(string $uncheckValue): string
     {
         return
             Input::hidden(
                 Html::getNonArrayableName($this->name),
-                $this->uncheckValue,
+                $uncheckValue,
             )
                 ->addAttributes(
                     array_merge(
@@ -347,7 +347,7 @@ private function renderUncheckInput(): string
                             'disabled' => $this->checkboxAttributes['disabled'] ?? null,
                             'form' => $this->checkboxAttributes['form'] ?? null,
                         ],
-                        $this->individualInputAttributes[$this->uncheckValue] ?? [],
+                        $this->individualInputAttributes[$uncheckValue] ?? [],
                     ),
                 )
                 ->render();
diff --git a/src/Widget/RadioList/RadioList.php b/src/Widget/RadioList/RadioList.php
@@ -300,7 +300,7 @@ public function render(): string
 
         $html = [];
         if ($this->uncheckValue !== null) {
-            $html[] = $this->renderUncheckInput();
+            $html[] = $this->renderUncheckInput($this->uncheckValue);
         }
         if (!empty($this->containerTag)) {
             $html[] = Html::openTag($this->containerTag, $this->containerAttributes);
@@ -315,12 +315,12 @@ public function render(): string
         return implode("\n", $html);
     }
 
-    private function renderUncheckInput(): string
+    private function renderUncheckInput(string $uncheckValue): string
     {
         return
             Input::hidden(
                 Html::getNonArrayableName($this->name),
-                $this->uncheckValue,
+                $uncheckValue,
             )
                 ->addAttributes(
                     array_merge(
@@ -329,7 +329,7 @@ private function renderUncheckInput(): string
                             'disabled' => $this->radioAttributes['disabled'] ?? null,
                             'form' => $this->radioAttributes['form'] ?? null,
                         ],
-                        $this->individualInputAttributes[$this->uncheckValue] ?? [],
+                        $this->individualInputAttributes[$uncheckValue] ?? [],
                     ),
                 )
                 ->render();

Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ public function render(): string`
`318`	`318`
`319`	`319`	`$html = [];`
`320`	`320`	`if ($this->uncheckValue !== null) {`
`321`		`- $html[] = $this->renderUncheckInput();`
	`321`	`+ $html[] = $this->renderUncheckInput($this->uncheckValue);`
`322`	`322`	`}`
`323`	`323`	`if (!empty($this->containerTag)) {`
`324`	`324`	`$html[] = Html::openTag($this->containerTag, $this->containerAttributes);`
`@@ -333,12 +333,12 @@ public function render(): string`
`333`	`333`	`return implode("\n", $html);`
`334`	`334`	`}`
`335`	`335`
`336`		`- private function renderUncheckInput(): string`
	`336`	`+ private function renderUncheckInput(string $uncheckValue): string`
`337`	`337`	`{`
`338`	`338`	`return`
`339`	`339`	`Input::hidden(`
`340`	`340`	`Html::getNonArrayableName($this->name),`
`341`		`- $this->uncheckValue,`
	`341`	`+ $uncheckValue,`
`342`	`342`	`)`
`343`	`343`	`->addAttributes(`
`344`	`344`	`array_merge(`
`@@ -347,7 +347,7 @@ private function renderUncheckInput(): string`
`347`	`347`	`'disabled' => $this->checkboxAttributes['disabled'] ?? null,`
`348`	`348`	`'form' => $this->checkboxAttributes['form'] ?? null,`
`349`	`349`	`],`
`350`		`- $this->individualInputAttributes[$this->uncheckValue] ?? [],`
	`350`	`+ $this->individualInputAttributes[$uncheckValue] ?? [],`
`351`	`351`	`),`
`352`	`352`	`)`
`353`	`353`	`->render();`
Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ public function render(): string`
`300`	`300`
`301`	`301`	`$html = [];`
`302`	`302`	`if ($this->uncheckValue !== null) {`
`303`		`- $html[] = $this->renderUncheckInput();`
	`303`	`+ $html[] = $this->renderUncheckInput($this->uncheckValue);`
`304`	`304`	`}`
`305`	`305`	`if (!empty($this->containerTag)) {`
`306`	`306`	`$html[] = Html::openTag($this->containerTag, $this->containerAttributes);`
`@@ -315,12 +315,12 @@ public function render(): string`
`315`	`315`	`return implode("\n", $html);`
`316`	`316`	`}`
`317`	`317`
`318`		`- private function renderUncheckInput(): string`
	`318`	`+ private function renderUncheckInput(string $uncheckValue): string`
`319`	`319`	`{`
`320`	`320`	`return`
`321`	`321`	`Input::hidden(`
`322`	`322`	`Html::getNonArrayableName($this->name),`
`323`		`- $this->uncheckValue,`
	`323`	`+ $uncheckValue,`
`324`	`324`	`)`
`325`	`325`	`->addAttributes(`
`326`	`326`	`array_merge(`
`@@ -329,7 +329,7 @@ private function renderUncheckInput(): string`
`329`	`329`	`'disabled' => $this->radioAttributes['disabled'] ?? null,`
`330`	`330`	`'form' => $this->radioAttributes['form'] ?? null,`
`331`	`331`	`],`
`332`		`- $this->individualInputAttributes[$this->uncheckValue] ?? [],`
	`332`	`+ $this->individualInputAttributes[$uncheckValue] ?? [],`
`333`	`333`	`),`
`334`	`334`	`)`
`335`	`335`	`->render();`