make psalm happy (fingers crossed)

Signed-off-by: Matthias Kühne <[email protected]>
laminas · Dec 8, 2023 · 3bab68d · 3bab68d
1 parent a6fa7c0
commit 3bab68d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Filter/AbstractLocale.php b/src/Filter/AbstractLocale.php
@@ -5,7 +5,7 @@
 use Laminas\Filter\AbstractFilter;
 use Locale;
 
-use function array_key_exists;
+use function is_string;
 
 /**
  * @psalm-type Options = array{
@@ -40,9 +40,9 @@ public function setLocale($locale = null)
      */
     public function getLocale()
     {
-        if (! array_key_exists('locale', $this->options)) {
-            return Locale::getDefault();
+        if (isset($this->options['locale']) && is_string($this->options['locale'])) {
+            return $this->options['locale'];
         }
-        return $this->options['locale'];
+        return Locale::getDefault();
     }
 }
diff --git a/src/View/Helper/Container/CountryCodeDataListFactory.php b/src/View/Helper/Container/CountryCodeDataListFactory.php
@@ -27,11 +27,11 @@ public function __invoke(ContainerInterface $container): CountryCodeDataList
         /** @psalm-var mixed $config */
         $config = $config instanceof Traversable ? iterator_to_array($config) : $config;
 
+        /** @psalm-var string|null $locale */
         $locale = is_array($config) && isset($config['locale']) && is_string($config['locale'])
             ? $config['locale']
             : null;
 
-        assert(($locale === null) || is_string($locale));
 
         return new CountryCodeDataList(
             $container->get(CountryCodeListInterface::class),