From 312451cbc651a53a4d4f0215950d300f9a895922 Mon Sep 17 00:00:00 2001
From: Oliver Mesieh <olivermesieh@gmail.com>
Date: Wed, 5 Jun 2024 10:50:46 +0200
Subject: [PATCH] Fix failed slug validation when slug contains underscores

---
 src/Rules/Slug.php       | 2 +-
 tests/Rules/SlugTest.php | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Rules/Slug.php b/src/Rules/Slug.php
index c3b7e4a499b..17c90e1325d 100644
--- a/src/Rules/Slug.php
+++ b/src/Rules/Slug.php
@@ -9,7 +9,7 @@ class Slug implements ValidationRule
 {
     public function validate(string $attribute, mixed $value, Closure $fail): void
     {
-        if (! preg_match('/^[a-zA-Z0-9]+(?:-{0,1}[a-zA-Z0-9])*$/', $value)) {
+        if (! preg_match('/^[a-zA-Z0-9]+(?:[-_]{0,1}[a-zA-Z0-9])*$/', $value)) {
             $fail('statamic::validation.slug')->translate();
         }
     }
diff --git a/tests/Rules/SlugTest.php b/tests/Rules/SlugTest.php
index 09b214f9dcc..d8e854c1905 100644
--- a/tests/Rules/SlugTest.php
+++ b/tests/Rules/SlugTest.php
@@ -17,19 +17,26 @@ public function it_validates_handles()
         $this->assertPasses('foo');
         $this->assertPasses('foo-bar');
         $this->assertPasses('foo-bar-baz');
+        $this->assertPasses('foo_bar_baz');
         $this->assertPasses('foo-bar-baz-qux');
         $this->assertPasses('1-foo-bar234-baz-qux-5');
+        $this->assertPasses('1_foo_bar234_baz_qux_5');
+        $this->assertPasses('1-foo_bar234-baz_qux-5');
 
-        $this->assertFails('foo_bar');
         $this->assertFails('-foo');
         $this->assertFails('foo-');
         $this->assertFails('-foo-bar');
+        $this->assertFails('_foo-bar');
         $this->assertFails('foo-bar-');
+        $this->assertFails('foo-bar_');
         $this->assertFails('foo--bar');
+        $this->assertFails('foo__bar');
         $this->assertFails('foo---bar');
+        $this->assertFails('foo___bar');
         $this->assertFails('*foo');
         $this->assertFails('foo#');
         $this->assertFails('foo-!bar');
+        $this->assertFails('foo_!bar');
         $this->assertFails('foo-_-bar');
     }