Merge remote-tracking branch 'origin/im/global-polls' into im/global-…

…polls
FriendsOfFlarum · Mar 7, 2024 · 8b74d51 · 8b74d51
2 parents be6d2cf + 4fbb9bd
commit 8b74d51
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 10 deletions.
diff --git a/src/Api/Controllers/DeletePollOptionImageController.php b/src/Api/Controllers/DeletePollOptionImageController.php
@@ -12,7 +12,6 @@
 namespace FoF\Polls\Api\Controllers;
 
 use Flarum\Http\RequestUtil;
-use FoF\Polls\Poll;
 use FoF\Polls\PollOption;
 use Illuminate\Contracts\Filesystem\Cloud;
 use Illuminate\Contracts\Filesystem\Factory;

diff --git a/src/Api/Controllers/UploadPollImageController.php b/src/Api/Controllers/UploadPollImageController.php
@@ -79,7 +79,7 @@ protected function createLocalPath(string $filename, ?string $pollId): string
         return $filename;
     }
 
-    protected function linkToRecord(int $pollId, string $uploadName):void
+    protected function linkToRecord(int $pollId, string $uploadName): void
     {
         if ($pollId && $poll = Poll::find($pollId)) {
             $poll->image = $uploadName;

diff --git a/src/Api/Controllers/UploadPollOptionImageController.php b/src/Api/Controllers/UploadPollOptionImageController.php
@@ -22,13 +22,14 @@ class UploadPollOptionImageController extends UploadPollImageController
 
     protected function createLocalPath(string $filename, ?string $pollId): string
     {
-        if(!$pollId) {
+        if (!$pollId) {
             throw new \InvalidArgumentException('Poll ID is required');
         }
+
         return "pollOptions/{$pollId}/{$filename}";
     }
 
-    protected function linkToRecord(int $pollId, string $uploadName):void
+    protected function linkToRecord(int $pollId, string $uploadName): void
     {
         if ($pollId && $pollOption = PollOption::find($pollId)) {
             $pollOption->image = $uploadName;

diff --git a/src/Api/Serializers/PollOptionSerializer.php b/src/Api/Serializers/PollOptionSerializer.php
@@ -12,7 +12,6 @@
 namespace FoF\Polls\Api\Serializers;
 
 use Flarum\Api\Serializer\AbstractSerializer;
-use FoF\Polls\Poll;
 use FoF\Polls\PollOption;
 use Illuminate\Contracts\Filesystem\Cloud;
 use Illuminate\Contracts\Filesystem\Factory;

diff --git a/src/Commands/CreatePollHandler.php b/src/Commands/CreatePollHandler.php
@@ -84,7 +84,7 @@ public function handle(CreatePoll $command)
             foreach ($rawOptionsData as $rawOptionData) {
                 $optionsData[] = [
                     'answer'   => Arr::get($rawOptionData, 'answer'),
-                    'image' => Arr::get($rawOptionData, 'image'),
+                    'image'    => Arr::get($rawOptionData, 'image'),
                     'imageAlt' => Arr::get($rawOptionData, 'imageAlt'),
                 ];
             }

diff --git a/src/Commands/EditPollHandler.php b/src/Commands/EditPollHandler.php
@@ -126,8 +126,8 @@ public function handle(EditPoll $command)
 
             $optionAttributes = [
                 'answer'   => Arr::get($opt, 'attributes.answer'),
-                'image' => Arr::get($opt, 'attributes.image') ?: null,
-                'imageAlt' => Arr::get($opt, 'attributes.imageAlt') ?: null
+                'image'    => Arr::get($opt, 'attributes.image') ?: null,
+                'imageAlt' => Arr::get($opt, 'attributes.imageAlt') ?: null,
             ];
 
             if (!$this->settings->get('fof-polls.allowOptionImage')) {
@@ -141,7 +141,7 @@ public function handle(EditPoll $command)
                 'id' => $id,
             ], [
                 'answer'    => Arr::get($optionAttributes, 'answer'),
-                'image' => Arr::get($optionAttributes, 'image'),
+                'image'     => Arr::get($optionAttributes, 'image'),
                 'image_alt' => Arr::get($optionAttributes, 'imageAlt'),
             ]);
         }

diff --git a/src/Validators/PollOptionValidator.php b/src/Validators/PollOptionValidator.php
@@ -19,7 +19,7 @@ protected function getRules()
     {
         return [
             'answer'   => ['required', 'string', 'max:255'],
-            'image' => ['nullable', 'string', 'max:255'],
+            'image'    => ['nullable', 'string', 'max:255'],
             'imageAlt' => ['nullable', 'string', 'max:255'],
         ];
     }