From 6039275fda1fb7648db875d4b66da5c0e2c86017 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 30 Mar 2023 11:16:02 +0200
Subject: [PATCH] wip #5834 @0.25 | Fix generate namespace issue when defining
 custom base controller

---
 src/app/Magic/Models/CubistMagicAbstractModel.php | 2 +-
 src/app/Magic/Models/CubistMagicNestedModel.php   | 4 +++-
 src/resources/cubistmagic/Controller.stub         | 4 +---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index 04a9402..1f43739 100644
--- a/src/app/Magic/Models/CubistMagicAbstractModel.php
+++ b/src/app/Magic/Models/CubistMagicAbstractModel.php
@@ -273,7 +273,7 @@ class CubistMagicAbstractModel extends Model implements HasMedia
      */
     protected function _getBaseController()
     {
-        return 'CubistMagicController';
+        return CubistMagicController::class;
     }
 
     protected function _replaceInCode($stub, $dest)
diff --git a/src/app/Magic/Models/CubistMagicNestedModel.php b/src/app/Magic/Models/CubistMagicNestedModel.php
index 0af4a5f..78333f4 100644
--- a/src/app/Magic/Models/CubistMagicNestedModel.php
+++ b/src/app/Magic/Models/CubistMagicNestedModel.php
@@ -2,6 +2,8 @@
 
 namespace Cubist\Backpack\app\Magic\Models;
 
+use Cubist\Backpack\app\Magic\Controllers\CubistMagicNestedController;
+
 class CubistMagicNestedModel extends CubistMagicPageModel
 {
 
@@ -25,7 +27,7 @@ class CubistMagicNestedModel extends CubistMagicPageModel
      */
     protected function _getBaseController()
     {
-        return 'CubistMagicNestedController';
+        return CubistMagicNestedController::class;
     }
 
 
diff --git a/src/resources/cubistmagic/Controller.stub b/src/resources/cubistmagic/Controller.stub
index 0c75b9c..a481a8e 100644
--- a/src/resources/cubistmagic/Controller.stub
+++ b/src/resources/cubistmagic/Controller.stub
@@ -2,9 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
-use Cubist\Backpack\app\Magic\Controllers\_EXTENDS_;
-
-class _CONTROLLERCLASS_ extends _EXTENDS_
+class _CONTROLLERCLASS_ extends \_EXTENDS_
 {
     protected $_modelNamespace = '_MODELNAMESPACE_';
     protected $_routeURL = '_ROUTEURL_';
-- 
2.39.5