Merge branch '7.x' into 8.x

orchestral · Sep 19, 2023 · 81aae88 · 81aae88
2 parents 6a9927e + 1fa9cfc
commit 81aae88
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/Concerns/CodeGenerator.php b/src/Concerns/CodeGenerator.php
@@ -69,7 +69,7 @@ public function codeAlreadyExists(string $className, string $path): bool
     {
         $this->components->error(
             sprintf(
-                '%s [%s] already exists!', $this->type, Str::after($path, $this->generatorPreset()->basePath())
+                '%s [%s] already exists!', $this->type, Str::after($path, $this->generatorPreset()->basePath().DIRECTORY_SEPARATOR)
             )
         );
 
@@ -83,7 +83,7 @@ public function codeHasBeenGenerated(string $className, string $path): bool
     {
         $this->components->info(
             sprintf(
-                '%s [%s] created successfully.', $this->type, Str::after($path, $this->generatorPreset()->basePath())
+                '%s [%s] created successfully.', $this->type, Str::after($path, $this->generatorPreset()->basePath().DIRECTORY_SEPARATOR)
             )
         );
 

diff --git a/src/Concerns/CreatesUsingGeneratorPreset.php b/src/Concerns/CreatesUsingGeneratorPreset.php
@@ -16,11 +16,17 @@ trait CreatesUsingGeneratorPreset
      */
     protected function addGeneratorPresetOptions()
     {
+        $message = 'to running the command';
+
+        if (property_exists($this, 'type') && ! empty($this->type)) {
+            $message = 'when generating '.Str::lower($this->type);
+        }
+
         $this->getDefinition()->addOption(new InputOption(
             'preset',
             null,
             InputOption::VALUE_OPTIONAL,
-            sprintf('Preset used when generating %s', Str::lower($this->type)),
+            sprintf('Preset used %s', $message),
             null,
         ));
     }