diff --git a/app/Http/Requests/API/BatchInteractionRequest.php b/app/Http/Requests/API/BatchInteractionRequest.php index 67692f8b..8e128174 100644 --- a/app/Http/Requests/API/BatchInteractionRequest.php +++ b/app/Http/Requests/API/BatchInteractionRequest.php @@ -7,22 +7,7 @@ namespace App\Http\Requests\API; */ class BatchInteractionRequest 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() + public function rules(): array { return [ 'songs' => 'required|array', diff --git a/app/Http/Requests/API/Download/Request.php b/app/Http/Requests/API/Download/Request.php index 0c436715..1cffe018 100644 --- a/app/Http/Requests/API/Download/Request.php +++ b/app/Http/Requests/API/Download/Request.php @@ -6,18 +6,8 @@ use App\Http\Requests\API\Request as BaseRequest; class Request extends BaseRequest { - /** - * Determine if the user is authorized to make this request. - * - * @return bool - */ - public function authorize() + public function authorize(): bool { return config('koel.download.allow'); } - - public function rules() - { - return []; - } } diff --git a/app/Http/Requests/API/Download/SongRequest.php b/app/Http/Requests/API/Download/SongRequest.php index a2738147..8ffa9db8 100644 --- a/app/Http/Requests/API/Download/SongRequest.php +++ b/app/Http/Requests/API/Download/SongRequest.php @@ -7,12 +7,7 @@ namespace App\Http\Requests\API\Download; */ class SongRequest extends Request { - /** - * Get the validation rules that apply to the request. - * - * @return array - */ - public function rules() + public function rules(): array { return [ 'songs' => 'required|array', diff --git a/app/Http/Requests/API/Interaction/Request.php b/app/Http/Requests/API/Interaction/Request.php new file mode 100644 index 00000000..b3e59c93 --- /dev/null +++ b/app/Http/Requests/API/Interaction/Request.php @@ -0,0 +1,9 @@ + 'required', diff --git a/app/Http/Requests/API/LastfmCallbackRequest.php b/app/Http/Requests/API/LastfmCallbackRequest.php index 9f14b1ef..d6d6dff1 100644 --- a/app/Http/Requests/API/LastfmCallbackRequest.php +++ b/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 { - /** - * 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() + public function rules(): array { return [ 'token' => 'required', diff --git a/app/Http/Requests/API/LastfmSetSessionKeyRequest.php b/app/Http/Requests/API/LastfmSetSessionKeyRequest.php index 23a7fcf3..0a5cebd6 100644 --- a/app/Http/Requests/API/LastfmSetSessionKeyRequest.php +++ b/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 { - /** - * 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() + public function rules(): array { return [ 'key' => 'required', diff --git a/app/Http/Requests/API/ObjectStorage/Request.php b/app/Http/Requests/API/ObjectStorage/Request.php index 0302c845..bf78634f 100644 --- a/app/Http/Requests/API/ObjectStorage/Request.php +++ b/app/Http/Requests/API/ObjectStorage/Request.php @@ -6,17 +6,7 @@ use App\Http\Requests\API\Request as BaseRequest; class Request extends BaseRequest { - /** - * Determine if the user is authorized to make this request. - * - * @return bool - */ - public function authorize() - { - return true; - } - - public function rules() + public function rules(): array { return [ 'bucket' => 'required', diff --git a/app/Http/Requests/API/ObjectStorage/S3/PutSongRequest.php b/app/Http/Requests/API/ObjectStorage/S3/PutSongRequest.php index 94ff4280..dc959d2e 100644 --- a/app/Http/Requests/API/ObjectStorage/S3/PutSongRequest.php +++ b/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', diff --git a/app/Http/Requests/API/ObjectStorage/S3/RemoveSongRequest.php b/app/Http/Requests/API/ObjectStorage/S3/RemoveSongRequest.php index 7f7d96cc..0c3d646a 100644 --- a/app/Http/Requests/API/ObjectStorage/S3/RemoveSongRequest.php +++ b/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', diff --git a/app/Http/Requests/API/PlaylistStoreRequest.php b/app/Http/Requests/API/PlaylistStoreRequest.php index 1fe95dd2..99bab4cb 100644 --- a/app/Http/Requests/API/PlaylistStoreRequest.php +++ b/app/Http/Requests/API/PlaylistStoreRequest.php @@ -7,22 +7,7 @@ namespace App\Http\Requests\API; */ class PlaylistStoreRequest 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() + public function rules(): array { return [ 'name' => 'required', diff --git a/app/Http/Requests/API/PlaylistSyncRequest.php b/app/Http/Requests/API/PlaylistSyncRequest.php index 0e30e6c4..23f3c748 100644 --- a/app/Http/Requests/API/PlaylistSyncRequest.php +++ b/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 { - /** - * 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() + public function rules(): array { return [ 'songs' => 'required', diff --git a/app/Http/Requests/API/ProfileUpdateRequest.php b/app/Http/Requests/API/ProfileUpdateRequest.php index bf72fcfd..2a11c0fe 100644 --- a/app/Http/Requests/API/ProfileUpdateRequest.php +++ b/app/Http/Requests/API/ProfileUpdateRequest.php @@ -7,22 +7,7 @@ namespace App\Http\Requests\API; */ class ProfileUpdateRequest 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() + public function rules(): array { return [ 'name' => 'required', diff --git a/app/Http/Requests/API/Request.php b/app/Http/Requests/API/Request.php index 66a0b992..72a024b5 100644 --- a/app/Http/Requests/API/Request.php +++ b/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 { - // } diff --git a/app/Http/Requests/API/SettingRequest.php b/app/Http/Requests/API/SettingRequest.php index c0a3b031..46e8a9da 100644 --- a/app/Http/Requests/API/SettingRequest.php +++ b/app/Http/Requests/API/SettingRequest.php @@ -7,22 +7,12 @@ namespace App\Http\Requests\API; */ class SettingRequest extends Request { - /** - * Determine if the user is authorized to make this request. - * - * @return bool - */ - public function authorize() + public function authorize(): bool { return auth()->user()->is_admin; } - /** - * Get the validation rules that apply to the request. - * - * @return array - */ - public function rules() + public function rules(): array { return [ 'media_path' => 'string|required|path.valid', diff --git a/app/Http/Requests/API/SongLikeRequest.php b/app/Http/Requests/API/SongLikeRequest.php index f9be9c90..ece0c2b1 100644 --- a/app/Http/Requests/API/SongLikeRequest.php +++ b/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 [ - - ]; - } } diff --git a/app/Http/Requests/API/SongPlayRequest.php b/app/Http/Requests/API/SongPlayRequest.php index aaba7d48..bd98d8d0 100644 --- a/app/Http/Requests/API/SongPlayRequest.php +++ b/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 [ - ]; - } } diff --git a/app/Http/Requests/API/SongUpdateRequest.php b/app/Http/Requests/API/SongUpdateRequest.php index c014eb8b..1116097b 100644 --- a/app/Http/Requests/API/SongUpdateRequest.php +++ b/app/Http/Requests/API/SongUpdateRequest.php @@ -8,22 +8,12 @@ namespace App\Http\Requests\API; */ class SongUpdateRequest extends Request { - /** - * Determine if the user is authorized to make this request. - * - * @return bool - */ - public function authorize() + public function authorize(): bool { return $this->user()->is_admin; } - /** - * Get the validation rules that apply to the request. - * - * @return array - */ - public function rules() + public function rules(): array { return [ 'data' => 'required|array', diff --git a/app/Http/Requests/API/UserLoginRequest.php b/app/Http/Requests/API/UserLoginRequest.php index 1420c908..5e73a7b5 100644 --- a/app/Http/Requests/API/UserLoginRequest.php +++ b/app/Http/Requests/API/UserLoginRequest.php @@ -4,22 +4,7 @@ namespace App\Http\Requests\API; class UserLoginRequest 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() + public function rules(): array { return [ 'email' => 'required|email', diff --git a/app/Http/Requests/API/UserStoreRequest.php b/app/Http/Requests/API/UserStoreRequest.php index 022465e2..2b65baf1 100644 --- a/app/Http/Requests/API/UserStoreRequest.php +++ b/app/Http/Requests/API/UserStoreRequest.php @@ -9,22 +9,12 @@ namespace App\Http\Requests\API; */ class UserStoreRequest extends Request { - /** - * Determine if the user is authorized to make this request. - * - * @return bool - */ - public function authorize() + public function authorize(): bool { return auth()->user()->is_admin; } - /** - * Get the validation rules that apply to the request. - * - * @return array - */ - public function rules() + public function rules(): array { return [ 'name' => 'required', diff --git a/app/Http/Requests/API/UserUpdateRequest.php b/app/Http/Requests/API/UserUpdateRequest.php index a0df1f20..0cbb0f1b 100644 --- a/app/Http/Requests/API/UserUpdateRequest.php +++ b/app/Http/Requests/API/UserUpdateRequest.php @@ -7,22 +7,12 @@ namespace App\Http\Requests\API; */ class UserUpdateRequest extends Request { - /** - * Determine if the user is authorized to make this request. - * - * @return bool - */ - public function authorize() + public function authorize(): bool { return auth()->user()->is_admin; } - /** - * Get the validation rules that apply to the request. - * - * @return array - */ - public function rules() + public function rules(): array { return [ 'name' => 'required', diff --git a/app/Http/Requests/API/ViewSongOnITunesRequest.php b/app/Http/Requests/API/ViewSongOnITunesRequest.php index 72682c3d..d9e631d7 100644 --- a/app/Http/Requests/API/ViewSongOnITunesRequest.php +++ b/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 { - /** - * 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() + public function rules(): array { return [ 'q' => 'required', diff --git a/app/Http/Requests/API/YouTubeSearchRequest.php b/app/Http/Requests/API/YouTubeSearchRequest.php index 97717bb8..eb36619e 100644 --- a/app/Http/Requests/API/YouTubeSearchRequest.php +++ b/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 [ - - ]; - } } diff --git a/app/Http/Requests/AbstractRequest.php b/app/Http/Requests/AbstractRequest.php new file mode 100644 index 00000000..4c2b2312 --- /dev/null +++ b/app/Http/Requests/AbstractRequest.php @@ -0,0 +1,18 @@ +