fixes #2506 - installation process bugs

Author: tabacitu

CHANGELOG.md

@@ -8,6 +8,12 @@ All Notable changes to `Backpack CRUD` will be documented in this file.
 
 -----------
 
+## 4.0.45 - 2020-03-05
+
+### Fixed
+- installation command did not correctly use the new version of Symphony Process;
+
+
 ## 4.0.44 - 2020-03-04
 
 ### Fixed

src/app/Console/Commands/AddSidebarContent.php

@@ -53,7 +53,7 @@ public function handle()
                 $this->error('Could not write to sidebar_content file.');
             }
         } else {
-            $this->error("The sidebar_content file does not exist. Make sure Backpack\Base is properly installed.");
+            $this->error("The sidebar_content file does not exist. Make sure Backpack is properly installed.");
         }
     }
 }

src/app/Console/Commands/Install.php

@@ -5,6 +5,7 @@
 use Illuminate\Console\Command;
 use Symfony\Component\Process\Exception\ProcessFailedException;
 use Symfony\Component\Process\Process;
+use Artisan;
 
 class Install extends Command
 {
@@ -63,33 +64,38 @@ public function handle()
         $this->progressBar->advance();
 
         $this->line(' Publishing configs, langs, views, js and css files');
-        $this->executeProcess('php artisan vendor:publish --provider="Backpack\CRUD\BackpackServiceProvider" --tag="minimum"');
+        $this->executeArtisanProcess('vendor:publish', [
+                '--provider' => 'Backpack\CRUD\BackpackServiceProvider', 
+                '--tag' => 'minimum'
+        ]);
 
         $this->line(' Publishing config for notifications - prologue/alerts');
-        $this->executeProcess('php artisan vendor:publish --provider="Prologue\Alerts\AlertsServiceProvider"');
+        $this->executeArtisanProcess('vendor:publish', [
+            '--provider' => 'Prologue\Alerts\AlertsServiceProvider'
+        ]);
 
         $this->line(" Generating users table (using Laravel's default migrations)");
-        $this->executeProcess('php artisan migrate');
+        $this->executeArtisanProcess('migrate');
 
         $this->line(" Creating App\Models\BackpackUser.php");
-        $this->executeProcess('php artisan backpack:publish-user-model');
+        $this->executeArtisanProcess('backpack:publish-user-model');
 
         $this->line(" Creating App\Http\Middleware\CheckIfAdmin.php");
-        $this->executeProcess('php artisan backpack:publish-middleware');
+        $this->executeArtisanProcess('backpack:publish-middleware');
 
         // elFinder steps
         if ($shouldInstallElfinder) {
             $this->line(' Installing barryvdh/laravel-elfinder');
-            $this->executeProcess('composer require barryvdh/laravel-elfinder');
+            $this->executeProcess(['composer', 'require', 'barryvdh/laravel-elfinder']);
 
             $this->line(' Creating uploads directory');
             switch (DIRECTORY_SEPARATOR) {
                 case '/': // unix
-                    $createUploadDirectoryCommand = 'mkdir -p public/uploads';
+                    $createUploadDirectoryCommand = ['mkdir', '-p', 'public/uploads'];
                     break;
                 case '\\': // windows
                     if (! file_exists('public\uploads')) {
-                        $createUploadDirectoryCommand = 'mkdir public\uploads';
+                        $createUploadDirectoryCommand = ['mkdir', 'public\uploads'];
                     }
                     break;
             }
@@ -98,18 +104,23 @@ public function handle()
             }
 
             $this->line(' Publishing elFinder assets');
-            $this->executeProcess('php artisan elfinder:publish');
+            $this->executeArtisanProcess('elfinder:publish');
 
             $this->line(' Publishing custom elfinder views');
-            $this->executeProcess('php artisan vendor:publish --provider="Backpack\CRUD\BackpackServiceProvider" --tag="elfinder"');
+            $this->executeArtisanProcess('vendor:publish', [
+                '--provider' => 'Backpack\CRUD\BackpackServiceProvider', 
+                '--tag' => 'elfinder'
+            ]);
 
             $this->line(' Adding sidebar menu item for File Manager');
             switch (DIRECTORY_SEPARATOR) {
                 case '/': // unix
-                    $this->executeProcess('php artisan backpack:add-sidebar-content "<li class="nav-item"><a class="nav-link" href=\"{{ backpack_url(\'elfinder\') }}\"><i class=\"nav-icon fa fa-files-o\"></i> <span>{{ trans(\'backpack::crud.file_manager\') }}</span></a></li>"');
+                    $this->executeArtisanProcess('backpack:add-sidebar-content', [ 
+                        'code' => '<li class="nav-item"><a class="nav-link" href="{{ backpack_url(\'elfinder\') }}\"><i class="nav-icon fa fa-files-o"></i> <span>{{ trans(\'backpack::crud.file_manager\') }}</span></a></li>']);
                     break;
                 case '\\': // windows
-                    $this->executeProcess('php artisan backpack:add-sidebar-content "<li class="nav-item"><a class="nav-link" href=""{{ backpack_url(\'elfinder\') }}""><i class=""nav-icon fa fa-files-o""></i> <span>{{ trans(\'backpack::crud.file_manager\') }}</span></a></li>"');
+                    $this->executeArtisanProcess('backpack:add-sidebar-content', [
+                        'code' => '<li class="nav-item"><a class="nav-link" href=""{{ backpack_url(\'elfinder\') }}""><i class=""nav-icon fa fa-files-o""></i> <span>{{ trans(\'backpack::crud.file_manager\') }}</span></a></li>']);
                     break;
             }
         }
@@ -158,6 +169,37 @@ public function executeProcess($command, $beforeNotice = false, $afterNotice = f
         }
     }
 
+    /**
+     * Run an artisan command.
+     * 
+     * @param  string  $command      The artisan command to be run.
+     * @param  array   $arguments    Key-value array of arguments to the artisan command.
+     * @param  bool    $beforeNotice Information for the user before the command is run
+     * @param  bool    $afterNotice  Information for the user after the command is run
+     *
+     * @return mixed Command-line output
+     */
+    public function executeArtisanProcess($command, $arguments = [], $beforeNotice = false, $afterNotice = false)
+    {
+        $beforeNotice = $beforeNotice ? ' '.$beforeNotice : 'php artisan '.$command.' '.implode(' ', $arguments);
+
+        $this->echo('info', $beforeNotice);
+ 
+        try {
+            Artisan::call($command, $arguments);
+        } catch (Exception $e) {
+            throw new ProcessFailedException($e);
+        }
+
+        if ($this->progressBar) {
+            $this->progressBar->advance();
+        }
+
+        if ($afterNotice) {
+            $this->echo('info', $afterNotice);
+        }
+    }
+
     /**
      * Write text to the screen for the user to see.
      *