Load English file for setLocale('auto') tests

Author: kylekatarnls

src/Carbon/AbstractTranslator.php

@@ -351,7 +351,7 @@ public function setLocale($locale): void
 
             usort($locales, static fn ($first, $second) => $getScore($second) <=> $getScore($first));
 
-            $locale = $locales[0];
+            $locale = $locales[0] ?? 'en';
         }
 
         if (isset($this->aliases[$locale])) {
@@ -362,8 +362,8 @@ public function setLocale($locale): void
         // and the tag contains a region (ex: en_CA), then
         // first load the macro (ex: en) to have a fallback
         if (
-            !\in_array($locale, self::getInternallySupportedLocales(), true)
-            && str_contains($locale, '_')
+            str_contains($locale, '_')
+            && !\in_array($locale, self::getInternallySupportedLocales(), true)
             && $this->loadMessagesFromFile($macroLocale = preg_replace('/^([^_]+).*$/', '$1', $locale))
         ) {
             parent::setLocale($macroLocale);

tests/CarbonImmutable/LocalizationTest.php

@@ -18,6 +18,7 @@
 use Carbon\Language;
 use Carbon\Translator;
 use InvalidArgumentException;
+use LogicException;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\TestWith;
@@ -69,15 +70,21 @@ public function testSetLocaleToAuto()
 
         $this->setLocaleOrSkip('ar_AE.UTF-8', 'ar_AE.utf8', 'ar_AE', 'ar');
 
-        rename(__DIR__.'/../../src/Carbon/Lang/ar_AE.php', __DIR__.'/../../src/Carbon/Lang/disabled_ar_AE.php');
-        /** @var Translator $translator */
-        $translator = Carbon::getTranslator();
-        $translator->resetMessages();
-        Carbon::setLocale('auto');
-        $locale = Carbon::getLocale();
-        $diff = Carbon::now()->subSeconds(2)->diffForHumans();
-        setlocale(LC_ALL, $currentLocale);
-        rename(__DIR__.'/../../src/Carbon/Lang/disabled_ar_AE.php', __DIR__.'/../../src/Carbon/Lang/ar_AE.php');
+        if (!rename(__DIR__.'/../../src/Carbon/Lang/ar_AE.php', __DIR__.'/../../src/Carbon/Lang/disabled_ar_AE.php')) {
+            throw new LogicException('Unable to move ar_AE.php for the test');
+        }
+
+        try {
+            /** @var Translator $translator */
+            $translator = Carbon::getTranslator();
+            $translator->resetMessages();
+            Carbon::setLocale('auto');
+            $locale = Carbon::getLocale();
+            $diff = Carbon::now()->subSeconds(2)->diffForHumans();
+            setlocale(LC_ALL, $currentLocale);
+        } finally {
+            rename(__DIR__.'/../../src/Carbon/Lang/disabled_ar_AE.php', __DIR__.'/../../src/Carbon/Lang/ar_AE.php');
+        }
 
         $this->assertStringStartsWith('ar', $locale);
         $this->assertSame('منذ ثانيتين', $diff);
@@ -118,6 +125,7 @@ public function testSetLocaleToAuto()
         $translator->setDirectories([$directory]);
 
         $files = [
+            'en',
             'zh_Hans',
             'zh',
             'fr',