Merge branch '8.x' into 8/prompt-namespace-prefix

Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Dec 11, 2024 · f8e9ba1 · f8e9ba1
2 parents 5a44f51 + 435fa95
commit f8e9ba1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/Console/DevToolCommand.php b/src/Console/DevToolCommand.php
@@ -256,11 +256,11 @@ protected function appendAutoloadDevToComposer(array $content, Filesystem $files
                 $content['autoload-dev']['psr-4'][$namespace] = $path;
 
                 $this->components->task(\sprintf(
-                    'Added [%s] for [%s] to Composer', $namespace, $path
+                    'Added [%s] for [%s] to Composer', $namespace, '/'.rtrim($path, '/')
                 ));
             } else {
                 $this->components->twoColumnDetail(
-                    \sprintf('Composer already contain [%s] path assigned to [%s] namespace', $path, $autoloads[$path]),
+                    \sprintf('Composer already contains [%s] path assigned to [%s] namespace', '/'.rtrim($path, '/'), $autoloads[$path]),
                     '<fg=yellow;options=bold>SKIPPED</>'
                 );
             }

diff --git a/tests/Console/stubs/composer.json b/tests/Console/stubs/composer.json
@@ -1,9 +1,3 @@
 {
-    "autoload-dev": {
-        "psr-4": {
-            "Workbench\\App\\": "workbench/app",
-            "Workbench\\Database\\Factories\\": "workbench/database/factories",
-            "Workbench\\Database\\Seeders\\": "workbench/database/seeders"
-        }
-    }
+    "$schema": "https://getcomposer.org/schema.json"
 }