wip

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
orchestral · Dec 11, 2024 · cb3e56a · cb3e56a
1 parent 8be266d
commit cb3e56a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/src/Foundation/Console/Actions/Action.php b/src/Foundation/Console/Actions/Action.php
@@ -24,11 +24,24 @@ abstract class Action
      */
     protected function pathLocation(string $path): string
     {
+        $packagePath = package_path();
+
         if (! \is_null($this->workingPath)) {
             $path = str_replace(rtrim($this->workingPath, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR, '', $path);
+
+            $prefix = match ($this->workingPath) {
+                app()->basePath() => '@laravel',
+                $packagePath => '.',
+                default => '@'
+            };
+
+            return implode('/', [$prefix, ltrim($path, '/')]);
         }
 
-        $path = str_replace(package_path(), '', $path);
+
+        if (str_starts_with($path, $packagePath)) {
+            return sprintf('./%s', ltrim(str_replace($packagePath, '', $path), '/'));
+        }
 
         return $path;
     }

diff --git a/tests/Foundation/Console/CreateSqliteDbCommandTest.php b/tests/Foundation/Console/CreateSqliteDbCommandTest.php
@@ -35,7 +35,7 @@ public function it_can_generate_database_using_command()
             $this->assertFalse(file_exists(database_path('database.sqlite')));
 
             $this->artisan('package:create-sqlite-db')
-                ->expectsOutputToContain('File [database/database.sqlite] generated')
+                ->expectsOutputToContain('File [@laravel/database/database.sqlite] generated')
                 ->assertOk();
 
             $this->assertTrue(file_exists(database_path('database.sqlite')));
@@ -49,7 +49,7 @@ public function it_cannot_generate_database_using_command_when_database_already_
             $this->assertTrue(file_exists(database_path('database.sqlite')));
 
             $this->artisan('package:create-sqlite-db')
-                ->expectsOutputToContain('File [database/database.sqlite] already exists')
+                ->expectsOutputToContain('File [@laravel/database/database.sqlite] already exists')
                 ->assertOk();
         });
     }

diff --git a/tests/Foundation/Console/DropSqliteDbCommandTest.php b/tests/Foundation/Console/DropSqliteDbCommandTest.php
@@ -35,7 +35,7 @@ public function it_can_drop_database_using_command()
             $this->assertTrue(file_exists(database_path('database.sqlite')));
 
             $this->artisan('package:drop-sqlite-db')
-                ->expectsOutputToContain('File [database/database.sqlite] has been deleted')
+                ->expectsOutputToContain('File [@laravel/database/database.sqlite] has been deleted')
                 ->assertOk();
 
             $this->assertFalse(file_exists(database_path('database.sqlite')));
@@ -49,7 +49,7 @@ public function it_cannot_drop_database_using_command_when_database_doesnt_exist
             $this->assertFalse(file_exists(database_path('database.sqlite')));
 
             $this->artisan('package:drop-sqlite-db')
-                ->expectsOutputToContain('File [database/database.sqlite] doesn\'t exists')
+                ->expectsOutputToContain('File [@laravel/database/database.sqlite] doesn\'t exists')
                 ->assertOk();
         });
     }