DX: simplify Utils::camelCaseToUnderscore

Author: kubawerlos

src/Utils.php

@@ -45,21 +45,15 @@ public static function calculateBitmask(array $options)
     }
 
     /**
-     * Converts a camel cased string to an snake cased string.
+     * Converts a camel cased string to a snake cased string.
      *
      * @param string $string
      *
      * @return string
      */
     public static function camelCaseToUnderscore($string)
     {
-        return Preg::replaceCallback(
-            '/(^|[a-z0-9])([A-Z])/',
-            static function (array $matches) {
-                return strtolower('' !== $matches[1] ? $matches[1].'_'.$matches[2] : $matches[2]);
-            },
-            $string
-        );
+        return strtolower(Preg::replace('/(?<!^)((?=[A-Z][^A-Z])|(?<![A-Z])(?=[A-Z]))/', '_', $string));
     }
 
     /**

tests/UtilsTest.php

@@ -63,6 +63,34 @@ public function provideCamelCaseToUnderscoreCases()
             [
                 'utf8_encoder_fixer',
             ],
+            [
+                'a',
+                'A',
+            ],
+            [
+                'aa',
+                'AA',
+            ],
+            [
+                'foo',
+                'FOO',
+            ],
+            [
+                'foo_bar_baz',
+                'FooBarBAZ',
+            ],
+            [
+                'foo_bar_baz',
+                'FooBARBaz',
+            ],
+            [
+                'foo_bar_baz',
+                'FOOBarBaz',
+            ],
+            [
+                'mr_t',
+                'MrT',
+            ],
         ];
     }