Merge pull request #1822 from alissn/FixAppFolder

[fix] fix stubs composer for app_folder
nWidart · Apr 21, 2024 · b1a675a · b1a675a
2 parents 44b9b93 + 389f46b
commit b1a675a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/config/config.php b/config/config.php
@@ -54,6 +54,7 @@
                 'AUTHOR_EMAIL',
                 'MODULE_NAMESPACE',
                 'PROVIDER_NAMESPACE',
+                'APP_FOLDER_NAME',
             ],
         ],
         'gitkeep' => true,

diff --git a/src/Commands/stubs/composer.stub b/src/Commands/stubs/composer.stub
@@ -17,7 +17,7 @@
     },
     "autoload": {
         "psr-4": {
-            "$MODULE_NAMESPACE$\\$STUDLY_NAME$\\": "app/",
+            "$MODULE_NAMESPACE$\\$STUDLY_NAME$\\": "$APP_FOLDER_NAME$",
             "$MODULE_NAMESPACE$\\$STUDLY_NAME$\\Database\\Factories\\": "database/factories/",
             "$MODULE_NAMESPACE$\\$STUDLY_NAME$\\Database\\Seeders\\": "database/seeders/"
         }

diff --git a/src/Generators/ModuleGenerator.php b/src/Generators/ModuleGenerator.php
@@ -662,6 +662,16 @@ protected function getAuthorEmailReplacement()
         return $this->author['email'] ?: $this->module->config('composer.author.email');
     }
 
+    /**
+     * Get replacement for $APP_FOLDER_NAME$.
+     *
+     * @return string
+     */
+    protected function getAppFolderNameReplacement()
+    {
+        return  $this->module->config('paths.app_folder');
+    }
+
     protected function getProviderNamespaceReplacement(): string
     {
         return str_replace('\\', '\\\\', GenerateConfigReader::read('provider')->getNamespace());