Make relativeClassName return class name relative to models namespace (#491)

Author: promatik

src/Tracer.php

@@ -244,9 +244,6 @@ private function translateColumns(array $columns)
     private function relativeClassName($model)
     {
         $name = Blueprint::relativeNamespace(get_class($model));
-        if (config('blueprint.models_namespace')) {
-            return $name;
-        }
 
         return ltrim(str_replace(config('blueprint.models_namespace'), '', $name), '\\');
     }

tests/Feature/Commands/TraceCommandTest.php

@@ -49,6 +49,27 @@ public function it_shows_the_number_of_traced_models()
     }
 
     /** @test */
+    public function relative_class_name_removes_models_namespace()
+    {
+        $this->requireFixture('models/comment.php');
+        $this->requireFixture('models/custom-models-namespace.php');
+
+        $method = new \ReflectionMethod(Tracer::class, 'relativeClassName');
+        $method->setAccessible(true);
+
+        // App namespace
+        config(['blueprint.models_namespace' => '']);
+
+        $this->assertEquals($method->invoke(new Tracer(), app('App\Comment')), 'Comment');
+        $this->assertEquals($method->invoke(new Tracer(), app('App\Models\Tag')), 'Models\Tag');
+
+        // Models namespace
+        config(['blueprint.models_namespace' => 'Models']);
+
+        $this->assertEquals($method->invoke(new Tracer(), app('App\Comment')), 'Comment');
+        $this->assertEquals($method->invoke(new Tracer(), app('App\Models\Tag')), 'Tag');
+    }
+  
     public function it_passes_the_command_path_to_tracer()
     {
         $this->filesystem->shouldReceive('exists')

tests/TestCase.php

@@ -38,6 +38,11 @@ public function fixture(string $path)
         return file_get_contents(__DIR__ . '/' . 'fixtures' . '/' . ltrim($path, '/'));
     }
 
+    public function requireFixture(string $path)
+    {
+        require_once __DIR__ . '/' . 'fixtures' . '/' . ltrim($path, '/');
+    }
+
     public function stub(string $path)
     {
         return file_get_contents(__DIR__ . '/../' . 'stubs' . '/' . ltrim($path, '/'));