Refactor and fix requests

app/Http/Requests/API/BatchInteractionRequest.php

@@ -7,22 +7,7 @@ namespace App\Http\Requests\API;
  */
 class BatchInteractionRequest extends Request
 {
-    /**
+    public function rules(): array
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
     {
         return [
             'songs' => 'required|array',

app/Http/Requests/API/Download/Request.php

@@ -6,18 +6,8 @@ use App\Http\Requests\API\Request as BaseRequest;
 
 class Request extends BaseRequest
 {
-    /**
+    public function authorize(): bool
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
     {
         return config('koel.download.allow');
     }
-
-    public function rules()
-    {
-        return [];
-    }
 }

app/Http/Requests/API/Download/SongRequest.php

@@ -7,12 +7,7 @@ namespace App\Http\Requests\API\Download;
  */
 class SongRequest extends Request
 {
-    /**
+    public function rules(): array
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
     {
         return [
             'songs' => 'required|array',

app/Http/Requests/API/Interaction/Request.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Http\Requests\API\Interaction;
+
+use App\Http\Requests\API\Request as BaseRequest;
+
+class Request extends BaseRequest
+{
+}

app/Http/Requests/API/Interaction/StorePlayCountRequest.php

@@ -2,29 +2,14 @@
 
 namespace App\Http\Requests\API\Interaction;
 
-use Illuminate\Foundation\Http\FormRequest;
+use App\Http\Requests\API\Request;
 
 /**
  * @property string song
  */
-class StorePlayCountRequest extends FormRequest
+class StorePlayCountRequest extends Request
 {
-    /**
+    public function rules(): array
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
     {
         return [
             'song' => 'required',

app/Http/Requests/API/LastfmCallbackRequest.php

@@ -2,29 +2,12 @@
 
 namespace App\Http\Requests\API;
 
-use Illuminate\Foundation\Http\FormRequest;
-
 /**
  * @property string token
  */
-class LastfmCallbackRequest extends FormRequest
+class LastfmCallbackRequest extends Request
 {
-    /**
+    public function rules(): array
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
     {
         return [
             'token' => 'required',

app/Http/Requests/API/LastfmSetSessionKeyRequest.php

@@ -2,29 +2,12 @@
 
 namespace App\Http\Requests\API;
 
-use Illuminate\Foundation\Http\FormRequest;
-
 /**
  * @property string key
  */
-class LastfmSetSessionKeyRequest extends FormRequest
+class LastfmSetSessionKeyRequest extends Request
 {
-    /**
+    public function rules(): array
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
     {
         return [
             'key' => 'required',

app/Http/Requests/API/ObjectStorage/Request.php

@@ -6,17 +6,7 @@ use App\Http\Requests\API\Request as BaseRequest;
 
 class Request extends BaseRequest
 {
-    /**
+    public function rules(): array
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    public function rules()
     {
         return [
             'bucket' => 'required',

app/Http/Requests/API/ObjectStorage/S3/PutSongRequest.php

@@ -11,7 +11,7 @@ use App\Http\Requests\API\ObjectStorage\S3\Request as BaseRequest;
  */
 class PutSongRequest extends BaseRequest
 {
-    public function rules()
+    public function rules(): array
     {
         return [
             'bucket' => 'required',

app/Http/Requests/API/ObjectStorage/S3/RemoveSongRequest.php

@@ -10,7 +10,7 @@ use App\Http\Requests\API\ObjectStorage\S3\Request as BaseRequest;
  */
 class RemoveSongRequest extends BaseRequest
 {
-    public function rules()
+    public function rules(): array
     {
         return [
             'bucket' => 'required',

app/Http/Requests/API/PlaylistStoreRequest.php

@@ -7,22 +7,7 @@ namespace App\Http\Requests\API;
  */
 class PlaylistStoreRequest extends Request
 {
-    /**
+    public function rules(): array
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
     {
         return [
             'name' => 'required',

app/Http/Requests/API/PlaylistSyncRequest.php

@@ -2,29 +2,12 @@
 
 namespace App\Http\Requests\API;
 
-use Illuminate\Foundation\Http\FormRequest;
-
 /**
  * @property string songs
  */
-class PlaylistSyncRequest extends FormRequest
+class PlaylistSyncRequest extends Request
 {
-    /**
+    public function rules(): array
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
     {
         return [
             'songs' => 'required',

app/Http/Requests/API/ProfileUpdateRequest.php

@@ -7,22 +7,7 @@ namespace App\Http\Requests\API;
  */
 class ProfileUpdateRequest extends Request
 {
-    /**
+    public function rules(): array
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
     {
         return [
             'name' => 'required',

app/Http/Requests/API/Request.php

@@ -2,9 +2,8 @@
 
 namespace App\Http\Requests\API;
 
-use App\Http\Requests\Request as BaseRequest;
+use App\Http\Requests\AbstractRequest;
 
-class Request extends BaseRequest
+class Request extends AbstractRequest
 {
-    //
 }

app/Http/Requests/API/SettingRequest.php

@@ -7,22 +7,12 @@ namespace App\Http\Requests\API;
  */
 class SettingRequest extends Request
 {
-    /**
+    public function authorize(): bool
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
     {
         return auth()->user()->is_admin;
     }
 
-    /**
+    public function rules(): array
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
     {
         return [
             'media_path' => 'string|required|path.valid',

app/Http/Requests/API/SongLikeRequest.php

@@ -9,25 +9,4 @@ use App\Models\Song;
  */
 class SongLikeRequest extends Request
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-
-        ];
-    }
 }

app/Http/Requests/API/SongPlayRequest.php

@@ -2,31 +2,9 @@
 
 namespace App\Http\Requests\API;
 
-use Illuminate\Foundation\Http\FormRequest;
-
 /**
  * @property float time
  */
-class SongPlayRequest extends FormRequest
+class SongPlayRequest extends Request
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-        ];
-    }
 }

app/Http/Requests/API/SongUpdateRequest.php

@@ -8,22 +8,12 @@ namespace App\Http\Requests\API;
  */
 class SongUpdateRequest extends Request
 {
-    /**
+    public function authorize(): bool
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
     {
         return $this->user()->is_admin;
     }
 
-    /**
+    public function rules(): array
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
     {
         return [
             'data' => 'required|array',

app/Http/Requests/API/UserLoginRequest.php

@@ -4,22 +4,7 @@ namespace App\Http\Requests\API;
 
 class UserLoginRequest extends Request
 {
-    /**
+    public function rules(): array
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
     {
         return [
             'email' => 'required|email',

app/Http/Requests/API/UserStoreRequest.php

@@ -9,22 +9,12 @@ namespace App\Http\Requests\API;
  */
 class UserStoreRequest extends Request
 {
-    /**
+    public function authorize(): bool
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
     {
         return auth()->user()->is_admin;
     }
 
-    /**
+    public function rules(): array
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
     {
         return [
             'name' => 'required',

app/Http/Requests/API/UserUpdateRequest.php

@@ -7,22 +7,12 @@ namespace App\Http\Requests\API;
  */
 class UserUpdateRequest extends Request
 {
-    /**
+    public function authorize(): bool
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
     {
         return auth()->user()->is_admin;
     }
 
-    /**
+    public function rules(): array
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
     {
         return [
             'name' => 'required',

app/Http/Requests/API/ViewSongOnITunesRequest.php

@@ -2,29 +2,12 @@
 
 namespace App\Http\Requests\API;
 
-use Illuminate\Foundation\Http\FormRequest;
-
 /**
  * @property string q
  */
-class ViewSongOnITunesRequest extends FormRequest
+class ViewSongOnITunesRequest extends Request
 {
-    /**
+    public function rules(): array
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
     {
         return [
             'q' => 'required',

app/Http/Requests/API/YouTubeSearchRequest.php

@@ -2,32 +2,9 @@
 
 namespace App\Http\Requests\API;
 
-use Illuminate\Foundation\Http\FormRequest;
-
 /**
  * @property string pageToken
  */
-class YouTubeSearchRequest extends FormRequest
+class YouTubeSearchRequest extends Request
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-
-        ];
-    }
 }

app/Http/Requests/AbstractRequest.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+abstract class AbstractRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [];
+    }
+}

app/Http/Requests/Request.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-abstract class Request extends FormRequest
-{
-    //
-}