Merge branch '6.4' into 7.3

xabbuh · xabbuh · commit 190d9750b565 · 2025-09-08T08:17:56.000+02:00
* 6.4:
  pass the empty string instead of null as key to array_key_exists()
diff --git a/ChoiceList/ArrayChoiceList.php b/ChoiceList/ArrayChoiceList.php
@@ -105,7 +105,7 @@ public function getChoicesForValues(array $values): array
         $choices = [];
 
         foreach ($values as $i => $givenValue) {
-            if (\array_key_exists($givenValue, $this->choices)) {
+            if (\array_key_exists($givenValue ?? '', $this->choices)) {
                 $choices[$i] = $this->choices[$givenValue];
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public function getChoicesForValues(array $values): array`
`105`	`105`	`$choices = [];`
`106`	`106`
`107`	`107`	`foreach ($values as $i => $givenValue) {`
`108`		`- if (\array_key_exists($givenValue, $this->choices)) {`
	`108`	`+ if (\array_key_exists($givenValue ?? '', $this->choices)) {`
`109`	`109`	`$choices[$i] = $this->choices[$givenValue];`
`110`	`110`	`}`
`111`	`111`	`}`