Handle root URL placeholder overriding registered routes (#28)

Author: ivanvermeyen

src/Macros/LocalizedRoutesMacro.php

@@ -28,6 +28,16 @@ public static function register()
             $setMiddleware = $options['use_locale_middleware']
                                 ?? Config::get('localized-routes.use_locale_middleware', false);
 
+            if ($omitPrefix) {
+                // Move the omitted locale to the end of the array
+                // to avoid root placeholders catching existing slugs.
+                // https://github.com/codezero-be/laravel-localized-routes/issues/28
+                $locales = array_filter($locales, function ($locale) use ($omitPrefix) {
+                    return $locale !== $omitPrefix;
+                });
+                array_push($locales, $omitPrefix);
+            }
+
             foreach ($locales as $locale => $domain) {
                 // Allow supported locales to be a
                 // simple array of locales or an

tests/Unit/Macros/LocalizedRoutesMacroTest.php

@@ -82,6 +82,40 @@ public function it_registers_a_url_without_prefix_for_a_configured_main_locale()
         $this->assertContains('nl/about', $uris);
     }
 
+    /** @test */
+    public function it_registers_routes_in_the_correct_order_without_prefix_for_a_configured_main_locale()
+    {
+        $this->setSupportedLocales(['en', 'nl']);
+        $this->setOmitUrlPrefixForLocale('en');
+        $this->setUseLocaleMiddleware(true);
+
+        Route::localized(function () {
+            Route::get('/', function () { return 'Home '.App::getLocale(); });
+            Route::get('{slug}', function () { return 'Dynamic '.App::getLocale(); });
+        });
+
+        $this->assertEquals(
+            ['nl', 'nl/{slug}', '/', '{slug}'],
+            $this->getRoutes()->pluck('uri')->toArray()
+        );
+
+        $response = $this->call('GET', '/');
+        $response->assertOk();
+        $this->assertEquals('Home en', $response->original);
+
+        $response = $this->call('GET', '/nl');
+        $response->assertOk();
+        $this->assertEquals('Home nl', $response->original);
+
+        $response = $this->call('GET', '/dynamic');
+        $response->assertOk();
+        $this->assertEquals('Dynamic en', $response->original);
+
+        $response = $this->call('GET', '/nl/dynamic');
+        $response->assertOk();
+        $this->assertEquals('Dynamic nl', $response->original);
+    }
+
     /** @test */
     public function it_maps_a_custom_domain_to_each_locale()
     {