prevent applying str_contains on null value

dachcom-digital · Oct 30, 2024 · d4f0cc4 · d4f0cc4
1 parent c7381c1
commit d4f0cc4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,5 +1,7 @@
 # Upgrade Notes
 
+## 5.1.1
+- [IMPROVEMENT] prevent applying str_contains on null value
 ## 5.1.0
 - [FEATURE] pimcore backend: object preview button
 ## 5.0.6

diff --git a/src/Manager/I18nContextManager.php b/src/Manager/I18nContextManager.php
@@ -109,10 +109,10 @@ protected function buildLocaleDefinition(RouteItemInterface $routeItem): LocaleD
         $languageIso = $locale;
         $countryIso = Definitions::INTERNATIONAL_COUNTRY_NAMESPACE;
 
-        if (str_contains($baseLocale, '_')) {
+        if ($baseLocale !== null && str_contains($baseLocale, '_')) {
             $parts = explode('_', $baseLocale);
             $languageIso = strtolower($parts[0]);
-            if (isset($parts[1]) && !empty($parts[1])) {
+            if (!empty($parts[1])) {
                 $countryIso = strtoupper($parts[1]);
             }
         }