Merge remote-tracking branch 'origin/main'

src/Enums/IsEnum.php

@@ -6,5 +6,7 @@ interface IsEnum
 {
     public static function labels(): array;
 
+    public static function getLabels(): array;
+
     public function getLabel(): string;
 }

src/Enums/NativeEnumsTrait.php

@@ -4,6 +4,7 @@
 
 
 use BackedEnum;
+use Illuminate\Support\Str;
 
 trait NativeEnumsTrait
 {
@@ -22,6 +23,25 @@ public static function getKeys(): array
         return array_column(self::cases(), 'value');
     }
 
+    public static function labels(): array
+    {
+        return static::getLabels();
+    }
+
+    public static function getLabels(): array
+    {
+        $cases = static::cases();
+
+        $labels = [];
+
+        /** @var static $case */
+        foreach ($cases as $case) {
+            $labels[$case->value] = __(slug_to_title($case->name));
+        }
+
+        return $labels;
+    }
+
     public static function slugs(string|BackedEnum $input)
     {
         if ($input instanceof BackedEnum) {

src/Enums/PublishStatuses.php

@@ -11,14 +11,4 @@ enum PublishStatuses: string implements IsEnum
     const PENDING = 'pending';
     const PUBLISHED = 'published';
     const REJECTED = 'rejected';
-
-    public static function labels(): array
-    {
-        return [
-            self::DRAFT->value     => __("Draft"),
-            self::PENDING->value   => __("Pending"),
-            self::PUBLISHED->value => __("Published"),
-            self::REJECTED->value  => __("Rejected"),
-        ];
-    }
 }

src/Enums/UserStatuses.php

@@ -32,13 +32,4 @@ public static function getMessageFromKey(string $key): string
     {
         return self::messages()[$key] ?? '';
     }
-
-    public static function labels(): array
-    {
-        return [
-            self::APPROVED->value => __("Approved"),
-            self::PENDING->value  => __("Pending"),
-            self::BANNED->value   => __("Banned"),
-        ];
-    }
 }

src/Media/UpdateMedia.php

@@ -25,9 +25,11 @@ public function updateSingleMedia($collection, Request $request, $key = '')
             //remove the existing file
             $this->clearMediaCollection($collection);
 
+            $original_file_name =  app(config('media-library.file_namer'))->originalFileName($file->getClientOriginalName());
+
             // add the new file
             return $this->addMedia($file)
-                ->usingFileName(Str::slug(Str::random(8)).'.'.$file->guessExtension())
+                ->usingFileName(Str::slug($original_file_name . '-' .  Str::random(4)).'.'.$file->guessExtension())
                 ->toMediaCollection($collection);
         } elseif ($request->exists($key)) {
             //remove file if the parameter is empty

src/Media/UuidPathGenerator.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Javaabu\Helpers\Media;
+
+use Spatie\MediaLibrary\MediaCollections\Models\Media;
+use Spatie\MediaLibrary\Support\PathGenerator\DefaultPathGenerator;
+
+class UuidPathGenerator extends DefaultPathGenerator
+{
+    /*
+     * Get a unique base path for the given media.
+     */
+    protected function getBasePath(Media $media): string
+    {
+        $prefix = config('media-library.prefix', '');
+
+        if ($prefix !== '') {
+            return $prefix.'/'.$media->uuid;
+        }
+
+        return $media->uuid;
+    }
+}

tests/Unit/EnumsTest.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Javaabu\Helpers\Tests\Unit;
+
+use Javaabu\Helpers\Enums\UserStatuses;
+use Javaabu\Helpers\Tests\TestCase;
+
+class EnumsTest extends TestCase
+{
+    /** @test */
+    public function it_can_generate_enum_label()
+    {
+        $this->assertEquals('Pending', UserStatuses::PENDING->getLabel());
+        $this->assertEquals([
+            'approved' => 'Approved',
+            'pending' => 'Pending',
+            'banned' => 'Banned'
+        ], UserStatuses::getLabels());
+    }
+}