Prevent doubling Sylius prefix in plugin name

Author: Rafikooo

bin/rename-plugin.php

@@ -231,22 +231,26 @@ private function generateNameVariations(string $company, string $pluginName, boo
             ];
         }
 
-        $syliusPlugin = 'Sylius' . $plugin;
+        $hasSyliusPrefix = str_starts_with($pluginName, 'Sylius');
+        $syliusPlugin = $hasSyliusPrefix ? $plugin : 'Sylius' . $plugin;
+        $syliusPluginName = $hasSyliusPrefix ? $pluginName : 'Sylius' . $pluginName;
+
         $fullClass = $company . $syliusPlugin;
-        $extensionClass = $company . 'Sylius' . $pluginName . 'Extension';
+        $extensionClass = $company . $syliusPluginName . 'Extension';
 
         $companyKebab = $this->toKebabCase($company);
         $fullPluginKebab = $this->toKebabCase($syliusPlugin);
         $companySnake = $this->toSnakeCase($company);
+        $pluginSnakeForDb = $hasSyliusPrefix ? $pluginSnake : 'sylius_' . $pluginSnake;
 
         return [
             'company' => $company,
             'plugin' => $syliusPlugin,
             'fullClass' => $fullClass,
             'extensionClass' => $extensionClass,
             'package' => $companyKebab . '/' . $fullPluginKebab,
-            'db' => $companySnake . '_sylius_' . $pluginSnake . '_plugin',
-            'configKey' => $companySnake . '_sylius_' . $pluginSnake,
+            'db' => $companySnake . '_' . $pluginSnakeForDb . '_plugin',
+            'configKey' => $companySnake . '_' . $pluginSnakeForDb,
         ];
     }
 

bin/validate-directory.php

@@ -4,19 +4,36 @@
 declare(strict_types=1);
 
 $dirName = basename(dirname(__DIR__));
+$isSyliusOfficial = getenv('SYLIUS') === '1';
 
-if (!preg_match('/^[A-Z][a-zA-Z0-9]*Plugin$/', $dirName)) {
-    fwrite(STDERR, "\n");
-    fwrite(STDERR, "  \033[41;37m ERROR \033[0m Directory name must end with 'Plugin' suffix\n");
-    fwrite(STDERR, "\n");
-    fwrite(STDERR, "  Current:  {$dirName}\n");
-    fwrite(STDERR, "  Expected: {$dirName}Plugin (or similar PascalCase name ending with Plugin)\n");
-    fwrite(STDERR, "\n");
-    fwrite(STDERR, "  Example:\n");
-    fwrite(STDERR, "    composer create-project sylius/plugin-skeleton WishlistPlugin\n");
-    fwrite(STDERR, "\n");
+if ($isSyliusOfficial) {
+    if (!preg_match('/^[A-Z][a-zA-Z0-9]*Plugin$/', $dirName) || str_starts_with($dirName, 'Sylius')) {
+        fwrite(STDERR, "\n");
+        fwrite(STDERR, "  \033[41;37m ERROR \033[0m Official Sylius plugin directory should not have 'Sylius' prefix\n");
+        fwrite(STDERR, "\n");
+        fwrite(STDERR, "  Current:  {$dirName}\n");
+        fwrite(STDERR, "  Expected: MailerLitePlugin, InvoicingPlugin, etc.\n");
+        fwrite(STDERR, "\n");
+        fwrite(STDERR, "  Example:\n");
+        fwrite(STDERR, "    SYLIUS=1 composer create-project sylius/plugin-skeleton MailerLitePlugin\n");
+        fwrite(STDERR, "\n");
 
-    exit(1);
+        exit(1);
+    }
+} else {
+    if (!preg_match('/^Sylius[A-Z][a-zA-Z0-9]*Plugin$/', $dirName)) {
+        fwrite(STDERR, "\n");
+        fwrite(STDERR, "  \033[41;37m ERROR \033[0m Community plugin directory must start with 'Sylius' prefix\n");
+        fwrite(STDERR, "\n");
+        fwrite(STDERR, "  Current:  {$dirName}\n");
+        fwrite(STDERR, "  Expected: Sylius{$dirName}\n");
+        fwrite(STDERR, "\n");
+        fwrite(STDERR, "  Example:\n");
+        fwrite(STDERR, "    composer create-project sylius/plugin-skeleton SyliusWishlistPlugin\n");
+        fwrite(STDERR, "\n");
+
+        exit(1);
+    }
 }
 
 unlink(__FILE__);

composer.json

@@ -79,7 +79,10 @@
         ],
         "post-create-project-cmd": [
             "@php bin/rename-plugin.php",
-            "@test-app-init"
+            "@test-app-init",
+            "git init -q",
+            "git add -A",
+            "git commit -q -m 'Initial commit from PluginSkeleton'"
         ],
         "database-reset": [
             "vendor/bin/console doctrine:database:drop --force --if-exists",