revert toClass changes

Author: murrant

LibreNMS/Util/StringHelpers.php

@@ -26,8 +26,6 @@
 
 namespace LibreNMS\Util;
 
-use Illuminate\Support\Str;
-
 class StringHelpers
 {
     public static function niceCase($string)
@@ -132,13 +130,13 @@ public static function inferEncoding(?string $string): ?string
      */
     public static function toClass(string $name, ?string $namespace = null): string
     {
-        $numbers = ['Zero', 'One', 'Two', 'Three', 'Four', 'Five', 'Six', 'Seven', 'Eight', 'Nine'];
+        $pre_format = str_replace(['-', '_'], ' ', $name);
+        $class = str_replace(' ', '', ucwords(strtolower($pre_format)));
+        $class = preg_replace_callback('/^(\d)(.)/', function ($matches) {
+            $numbers = ['Zero', 'One', 'Two', 'Three', 'Four', 'Five', 'Six', 'Seven', 'Eight', 'Nine'];
 
-        $class = Str::of($name)
-            ->replaceMatches('/^(\d)(.)/', fn (array $m) => $numbers[$m[1]] . strtoupper((string) $m[2]))
-            ->headline()
-            ->replace(' ', '')
-            ->toString();
+            return $numbers[$matches[1]] . strtoupper($matches[2]);
+        }, $class);
 
         return $namespace . $class;
     }

tests/CommonFunctionsTest.php

@@ -112,32 +112,11 @@ public function testDisplay(): void
 
     public function testStringToClass(): void
     {
-        // namespace
-        $this->assertSame('LibreNMS\OS\Os', StringHelpers::toClass('os', 'LibreNMS\\OS\\'));
+        $this->assertSame('LibreNMS\OS\Os', StringHelpers::toClass('OS', 'LibreNMS\\OS\\'));
+        $this->assertSame('SpacesName', StringHelpers::toClass('spaces name', null));
+        $this->assertSame('DashName', StringHelpers::toClass('dash-name', null));
+        $this->assertSame('UnderscoreName', StringHelpers::toClass('underscore_name', null));
         $this->assertSame('LibreNMS\\AllOfThemName', StringHelpers::toClass('all OF-thEm_NaMe', 'LibreNMS\\'));
-        $this->assertSame('App\\Models\\FooBar', StringHelpers::toClass('foo_bar', 'App\\Models\\'));
-
-        // delimiters
-        $this->assertSame('SpacesName', StringHelpers::toClass('spaces name'));
-        $this->assertSame('DashName', StringHelpers::toClass('dash-name'));
-        $this->assertSame('UnderscoreName', StringHelpers::toClass('underscore_name'));
-        $this->assertSame('FooBarBaz', StringHelpers::toClass('foo-bar_baz'));
-
-        // camel/pascal input
-        $this->assertSame('FooBar', StringHelpers::toClass('fooBar'));
-        $this->assertSame('FooBar', StringHelpers::toClass('FooBar'));
-        $this->assertSame('MyHTTPRequest', StringHelpers::toClass('myHTTPRequest'));
-
-        // numeric prefix
-        $this->assertSame('ZeroClass', StringHelpers::toClass('0_class'));
-        $this->assertSame('ZeroName', StringHelpers::toClass('0name'));
-        $this->assertSame('OneClass', StringHelpers::toClass('1_class'));
-        $this->assertSame('NineClass', StringHelpers::toClass('9_class'));
-        $this->assertSame('Foo2Bar', StringHelpers::toClass('foo_2_bar'));
-
-        // single word / edge cases
-        $this->assertSame('Foo', StringHelpers::toClass('foo'));
-        $this->assertSame('FOOBAR', StringHelpers::toClass('FOOBAR'));
     }
 
     public function testIsValidHostname(): void