Respect model namespace when guessing

laravel-shift · Dec 18, 2024 · 48d1f1f · 48d1f1f
1 parent 90730bf
commit 48d1f1f
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 5 deletions.
diff --git a/src/Generators/ControllerGenerator.php b/src/Generators/ControllerGenerator.php
@@ -222,7 +222,13 @@ private function fullyQualifyModelReference(string $sub_namespace, string $model
             return $model->fullyQualifiedClassName();
         }
 
-        return config('blueprint.namespace') . '\\' . ($sub_namespace ? $sub_namespace . '\\' : '') . $model_name;
+        return sprintf(
+            '%s\\%s%s%s',
+            config('blueprint.namespace'),
+            config('blueprint.models_namespace') ? config('blueprint.models_namespace') . '\\' : '',
+            $sub_namespace ? $sub_namespace . '\\' : '',
+            $model_name
+        );
     }
 
     private function determineModel(Controller $controller, ?string $reference): string

diff --git a/tests/Feature/Generators/ControllerGeneratorTest.php b/tests/Feature/Generators/ControllerGeneratorTest.php
@@ -130,6 +130,7 @@ public function output_respects_configuration(): void
     {
         $this->app['config']->set('blueprint.app_path', 'src/path');
         $this->app['config']->set('blueprint.namespace', 'Some\\App');
+        $this->app['config']->set('blueprint.models_namespace', '');
         $this->app['config']->set('blueprint.controllers_namespace', 'Other\\Http');
 
         $this->filesystem->expects('stub')

diff --git a/tests/fixtures/controllers/inertia-render.php b/tests/fixtures/controllers/inertia-render.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Customer;
+use App\Models\Customer;
 use Illuminate\Http\Request;
 use Inertia\Inertia;
 use Inertia\Response;

diff --git a/tests/fixtures/controllers/with-all-policies.php b/tests/fixtures/controllers/with-all-policies.php
@@ -4,7 +4,7 @@
 
 use App\Http\Requests\PostStoreRequest;
 use App\Http\Requests\PostUpdateRequest;
-use App\Post;
+use App\Models\Post;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Gate;

diff --git a/tests/fixtures/controllers/with-authorize-resource.php b/tests/fixtures/controllers/with-authorize-resource.php
@@ -4,7 +4,7 @@
 
 use App\Http\Requests\PostStoreRequest;
 use App\Http\Requests\PostUpdateRequest;
-use App\Post;
+use App\Models\Post;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\View\View;

diff --git a/tests/fixtures/controllers/with-some-policies.php b/tests/fixtures/controllers/with-some-policies.php
@@ -4,7 +4,7 @@
 
 use App\Http\Requests\PostStoreRequest;
 use App\Http\Requests\PostUpdateRequest;
-use App\Post;
+use App\Models\Post;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Gate;

diff --git a/tests/fixtures/drafts/controller-configured.yaml b/tests/fixtures/drafts/controller-configured.yaml
@@ -13,4 +13,5 @@ controllers:
 config:
   app_path: shift
   namespace: Some\App
+  models_namespace: null
   controllers_namespace: Other\Http