Merge pull request #8 from samsonasik/ensure-letter

Fix: Ensure the letter after apostrophe/hyphen is uppercase (Unicode-safe)

Author: samsonasik

rector.php

@@ -4,7 +4,7 @@
 use Rector\Config\RectorConfig;
 
 return RectorConfig::configure()
-    ->withPreparedSets(codingStyle: true, codeQuality: true, typeDeclarations: true)
+    ->withPreparedSets(codeQuality: true, codingStyle: true, typeDeclarations: true)
     ->withPhpSets(php81: true)
     ->withPaths([__DIR__ . '/src', __DIR__ . '/spec'])
     ->withRootFiles()

spec/Filter/NamingSpec.php

@@ -11,14 +11,17 @@
         it('set striptags, trim, and strip double space with ucwords with set lower first, upper after apostrophe and hyphen', function (): void {
 
             $maps = [
-                '<script>Abdul'    => 'Abdul',
-                'Abdul  '          => 'Abdul',
-                'ABduL'            => 'Abdul',
-                'aBDUL m. ikHsan'  => 'Abdul M. Ikhsan',
-                'abdul Malik  I'   => 'Abdul Malik I',
-                "D'lilah"         => "D'Lilah",
-                'äX'               => 'Äx',
-                'Veli-matti'       => 'Veli-Matti',
+                ''                  => '',
+                '<script>Abdul'     => 'Abdul',
+                'Abdul  '           => 'Abdul',
+                'ABduL'             => 'Abdul',
+                'aBDUL m. ikHsan'   => 'Abdul M. Ikhsan',
+                'abdul Malik  I'    => 'Abdul Malik I',
+                "D'lilah"           => "D'Lilah",
+                'äX'                => 'Äx',
+                'Veli-matti'        => 'Veli-Matti',
+                "d'äx"              => "D'Äx",
+                'anna-maria-louise' => 'Anna-Maria-Louise',
             ];
 
             $naming = new Naming();

src/Filter/Naming.php

@@ -9,11 +9,10 @@
 use Laminas\Filter\StripTags;
 use Webmozart\Assert\Assert;
 
-use function array_walk;
 use function mb_convert_case;
-use function mb_strpos;
 use function mb_strtoupper;
 use function preg_replace;
+use function preg_replace_callback;
 
 use const MB_CASE_TITLE;
 
@@ -32,15 +31,12 @@ public function filter(mixed $value): string
         $value = mb_convert_case($value, MB_CASE_TITLE, 'UTF-8');
         $value = preg_replace('#\s{2,}#', ' ', $value);
 
-        $chars = ["'", '-'];
-        array_walk($chars, static function ($row) use (&$value): void {
-            Assert::string($value);
-
-            $position = mb_strpos($value, $row);
-            if ($position !== false && isset($value[$position + 1])) {
-                $value[$position + 1] = mb_strtoupper($value[$position + 1]);
-            }
-        });
+        // Ensure the letter after apostrophe/hyphen is uppercase (Unicode-safe)
+        $value = preg_replace_callback(
+            "/(['-])(\\p{L})/u",
+            static fn(array $matches): string => $matches[1] . mb_strtoupper($matches[2], 'UTF-8'),
+            (string) $value
+        );
 
         Assert::string($value);
         return $value;