laravel7

composer.json

@@ -14,7 +14,7 @@
     "require": {
         "php": ">=7.1.0",
         "symfony/dom-crawler": "~3.1|~4.0",
-        "laravel/framework": "~5.5|~6.0",
+        "laravel/framework": "~5.5|~6.0|~7.0",
         "doctrine/dbal": "2.*",
         "spatie/eloquent-sortable": "3.*"
     },

src/AdminServiceProvider.php

@@ -156,7 +156,7 @@ class AdminServiceProvider extends ServiceProvider
             $this->publishes([__DIR__.'/../config' => config_path()], 'dcat-admin-config');
             $this->publishes([__DIR__.'/../resources/lang' => resource_path('lang')], 'dcat-admin-lang');
             $this->publishes([__DIR__.'/../database/migrations' => database_path('migrations')], 'dcat-admin-migrations');
-            $this->publishes([__DIR__.'/../resources/assets/dist' => public_path(Admin::asset()->getRealPath('@admin'))], 'dcat-admin-assets');
+            $this->publishes([__DIR__.'/../resources/dist' => public_path(Admin::asset()->getRealPath('@admin'))], 'dcat-admin-assets');
         }
     }
 

src/Console/InstallCommand.php

@@ -99,7 +99,11 @@ class InstallCommand extends Command
 
         $this->laravel['files']->put(
             $homeController,
-            str_replace('DummyNamespace', config('admin.route.namespace'), $contents)
+            str_replace(
+                ['DummyNamespace', 'MetricsNamespace'],
+                [$this->namespace('Controllers'), $this->namespace('Metrics\\Examples')],
+                $contents
+            )
         );
         $this->line('<info>HomeController file was created:</info> '.str_replace(base_path(), '', $homeController));
     }
@@ -117,8 +121,8 @@ class InstallCommand extends Command
         $this->laravel['files']->put(
             $authController,
             str_replace(
-                ['DummyNamespace', 'MetricsNamespace'],
-                [$this->namespace('Controllers'), $this->namespace('Metrics\\Examples')],
+                ['DummyNamespace'],
+                [$this->namespace('Controllers')],
                 $contents
             )
         );
@@ -159,7 +163,9 @@ class InstallCommand extends Command
      */
     protected function namespace($name = null)
     {
-        return trim(str_replace('/', '\\', $this->directory), '\\').($name ? "\\{$name}" : '');
+        $base = str_replace('\\Controllers', '\\', config('admin.route.namespace'));
+
+        return trim($base, '\\').($name ? "\\{$name}" : '');
     }
 
     /**
@@ -186,7 +192,7 @@ class InstallCommand extends Command
         $file = $this->directory.'/routes.php';
 
         $contents = $this->getStub('routes');
-        $this->laravel['files']->put($file, str_replace('DummyNamespace', config('admin.route.namespace'), $contents));
+        $this->laravel['files']->put($file, str_replace('DummyNamespace', $this->namespace('Controllers'), $contents));
         $this->line('<info>Routes file was created:</info> '.str_replace(base_path(), '', $file));
     }
 

src/Console/stubs/HomeController.stub

@@ -2,7 +2,7 @@
 
 namespace DummyNamespace;
 
-use MetricsNamespace\Examples;
+use MetricsNamespace;
 use App\Http\Controllers\Controller;
 use Dcat\Admin\Controllers\Dashboard;
 use Dcat\Admin\Layout\Column;