Merge branch '7.x' into 8.x

orchestral · Sep 19, 2023 · 6a9927e · 6a9927e
2 parents 733a52d + 049388b
commit 6a9927e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/Concerns/CodeGenerator.php b/src/Concerns/CodeGenerator.php
@@ -3,6 +3,7 @@
 namespace Orchestra\Canvas\Core\Concerns;
 
 use Illuminate\Console\Concerns\CreatesMatchingTest;
+use Illuminate\Support\Str;
 
 trait CodeGenerator
 {
@@ -48,7 +49,7 @@ public function generateCode(): bool
             $this->handleTestCreationUsingCanvas($path);
         }
 
-        return tap($this->codeHasBeenGenerated($className), function ($exitCode) use ($className, $path) {
+        return tap($this->codeHasBeenGenerated($className, $path), function ($exitCode) use ($className, $path) {
             $this->afterCodeHasBeenGenerated($className, $path);
         });
     }
@@ -66,7 +67,11 @@ public function generatingCode(string $stub, string $className): string
      */
     public function codeAlreadyExists(string $className, string $path): bool
     {
-        $this->components->error(sprintf('%s [%s] already exists!', $this->type, $path));
+        $this->components->error(
+            sprintf(
+                '%s [%s] already exists!', $this->type, Str::after($path, $this->generatorPreset()->basePath())
+            )
+        );
 
         return false;
     }
@@ -76,7 +81,11 @@ public function codeAlreadyExists(string $className, string $path): bool
      */
     public function codeHasBeenGenerated(string $className, string $path): bool
     {
-        $this->components->info(sprintf('%s [%s] created successfully.', $this->type, $path));
+        $this->components->info(
+            sprintf(
+                '%s [%s] created successfully.', $this->type, Str::after($path, $this->generatorPreset()->basePath())
+            )
+        );
 
         return true;
     }

diff --git a/src/Contracts/GeneratesCode.php b/src/Contracts/GeneratesCode.php
@@ -4,7 +4,6 @@
 
 interface GeneratesCode
 {
-
     /**
      * Handle generating code.
      */