Merge pull request #1136 from YesWiki/fix/extension-import-namespace

fix(extension): allow import class from extension with dash in folder

includes/services/Performer.php

@@ -121,7 +121,7 @@ public function createPerformable(array $object, array &$vars, &$output)
         /* extract extension name from path to allow namespace */
         if (preg_match('/(?:tools[\\\\\\/]([A-Za-z0-9_\\-]+)|(custom))[\\\\\/][a-zA-Z0-9_\\\\\/\\-]+.php$/', $object['filePath'], $matches)) {
             $extensionName = empty($matches[1]) ? $matches[2]:$matches[1];
-            $classNameWithNamespace = "YesWiki\\".ucfirst(strtolower($extensionName))."\\".$object['baseName'];
+            $classNameWithNamespace = "YesWiki\\".StringUtilService::folderToNamespace($extensionName)."\\".$object['baseName'];
             if (class_exists($classNameWithNamespace)) {
                 $className = $classNameWithNamespace;
             }

includes/services/StringUtilService.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace YesWiki\Core\Service;
+
+class StringUtilService
+{
+    public static function folderToNamespace(string $folder): string
+    {
+        if(preg_match_all('/[a-zA-Z0-9]+/', $folder, $matches) === false) {
+            return '';
+        }
+        return implode('', array_map(function ($input) {return ucfirst(strtolower($input));}, $matches[0]));
+    }
+}

tests/includes/services/StringUtilServiceTest.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace YesWiki\Test\Core\Service;
+
+use PHPUnit\Framework\TestCase;
+use YesWiki\Core\Service\StringUtilService;
+
+require_once 'includes/services/StringUtilService.php';
+
+class StringUtilServiceTest extends TestCase
+{
+    /**
+     * @dataProvider folderToNamespaceProvider
+     */
+    public function testFolderToNamespace(string $input, string $expected)
+    {
+        $this->assertEquals(
+            $expected,
+            StringUtilService::folderToNamespace($input),
+            'Unable to convert : ' . $input
+        );
+    }
+
+    public function folderToNamespaceProvider()
+    {
+        return [
+            ['', ''],
+            ['.', ''],
+            ['foo', 'Foo'],
+            ['Foo', 'Foo'],
+            ['foo1', 'Foo1'],
+            ['foO', 'Foo'],
+            ['foo.bar', 'FooBar'],
+            ['foo-bar', 'FooBar'],
+            ['foo_bar', 'FooBar'],
+            ['foo~bar', 'FooBar'],
+        ];
+    }
+}