Merge pull request #64 from spiral/bugfix/scaffolder-path

Remove the root directory from the filename generated by Scaffolder
spiral · Oct 18, 2023 · 59e5600 · 59e5600
2 parents fdbe8f0 + de652cf
commit 59e5600
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 22 deletions.
diff --git a/composer.json b/composer.json
@@ -44,21 +44,21 @@
     "nyholm/psr7": "^1.5",
     "mockery/mockery": "^1.5",
     "phpunit/phpunit": "^9.6 || ^10.0",
-    "spiral/auth": "^3.7",
-    "spiral/auth-http": "^3.7",
-    "spiral/boot": "^3.7",
-    "spiral/events": "^3.7",
-    "spiral/console": "^3.7",
-    "spiral/http": "^3.7",
-    "spiral/mailer": "^3.7",
-    "spiral/queue": "^3.7",
-    "spiral/session": "^3.7",
-    "spiral/security": "^3.7",
-    "spiral/tokenizer": "^3.7",
-    "spiral/storage": "^3.7",
-    "spiral/views": "^3.7",
-    "spiral/translator": "^3.7",
-    "spiral/scaffolder": "^3.7",
+    "spiral/auth": "^3.8.4",
+    "spiral/auth-http": "^3.8.4",
+    "spiral/boot": "^3.8.4",
+    "spiral/events": "^3.8.4",
+    "spiral/console": "^3.8.4",
+    "spiral/http": "^3.8.4",
+    "spiral/mailer": "^3.8.4",
+    "spiral/queue": "^3.8.4",
+    "spiral/session": "^3.8.4",
+    "spiral/security": "^3.8.4",
+    "spiral/tokenizer": "^3.8.4",
+    "spiral/storage": "^3.8.4",
+    "spiral/views": "^3.8.4",
+    "spiral/translator": "^3.8.4",
+    "spiral/scaffolder": "^3.8.4",
     "symfony/mime": "^6.0"
   },
   "suggest": {

diff --git a/src/Traits/InteractsWithScaffolder.php b/src/Traits/InteractsWithScaffolder.php
@@ -24,7 +24,11 @@ public function assertScaffolderCommandSame(
             $this->assertSame($expected, $data, 'Generated code is not the same with expected.');
 
             if ($expectedFilename) {
-                $this->assertSame($expectedFilename, $filename, 'Generated filename is not the same with expected.');
+                $root = $this->getDirectoryByAlias('root');
+                $this->assertSame(
+                    \str_replace($root, '', $expectedFilename),
+                    \str_replace($root, '', $filename), 'Generated filename is not the same with expected.'
+                );
             }
 
             return true;
@@ -51,7 +55,11 @@ public function assertScaffolderCommandContains(
             }
 
             if ($expectedFilename) {
-                $this->assertSame($expectedFilename, $filename, 'Generated filename is not the same with expected.');
+                $root = $this->getDirectoryByAlias('root');
+                $this->assertSame(
+                    \str_replace($root, '', $expectedFilename),
+                    \str_replace($root, '', $filename), 'Generated filename is not the same with expected.'
+                );
             }
 
             return true;
@@ -69,11 +77,6 @@ public function mockScaffolder(string $command, array $args, \Closure $expected)
             : null;
 
         $files = $this->mockContainer(FilesInterface::class);
-        $files->shouldReceive('normalizePath')->andReturnUsing(function (string $filename) {
-            $root = $this->getDirectoryByAlias('root');
-
-            return \str_replace($root, '', $filename);
-        });
         $files->shouldReceive('exists')->andReturnFalse();
         $files->shouldReceive('write')->withArgs($expected);