From 09a1baec4c9f5e137e58494a697ef66b020173a3 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 11 Mar 2020 17:25:26 +0100
Subject: [PATCH] wip #3491

---
 src/app/Console/Commands/CubistCommand.php                 | 6 ++++--
 src/app/Magic/Models/CubistMagicAbstractModel.php          | 7 +++----
 .../install/config/{medialibrary.php => media-library.php} | 0
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename src/resources/install/config/{medialibrary.php => media-library.php} (100%)

diff --git a/src/app/Console/Commands/CubistCommand.php b/src/app/Console/Commands/CubistCommand.php
index aa3ff2b..2e39184 100644
--- a/src/app/Console/Commands/CubistCommand.php
+++ b/src/app/Console/Commands/CubistCommand.php
@@ -24,10 +24,12 @@ class CubistCommand extends Command
         $this->echo('info', $beforeNotice ? ' ' . $beforeNotice : $command);
 
         if (is_string($command)) {
-            $command = [$command];
+            $process = Process::fromShellCommandline($command, null, null, null, 180);
+        } else {
+            $process = new Process($command, null, null, null, 180);
         }
 
-        $process = new Process($command, null, null, null, 180);
+
         $process->run(function ($type, $buffer) {
             if (Process::ERR === $type) {
                 $this->echo('comment', $buffer);
diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index 5a6f1b1..9c89b9b 100644
--- a/src/app/Magic/Models/CubistMagicAbstractModel.php
+++ b/src/app/Magic/Models/CubistMagicAbstractModel.php
@@ -18,15 +18,14 @@ use Doctrine\DBAL\Schema\Table;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
-use Spatie\MediaLibrary\HasMedia\HasMedia;
-use Spatie\MediaLibrary\HasMedia\HasMediaTrait;
-use Spatie\MediaLibrary\Models\Media;
+use Spatie\MediaLibrary\HasMedia;
+use Spatie\MediaLibrary\InteractsWithMedia;
 use Venturecraft\Revisionable\RevisionableTrait;
 
 class CubistMagicAbstractModel extends Model implements HasMedia
 {
     use CrudTrait;
-    use HasMediaTrait;
+    use InteractsWithMedia;
     use RevisionableTrait;
     use BunchOfFields {
         addField as protected bunchAddField;
diff --git a/src/resources/install/config/medialibrary.php b/src/resources/install/config/media-library.php
similarity index 100%
rename from src/resources/install/config/medialibrary.php
rename to src/resources/install/config/media-library.php
-- 
2.39.5