Use Arrays for Regex and Format Strings

Author: charvimehradu

src/StringHelper.php

@@ -56,25 +56,31 @@ public static function increment($string, $style = 'default', $n = 0)
     {
         $styleSpec = static::$incrementStyles[$style] ?? static::$incrementStyles['default'];
 
-        // Regular expression search and replace patterns for both cases
-        if ($style === 'default') {
-            if (preg_match('#\((\d+)\)$#', $string, $matches)) {
-                $n = empty($n) ? ($matches[1] + 1) : $n;
-                $string = preg_replace('#\((\d+)\)$#', "($n)", $string);
-            } else {
-                $string .= ' (2)';
-            }
+        // Regular expression search and replace patterns for both styles
+        if (\is_array($styleSpec[0])) {
+            $rxSearch  = $styleSpec[0][0];
+            $rxReplace = $styleSpec[0][1];
         } else {
-            $rxSearch = '#-(\d+)$#';  // Match the trailing number after a hyphen (e.g., "dog-2")
-            $rxReplace = '-%d';        // Replace it with "-number"
+            $rxSearch = $rxReplace = $styleSpec[0];
+        }
 
-            if (preg_match($rxSearch, $string, $matches)) {
-                $n = empty($n) ? ($matches[1] + 1) : $n;
-                $string = preg_replace($rxReplace, sprintf($rxReplace, $n), $string);
-            } else {
-                $n = empty($n) ? 2 : $n;
-                $string .= sprintf($rxReplace, $n);
-            }
+        // New and old (existing) sprintf formats
+        if (\is_array($styleSpec[1])) {
+            $newFormat = $styleSpec[1][0];
+            $oldFormat = $styleSpec[1][1];
+        } else {
+            $newFormat = $oldFormat = $styleSpec[1];
+        }
+
+        // Check if we are incrementing an existing pattern or appending a new one
+        if (preg_match($rxSearch, $string, $matches)) {
+            // If a match is found, increment the existing number
+            $n = empty($n) ? ($matches[1] + 1) : $n;
+            $string = preg_replace($rxReplace, sprintf($oldFormat, $n), $string);
+        } else {
+            // If no match is found, append the number (default is 2)
+            $n = empty($n) ? 2 : $n;
+            $string .= sprintf($newFormat, $n);
         }
 
         return $string;