Fix incorrect imports when using a custom namespace for models (#186)

Author: Pr3d4dor

src/Generators/ControllerGenerator.php

@@ -86,7 +86,7 @@ private function buildMethods(Controller $controller)
 
             if (in_array($name, ['edit', 'update', 'show', 'destroy'])) {
                 $context = Str::singular($controller->prefix());
-                $reference = config('blueprint.namespace') . '\\' . $context;
+                $reference = $this->fullyQualifyModelReference($controller->namespace(), Str::camel($context));
                 $variable = '$' . Str::camel($context);
 
                 // TODO: verify controller prefix references a model

tests/Feature/Generator/ControllerGeneratorTest.php

@@ -70,6 +70,36 @@ public function output_writes_migration_for_controller_tree($definition, $path,
         $this->assertEquals(['created' => [$path]], $this->subject->output($tree));
     }
 
+    /**
+    * @test
+    */
+    public function output_generates_controllers_with_models_with_custom_namespace_correctly()
+    {
+        $definition = 'definitions/custom-models-namespace.bp';
+        $path = 'app/Http/Controllers/TagController.php';
+        $controller = 'controllers/custom-models-namespace.php';
+
+        $this->app['config']->set('blueprint.models_namespace', 'Models');
+
+        $this->files->expects('stub')
+            ->with('controller/class.stub')
+            ->andReturn(file_get_contents('stubs/controller/class.stub'));
+        $this->files->expects('stub')
+            ->with('controller/method.stub')
+            ->andReturn(file_get_contents('stubs/controller/method.stub'));
+
+        $this->files->expects('exists')
+            ->with(dirname($path))
+            ->andReturnTrue();
+        $this->files->expects('put')
+            ->with($path, $this->fixture($controller));
+
+        $tokens = $this->blueprint->parse($this->fixture($definition));
+        $tree = $this->blueprint->analyze($tokens);
+
+        $this->assertEquals(['created' => [$path]], $this->subject->output($tree));
+    }
+
     /**
      * @test
      */

tests/Feature/Generator/ModelGeneratorTest.php

@@ -243,6 +243,42 @@ public function output_generates_models_with_guarded_property_when_config_option
         $this->assertEquals(['created' => ['app/Comment.php']], $this->subject->output($tree));
     }
 
+    /**
+    * @test
+    */
+    public function output_generates_models_with_custom_namespace_correctly()
+    {
+        $definition = 'definitions/custom-models-namespace.bp';
+        $path = 'app/Models/Tag.php';
+        $model = 'models/custom-models-namespace.php';
+
+        $this->app['config']->set('blueprint.models_namespace', 'Models');
+
+        $this->files->expects('stub')
+            ->with('model/class.stub')
+            ->andReturn(file_get_contents('stubs/model/class.stub'));
+        $this->files->expects('stub')
+            ->with('model/fillable.stub')
+            ->andReturn(file_get_contents('stubs/model/fillable.stub'));
+        $this->files->expects('stub')
+            ->with('model/casts.stub')
+            ->andReturn(file_get_contents('stubs/model/casts.stub'));
+        $this->files->expects('stub')
+            ->with('model/method.stub')
+            ->andReturn(file_get_contents('stubs/model/method.stub'));
+
+        $this->files->expects('exists')
+            ->with('app/Models')
+            ->andReturnTrue();
+        $this->files->expects('put')
+            ->with($path, $this->fixture($model));
+
+        $tokens = $this->blueprint->parse($this->fixture($definition));
+        $tree = $this->blueprint->analyze($tokens);
+
+        $this->assertEquals(['created' => [$path]], $this->subject->output($tree));
+    }
+
     public function modelTreeDataProvider()
     {
         return [

tests/fixtures/controllers/custom-models-namespace.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Requests\TagStoreRequest;
+use App\Http\Requests\TagUpdateRequest;
+use App\Http\Resources\Tag as TagResource;
+use App\Http\Resources\TagCollection;
+use App\Models\Tag;
+use Illuminate\Http\Request;
+
+class TagController extends Controller
+{
+    /**
+     * @param \Illuminate\Http\Request $request
+     * @return \App\Http\Resources\TagCollection
+     */
+    public function index(Request $request)
+    {
+        $tags = Tag::all();
+
+        return new TagCollection($tags);
+    }
+
+    /**
+     * @param \App\Http\Requests\TagStoreRequest $request
+     * @return \App\Http\Resources\Tag
+     */
+    public function store(TagStoreRequest $request)
+    {
+        $tag = Tag::create($request->all());
+
+        return new TagResource($tag);
+    }
+
+    /**
+     * @param \Illuminate\Http\Request $request
+     * @param \App\Models\Tag $tag
+     * @return \App\Http\Resources\Tag
+     */
+    public function show(Request $request, Tag $tag)
+    {
+        return new TagResource($tag);
+    }
+
+    /**
+     * @param \App\Http\Requests\TagUpdateRequest $request
+     * @param \App\Models\Tag $tag
+     * @return \App\Http\Resources\Tag
+     */
+    public function update(TagUpdateRequest $request, Tag $tag)
+    {
+        return new TagResource($tag);
+    }
+
+    /**
+     * @param \Illuminate\Http\Request $request
+     * @param \App\Models\Tag $tag
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(Request $request, Tag $tag)
+    {
+        $tag->delete();
+
+        return response()->noContent(200);
+    }
+}

tests/fixtures/definitions/custom-models-namespace.bp

@@ -0,0 +1,10 @@
+models:
+  Tag:
+    name: string:50
+    icon: string nullable
+    active: boolean default:true
+    softDeletes
+
+controllers:
+  Tag:
+    resource: api

tests/fixtures/models/custom-models-namespace.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class Tag extends Model
+{
+    use SoftDeletes;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'name',
+        'icon',
+        'active',
+    ];
+
+    /**
+     * The attributes that should be cast to native types.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'id' => 'integer',
+        'active' => 'boolean',
+    ];
+}