fix: minor fixes from conflict

Author: mitulgolakiya

src/CoreUIPreset.php

@@ -5,10 +5,8 @@
 use Illuminate\Console\Command;
 use Illuminate\Container\Container;
 use Illuminate\Filesystem\Filesystem;
-use Illuminate\Support\Str;
 use InfyOm\GeneratorHelpers\LaravelUtils;
 use Laravel\Ui\Presets\Preset;
-use Symfony\Component\Finder\SplFileInfo;
 
 class CoreUIPreset extends Preset
 {
@@ -29,11 +27,11 @@ public function __construct(Command $command)
     protected static function updatePackageArray(array $packages)
     {
         return [
-                'bootstrap' => '^4.1.0',
-                'jquery' => '^3.2',
-                'popper.js' => '^1.12',
+                'bootstrap'      => '^4.1.0',
+                'jquery'         => '^3.2',
+                'popper.js'      => '^1.12',
                 '@coreui/coreui' => '^3.2.2',
-                "@coreui/icons" => "^1.0.1",
+                '@coreui/icons'  => '^1.0.1',
             ] + $packages;
     }
 
@@ -73,7 +71,6 @@ public function installAuth()
         $this->ensureDirectoriesExist($viewsPath);
 
         $this->scaffoldAuth();
-        $this->scaffoldController();
     }
 
     protected function ensureDirectoriesExist($viewsPath)
@@ -91,23 +88,6 @@ protected function ensureDirectoriesExist($viewsPath)
         }
     }
 
-    protected function scaffoldController()
-    {
-        if (!is_dir($directory = app_path('Http/Controllers/Auth'))) {
-            mkdir($directory, 0755, true);
-        }
-
-        $filesystem = new Filesystem;
-
-        collect($filesystem->allFiles(base_path('vendor/laravel/ui/stubs/Auth')))
-            ->each(function (SplFileInfo $file) use ($filesystem) {
-                $filesystem->copy(
-                    $file->getPathname(),
-                    app_path('Http/Controllers/Auth/'.Str::replaceLast('.stub', '.php', $file->getFilename()))
-                );
-            });
-    }
-
     protected function scaffoldAuth()
     {
         file_put_contents(app_path('Http/Controllers/HomeController.php'), $this->compileHomeControllerStub());
@@ -118,19 +98,11 @@ protected function scaffoldAuth()
             FILE_APPEND
         );
 
-        tap(new Filesystem, function ($filesystem) {
+        tap(new Filesystem(), function ($filesystem) {
 
             $filesystem->copyDirectory(__DIR__.'/../coreui-stubs/auth', resource_path('views/auth'));
             $filesystem->copyDirectory(__DIR__.'/../coreui-stubs/layouts', resource_path('views/layouts'));
             $filesystem->copy(__DIR__.'/../coreui-stubs/home.blade.php', resource_path('views/home.blade.php'));
-
-            collect($filesystem->allFiles(base_path('vendor/laravel/ui/stubs/migrations')))
-                ->each(function (SplFileInfo $file) use ($filesystem) {
-                    $filesystem->copy(
-                        $file->getPathname(),
-                        database_path('migrations/'.$file->getFilename())
-                    );
-                });
         });
     }
 
@@ -142,4 +114,4 @@ protected function compileHomeControllerStub()
             file_get_contents(base_path('vendor/laravel/ui/src/Auth/stubs/controllers/HomeController.stub'))
         );
     }
-}
+}