wip #5834 @0.25 | Fix generate namespace issue when defining custom base controller

diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index 04a9402628611b1d7867c0900e369c5a9457e5a5..1f437392b2388fb37cada0f9e29152014214178a 100644 (file)
--- 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 0af4a5fc803d6513853b8ff9e35d441a05502acb..78333f48ed292f0364fce1ed3e4d45d0ba77fdbc 100644 (file)
--- 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 0c75b9c9b74992700451b8defbf0ac4e33344176..a481a8eef43ca874058c1305be5679d6b9967ebf 100644 (file)
--- 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_';