Do not use Arrays::walk as it messes up keys

juniwalk · Jan 29, 2024 · 0224dbb · 0224dbb
1 parent 49ce753
commit 0224dbb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/src/Controls/CheckboxListEnum.php b/src/Controls/CheckboxListEnum.php
@@ -40,13 +40,15 @@ public function getCases(): array
 	 */
 	public function setItems(array $enums, bool $useKeys = true): self
 	{
-		$items = Arrays::walk($enums, function(LabeledEnum $enum) {
+		$items = [];
+
+		foreach ($enums as $enum) {
 			if (!$enum instanceof $this->enumType) {
 				throw new InvalidArgumentException('Enum does not match items of type '.$this->enumType);
 			}
 
-			yield $enum->value => $enum->label();
-		});
+			$items[$enum->value] = $enum->label();
+		}
 
 		return parent::setItems($items, $useKeys);
 	}

diff --git a/src/Controls/RadioListEnum.php b/src/Controls/RadioListEnum.php
@@ -40,13 +40,15 @@ public function getCases(): array
 	 */
 	public function setItems(array $enums, bool $useKeys = true): self
 	{
-		$items = Arrays::walk($enums, function(LabeledEnum $enum) {
+		$items = [];
+
+		foreach ($enums as $enum) {
 			if (!$enum instanceof $this->enumType) {
 				throw new InvalidArgumentException('Enum does not match items of type '.$this->enumType);
 			}
 
-			yield $enum->value => $enum->label();
-		});
+			$items[$enum->value] = $enum->label();
+		}
 
 		return parent::setItems($items, $useKeys);
 	}

diff --git a/src/Controls/SelectBoxEnum.php b/src/Controls/SelectBoxEnum.php
@@ -35,13 +35,15 @@ public function setEnumType(string $enumType): self
 	 */
 	public function setItems(array $enums, bool $useKeys = true, bool $badge = false): self
 	{
-		$items = Arrays::walk($enums, function(LabeledEnum $enum) use ($badge) {
+		$items = [];
+
+		foreach ($enums as $enum) {
 			if (!$enum instanceof $this->enumType) {
 				throw new InvalidArgumentException('Enum does not match items of type '.$this->enumType);
 			}
 
-			yield $enum->value => Html::optionEnum($enum, $badge);
-		});
+			$items[$enum->value] = Html::optionEnum($enum, $badge);
+		}
 
 		return parent::setItems($items, $useKeys);
 	}