removed parameter type of AbstractChoices methods to fix exception

heimrichhannot · Dec 21, 2022 · eb19232 · eb19232
1 parent 478f663
commit eb19232
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.223.2] - 2022-12-21
+- Fixed: Exception if Choice is used as options callback
+
 ## [2.223.1] - 2022-12-20
 - Fixed: Choices cache not taking locale into account
 - Fixed: used deprecated ServiceSubscriber if available in AbstractServiceSubscriber

diff --git a/src/Choice/AbstractChoice.php b/src/Choice/AbstractChoice.php
@@ -70,7 +70,7 @@ public function setContext($context)
         return $this;
     }
 
-    public function getChoices(?array $context = [])
+    public function getChoices($context = [])
     {
         if (!$context) {
             $context = [];
@@ -83,13 +83,13 @@ public function getChoices(?array $context = [])
         return $choices;
     }
 
-    public function getCachedChoices(?array $context = [])
+    public function getCachedChoices($context = [])
     {
         if (null === $context) {
             $context = [];
         }
 
-        if (!isset($context['locale']) && ($request = System::getContainer()->get('request_stack')->getCurrentRequest())) {
+        if (\is_array($context) && !isset($context['locale']) && ($request = System::getContainer()->get('request_stack')->getCurrentRequest())) {
             $context['locale'] = $request->getLocale();
         }