[Intl] Fixed support of Locale::getFallback

lyrixx · lyrixx · commit ebc80a18eba5 · 2017-09-11T19:24:55.000+02:00
diff --git a/src/Symfony/Component/Intl/Locale.php b/src/Symfony/Component/Intl/Locale.php
@@ -67,6 +67,21 @@ public static function getDefaultFallback()
      */
     public static function getFallback($locale)
     {
+        if (function_exists('locale_parse')) {
+            $localesSubTags = locale_parse($locale);
+            if (1 === count($localesSubTags)) {
+                if (self::$defaultFallback === $localesSubTags['language']) {
+                    return 'root';
+                }
+
+                return self::$defaultFallback;
+            }
+
+            array_pop($localesSubTags);
+
+            return locale_compose($localesSubTags);
+        }
+
         if (false === $pos = strrpos($locale, '_')) {
             if (self::$defaultFallback === $locale) {
                 return 'root';
diff --git a/src/Symfony/Component/Intl/Tests/LocaleTest.php b/src/Symfony/Component/Intl/Tests/LocaleTest.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Intl\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Intl\Locale;
+
+class LocaleTest extends TestCase
+{
+    public function provideGetFallbackTests()
+    {
+        $tests =  array(
+            array('fr', 'fr_FR'),
+            array('en', 'fr'),
+            array('root', 'en'),
+        );
+
+        if (function_exists('locale_parse')) {
+            $tests[] = array('sl_Latn_IT', 'sl_Latn_IT_nedis');
+            $tests[] = array('sl_Latn_IT', 'sl-Latn-IT-nedis');
+            $tests[] = array('sl_Latn', 'sl_Latn_IT');
+            $tests[] = array('sl_Latn', 'sl-Latn-IT');
+            $tests[] = array('sl', 'sl_Latn');
+            $tests[] = array('sl', 'sl-Latn');
+        }
+
+        return $tests;
+    }
+
+    /**
+     * @dataProvider provideGetFallbackTests
+     */
+    public function testGetFallback($expected, $locale)
+    {
+        $this->assertSame($expected, Locale::getFallback($locale));
+    }
+}
