More flexible matching

.github/workflows/ci.yaml

@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - master
+      - 3.x
 
 jobs:
   phpunit-sf5:

composer.json

@@ -16,18 +16,18 @@
     ],
     "require": {
         "php": ">=7.2.5",
-        "symfony/framework-bundle": "^5.4 || ^6.0 ",
-        "symfony/intl": "^5.4 || ^6.0",
-        "symfony/templating": "^5.4  || ^6.0",
-        "symfony/validator": "^5.4  || ^6.0",
-        "symfony/yaml": "^5.4  || ^6.0",
+        "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0 ",
+        "symfony/intl": "^5.4 || ^6.0 || ^7.0 ",
+        "symfony/templating": "^5.4  || ^6.0 || ^7.0 ",
+        "symfony/validator": "^5.4  || ^6.0 || ^7.0 ",
+        "symfony/yaml": "^5.4  || ^6.0 || ^7.0 ",
         "psr/log": "^1.0 || ^2.0 || ^3.0"
     },
     "require-dev": {
         "symfony/phpunit-bridge": ">=5.4",
         "ext-intl": "*",
         "twig/twig": "^1.41 || ^2.0 || ^3.0",
-        "symfony/form": "^5.4 || ^6.0",
+        "symfony/form": "^5.4 || ^6.0 || ^7.0 ",
         "symfony/flex": "^1.0 || ^2.0",
         "dg/bypass-finals": "^1.4"
     },

src/Matcher/DefaultBestLocaleMatcher.php

@@ -47,6 +47,21 @@ public function match($locale)
                 return $allowedLocale;
             }
         }
+        // Checks for the first part of the locale and matches only the language part
+        $findPrimary = function ($locale) {
+            if (function_exists('\Locale::getPrimaryLanguage')) {
+                return \Locale::getPrimaryLanguage($locale);
+            } else {
+                $splittedLocale = preg_split('/[_-]/', $locale);
+                return count($splittedLocale) > 1 ? $splittedLocale[0] : $locale;
+            }
+        };
+        $locale = $findPrimary($locale);
+        foreach ($allowedLocales as $allowedLocale) {
+            if (str_starts_with($allowedLocale, $locale)) {
+                return $allowedLocale;
+            }
+        }
         return false;
     }
 }

tests/Matcher/BestLocaleMatcherTest.php

@@ -41,6 +41,8 @@ public function getTestDataForBestLocaleMatcher()
             array('fr_FR', array('fr_FR', 'fr'), 'fr_FR'),
             array('fr_FR', array('fr'), 'fr'),
             array('fr_FR', array('fr_FR'), 'fr_FR'),
+            array('fr', array('fr_FR'), 'fr_FR'),
+            array('fr_CH', array('fr_FR'), 'fr_FR'),
             array('fr_FR', array('en_GB'), false),
         );
     }