Make sure supported locales are formatted correctly

Author: ivanvermeyen

src/LocalizedRoutesServiceProvider.php

@@ -149,7 +149,27 @@ protected function registerLocaleHandler()
             $useLocalizer = $app['config']->get('localized-routes.use_localizer', false);
             $localizer = $useLocalizer ? $app->make(Localizer::class) : null;
 
-            return new LocaleHandler($supportedLocales, $localizer);
+            return new LocaleHandler($this->formatLocales($supportedLocales), $localizer);
         });
     }
+
+    /**
+     * Format the locales to pass them to Localizer.
+     *
+     * @param array $locales
+     *
+     * @return array
+     */
+    protected function formatLocales($locales)
+    {
+        $keys = array_keys($locales);
+
+        // If the locales are in a key => value format (locale => domain)
+        // then only return the keys; else return the original array.
+        if (isset($keys[0]) && is_numeric($keys[0])) {
+            return $locales;
+        }
+
+        return $keys;
+    }
 }

tests/Unit/Middleware/SetLocaleTest.php

@@ -197,4 +197,23 @@ public function it_does_not_set_the_app_locale_for_non_localized_routes_if_local
         $response->assertOk();
         $this->assertEquals('fr', $response->original);
     }
+
+    /** @test */
+    public function it_passes_the_supported_locales_to_localizer_in_the_correct_format()
+    {
+        $this->withoutExceptionHandling();
+        $this->setSupportedLocales(['en' => 'en.domain.com', 'nl' => 'nl.domain.com']);
+        $this->setUseLocalizer(true);
+
+        $localizer = Mockery::spy(Localizer::class);
+        $localizer->shouldReceive('detect')->andReturn('en');
+        App::instance(Localizer::class, $localizer);
+
+        Route::get('route', function () {})
+            ->middleware(['web', SetLocale::class]);
+
+        $this->call('GET', '/route')->assertOk();
+
+        $localizer->shouldHaveReceived('setSupportedLocales')->with(['en', 'nl']);
+    }
 }