Merge pull request #26 from michael-rubel/fix/full-name-mckenzie-case

Update `FullName` formatting behavior to handle names like `McKenzie`
michael-rubel · Dec 2, 2022 · 135a320 · 135a320
2 parents d4465d3 + e830cf7
commit 135a320
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/Collection/FullNameFormatter.php b/src/Collection/FullNameFormatter.php
@@ -23,10 +23,15 @@ public function __construct(public ?string $name)
      */
     public function format(): string
     {
+        $words = str($this->name)->split('/\s/');
+
+        $this->name = $words->map(function (string $word) {
+            return str($word)->ucfirst();
+        })->join(' ');
+
         return str($this->name)
             ->replaceMatches('/\p{C}+/u', '')
             ->squish()
-            ->title()
             ->value();
     }
 }
diff --git a/tests/FullNameFormatterTest.php b/tests/FullNameFormatterTest.php
@@ -29,17 +29,18 @@ public function testCanFormatLastName()
 
     public function testCanFormatFirstAndLastName()
     {
-        $name = format(FullNameFormatter::class, 'michaeL rubéL');
-
+        $name = format(FullNameFormatter::class, 'michael rubél');
         $this->assertSame('Michael Rubél', $name);
+        $name = format(FullNameFormatter::class, 'michael mcKenzie');
+        $this->assertSame('Michael McKenzie', $name);
     }
 
     public function testCanFormatNameWithMinusSeparators()
     {
         $name = format(FullNameFormatter::class, 'Anna Nowak-Kowalska');
         $this->assertSame('Anna Nowak-Kowalska', $name);
         $name = format(FullNameFormatter::class, ' anna nowak-kowalska ');
-        $this->assertSame('Anna Nowak-Kowalska', $name);
+        $this->assertSame('Anna Nowak-kowalska', $name);
     }
 
     public function testCutsSpaceBeforeAndAfter()