merge changes from #571 #785 #1269

austintoddj · May 24, 2023 · 9888c06 · 9888c06
1 parent e48c617
commit 9888c06
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/Canvas.php b/src/Canvas.php
@@ -3,6 +3,7 @@
 namespace Canvas;
 
 use Canvas\Models\User;
+use Composer\InstalledVersions;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Str;
 use RuntimeException;
@@ -20,9 +21,7 @@ public static function installedVersion(): string
             return '';
         }
 
-        $dependencies = json_decode(file_get_contents(base_path('composer.lock')), true)['packages'];
-
-        return collect($dependencies)->firstWhere('name', 'austintoddj/canvas')['version'];
+        return InstalledVersions::getPrettyVersion('austintoddj/canvas');
     }
 
     /**

diff --git a/src/Http/Controllers/UploadsController.php b/src/Http/Controllers/UploadsController.php
@@ -25,7 +25,7 @@ public function store()
         // are not supported at this time
         $file = reset($payload);
 
-        $path = $file->storePublicly(Canvas::baseStoragePath(), [
+        $path = $file->store(Canvas::baseStoragePath(), [
             'disk' => config('canvas.storage_disk'),
         ]);