diff --git a/app/Commands/CreateGenreCommand.php b/app/Commands/CreateGenreCommand.php index 06bc09f5..a55641e5 100644 --- a/app/Commands/CreateGenreCommand.php +++ b/app/Commands/CreateGenreCommand.php @@ -22,8 +22,8 @@ namespace App\Commands; use App\Models\Genre; use Illuminate\Support\Facades\Gate; -use Illuminate\Support\Str; use Illuminate\Support\Facades\Validator; +use Illuminate\Support\Str; class CreateGenreCommand extends CommandBase { diff --git a/app/Commands/CreateShowSongCommand.php b/app/Commands/CreateShowSongCommand.php index 2a116ece..1bae7551 100644 --- a/app/Commands/CreateShowSongCommand.php +++ b/app/Commands/CreateShowSongCommand.php @@ -22,8 +22,8 @@ namespace App\Commands; use App\Models\ShowSong; use Illuminate\Support\Facades\Gate; -use Illuminate\Support\Str; use Illuminate\Support\Facades\Validator; +use Illuminate\Support\Str; class CreateShowSongCommand extends CommandBase { diff --git a/app/Commands/DeleteGenreCommand.php b/app/Commands/DeleteGenreCommand.php index 1b7350f8..61600869 100644 --- a/app/Commands/DeleteGenreCommand.php +++ b/app/Commands/DeleteGenreCommand.php @@ -22,8 +22,8 @@ namespace App\Commands; use App\Jobs\DeleteGenre; use App\Models\Genre; -use Illuminate\Support\Facades\Gate; use Illuminate\Foundation\Bus\DispatchesJobs; +use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\Validator; class DeleteGenreCommand extends CommandBase diff --git a/app/Commands/DeleteShowSongCommand.php b/app/Commands/DeleteShowSongCommand.php index 19d554d5..576ce969 100644 --- a/app/Commands/DeleteShowSongCommand.php +++ b/app/Commands/DeleteShowSongCommand.php @@ -22,8 +22,8 @@ namespace App\Commands; use App\Jobs\DeleteShowSong; use App\Models\ShowSong; -use Illuminate\Support\Facades\Gate; use Illuminate\Foundation\Bus\DispatchesJobs; +use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\Validator; class DeleteShowSongCommand extends CommandBase diff --git a/app/Commands/GenerateTrackFilesCommand.php b/app/Commands/GenerateTrackFilesCommand.php index 27fbfc17..a945e6fc 100644 --- a/app/Commands/GenerateTrackFilesCommand.php +++ b/app/Commands/GenerateTrackFilesCommand.php @@ -26,8 +26,8 @@ use App\Models\Track; use App\Models\TrackFile; use AudioCache; use FFmpegMovie; -use Illuminate\Support\Facades\File; use Illuminate\Foundation\Bus\DispatchesJobs; +use Illuminate\Support\Facades\File; use Illuminate\Support\Str; use SplFileInfo; diff --git a/app/Commands/ParseTrackTagsCommand.php b/app/Commands/ParseTrackTagsCommand.php index 9f222fbd..8973644c 100755 --- a/app/Commands/ParseTrackTagsCommand.php +++ b/app/Commands/ParseTrackTagsCommand.php @@ -28,9 +28,9 @@ use App\Models\TrackType; use App\Models\User; use AudioCache; use Carbon\Carbon; +use getID3; use Illuminate\Support\Facades\Config; use Illuminate\Support\Facades\File; -use getID3; use Illuminate\Support\Str; use Symfony\Component\HttpFoundation\File\UploadedFile; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; diff --git a/app/Commands/RenameGenreCommand.php b/app/Commands/RenameGenreCommand.php index 50397cf0..e2189f60 100644 --- a/app/Commands/RenameGenreCommand.php +++ b/app/Commands/RenameGenreCommand.php @@ -22,10 +22,10 @@ namespace App\Commands; use App\Jobs\UpdateTagsForRenamedGenre; use App\Models\Genre; -use Illuminate\Support\Facades\Gate; use Illuminate\Foundation\Bus\DispatchesJobs; -use Illuminate\Support\Str; +use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\Validator; +use Illuminate\Support\Str; class RenameGenreCommand extends CommandBase { diff --git a/app/Commands/RenameShowSongCommand.php b/app/Commands/RenameShowSongCommand.php index 936d4200..61d434b9 100644 --- a/app/Commands/RenameShowSongCommand.php +++ b/app/Commands/RenameShowSongCommand.php @@ -22,10 +22,10 @@ namespace App\Commands; use App\Jobs\UpdateTagsForRenamedShowSong; use App\Models\ShowSong; -use Illuminate\Support\Facades\Gate; use Illuminate\Foundation\Bus\DispatchesJobs; -use Illuminate\Support\Str; +use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\Validator; +use Illuminate\Support\Str; class RenameShowSongCommand extends CommandBase { diff --git a/app/Commands/UploadTrackCommand.php b/app/Commands/UploadTrackCommand.php index 5d54baae..1dd8fca8 100644 --- a/app/Commands/UploadTrackCommand.php +++ b/app/Commands/UploadTrackCommand.php @@ -22,11 +22,11 @@ namespace App\Commands; use App\Models\Track; use App\Models\User; -use Illuminate\Support\Facades\Auth; use Carbon\Carbon; +use Illuminate\Foundation\Bus\DispatchesJobs; +use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Config; use Illuminate\Support\Facades\Gate; -use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Support\Facades\Request; use Illuminate\Support\Facades\Validator; diff --git a/app/Console/Commands/ClassifyMLPMA.php b/app/Console/Commands/ClassifyMLPMA.php index 18822634..583a099c 100644 --- a/app/Console/Commands/ClassifyMLPMA.php +++ b/app/Console/Commands/ClassifyMLPMA.php @@ -23,8 +23,8 @@ namespace App\Console\Commands; use App\Models\ShowSong; use App\Models\Track; use App\Models\TrackType; -use Illuminate\Support\Facades\DB; use Illuminate\Console\Command; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Str; class ClassifyMLPMA extends Command diff --git a/app/Console/Commands/ClearTrackCache.php b/app/Console/Commands/ClearTrackCache.php index 04e20add..1ff6489a 100644 --- a/app/Console/Commands/ClearTrackCache.php +++ b/app/Console/Commands/ClearTrackCache.php @@ -22,8 +22,8 @@ namespace App\Console\Commands; use App\Models\TrackFile; use Carbon\Carbon; -use Illuminate\Support\Facades\File; use Illuminate\Console\Command; +use Illuminate\Support\Facades\File; class ClearTrackCache extends Command { diff --git a/app/Console/Commands/FixMLPMAImages.php b/app/Console/Commands/FixMLPMAImages.php index f27a2027..7d10c5dd 100644 --- a/app/Console/Commands/FixMLPMAImages.php +++ b/app/Console/Commands/FixMLPMAImages.php @@ -21,11 +21,11 @@ namespace App\Console\Commands; use App\Models\Image; +use getID3; +use Illuminate\Console\Command; use Illuminate\Support\Facades\Config; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\File; -use getID3; -use Illuminate\Console\Command; use Symfony\Component\HttpFoundation\File\UploadedFile; class FixMLPMAImages extends Command diff --git a/app/Console/Commands/ImportEQBeats.php b/app/Console/Commands/ImportEQBeats.php index 813476e7..c139cade 100644 --- a/app/Console/Commands/ImportEQBeats.php +++ b/app/Console/Commands/ImportEQBeats.php @@ -8,13 +8,13 @@ use App\Models\Genre; use App\Models\Image; use App\Models\Track; use App\Models\User; -use Illuminate\Support\Facades\Auth; use Carbon\Carbon; +use getID3; +use Illuminate\Console\Command; +use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Config; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\File; -use getID3; -use Illuminate\Console\Command; use Illuminate\Support\Str; use Input; use Symfony\Component\HttpFoundation\File\UploadedFile; diff --git a/app/Console/Commands/MergeAccounts.php b/app/Console/Commands/MergeAccounts.php index cc817b1c..9790f587 100644 --- a/app/Console/Commands/MergeAccounts.php +++ b/app/Console/Commands/MergeAccounts.php @@ -33,9 +33,9 @@ use App\Models\ResourceUser; use App\Models\Track; use App\Models\User; use Carbon\Carbon; -use Illuminate\Support\Facades\DB; use Illuminate\Console\Command; use Illuminate\Support\Collection; +use Illuminate\Support\Facades\DB; class MergeAccounts extends Command { diff --git a/app/Console/Commands/MigrateOldData.php b/app/Console/Commands/MigrateOldData.php index d6909ce9..22c84bc5 100644 --- a/app/Console/Commands/MigrateOldData.php +++ b/app/Console/Commands/MigrateOldData.php @@ -22,9 +22,9 @@ namespace App\Console\Commands; use App\Models\Image; use App\Models\ResourceLogItem; -use Illuminate\Support\Facades\DB; use Exception; use Illuminate\Console\Command; +use Illuminate\Support\Facades\DB; use Symfony\Component\HttpFoundation\File\UploadedFile; class MigrateOldData extends Command diff --git a/app/Console/Commands/RebuildFilesizes.php b/app/Console/Commands/RebuildFilesizes.php index 511784d0..c51248a2 100644 --- a/app/Console/Commands/RebuildFilesizes.php +++ b/app/Console/Commands/RebuildFilesizes.php @@ -21,8 +21,8 @@ namespace App\Console\Commands; use App\Models\TrackFile; -use Illuminate\Support\Facades\File; use Illuminate\Console\Command; +use Illuminate\Support\Facades\File; class RebuildFilesizes extends Command { diff --git a/app/Console/Commands/RebuildTrackCache.php b/app/Console/Commands/RebuildTrackCache.php index 1def1c2b..7b4475a3 100644 --- a/app/Console/Commands/RebuildTrackCache.php +++ b/app/Console/Commands/RebuildTrackCache.php @@ -23,9 +23,9 @@ namespace App\Console\Commands; use App\Jobs\EncodeTrackFile; use App\Models\Track; use App\Models\TrackFile; -use Illuminate\Support\Facades\File; use Illuminate\Console\Command; use Illuminate\Foundation\Bus\DispatchesJobs; +use Illuminate\Support\Facades\File; class RebuildTrackCache extends Command { diff --git a/app/Console/Commands/RefreshCache.php b/app/Console/Commands/RefreshCache.php index 3c4584b7..c51ea785 100644 --- a/app/Console/Commands/RefreshCache.php +++ b/app/Console/Commands/RefreshCache.php @@ -21,8 +21,8 @@ namespace App\Console\Commands; use App\Models\ResourceLogItem; -use Illuminate\Support\Facades\DB; use Illuminate\Console\Command; +use Illuminate\Support\Facades\DB; class RefreshCache extends Command { diff --git a/app/Console/Commands/VersionFiles.php b/app/Console/Commands/VersionFiles.php index e1310765..4fc7181f 100644 --- a/app/Console/Commands/VersionFiles.php +++ b/app/Console/Commands/VersionFiles.php @@ -21,8 +21,8 @@ namespace App\Console\Commands; use App\Models\TrackFile; -use Illuminate\Support\Facades\File; use Illuminate\Console\Command; +use Illuminate\Support\Facades\File; class VersionFiles extends Command { diff --git a/app/Http/Controllers/AlbumsController.php b/app/Http/Controllers/AlbumsController.php index 640e31af..d6c4e6dd 100644 --- a/app/Http/Controllers/AlbumsController.php +++ b/app/Http/Controllers/AlbumsController.php @@ -20,11 +20,11 @@ namespace App\Http\Controllers; -use Illuminate\Support\Facades\App; use App\AlbumDownloader; use App\Models\Album; use App\Models\ResourceLogItem; use App\Models\Track; +use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\Redirect; use Illuminate\Support\Facades\View; diff --git a/app/Http/Controllers/Api/Web/AccountController.php b/app/Http/Controllers/Api/Web/AccountController.php index 931df394..06139cde 100644 --- a/app/Http/Controllers/Api/Web/AccountController.php +++ b/app/Http/Controllers/Api/Web/AccountController.php @@ -20,11 +20,11 @@ namespace App\Http\Controllers\Api\Web; -use Illuminate\Http\Request; use App\Commands\SaveAccountSettingsCommand; use App\Http\Controllers\ApiControllerBase; use App\Models\Image; use App\Models\User; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\Response; diff --git a/app/Http/Controllers/Api/Web/AlbumsController.php b/app/Http/Controllers/Api/Web/AlbumsController.php index d4d1870b..dc2c76c3 100644 --- a/app/Http/Controllers/Api/Web/AlbumsController.php +++ b/app/Http/Controllers/Api/Web/AlbumsController.php @@ -20,7 +20,6 @@ namespace App\Http\Controllers\Api\Web; -use Illuminate\Http\Request; use App\Commands\CreateAlbumCommand; use App\Commands\DeleteAlbumCommand; use App\Commands\EditAlbumCommand; @@ -30,9 +29,10 @@ use App\Models\Image; use App\Models\ResourceLogItem; use App\Models\Track; use App\Models\User; +use Illuminate\Database\Eloquent\ModelNotFoundException; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Gate; -use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Support\Facades\Response; class AlbumsController extends ApiControllerBase diff --git a/app/Http/Controllers/Api/Web/AnnouncementsController.php b/app/Http/Controllers/Api/Web/AnnouncementsController.php index 22f020e6..de1fa264 100644 --- a/app/Http/Controllers/Api/Web/AnnouncementsController.php +++ b/app/Http/Controllers/Api/Web/AnnouncementsController.php @@ -20,11 +20,11 @@ namespace App\Http\Controllers\Api\Web; -use Illuminate\Http\Request; use App\Commands\CreateAnnouncementCommand; use App\Http\Controllers\Controller; use App\Models\Announcement; use Carbon\Carbon; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Response; class AnnouncementsController extends Controller diff --git a/app/Http/Controllers/Api/Web/ArtistsController.php b/app/Http/Controllers/Api/Web/ArtistsController.php index b4b99729..af8c17d3 100644 --- a/app/Http/Controllers/Api/Web/ArtistsController.php +++ b/app/Http/Controllers/Api/Web/ArtistsController.php @@ -20,8 +20,6 @@ namespace App\Http\Controllers\Api\Web; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\App; use App\Commands\CreateUserCommand; use App\Http\Controllers\ApiControllerBase; use App\Models\Album; @@ -32,8 +30,10 @@ use App\Models\Image; use App\Models\Track; use App\Models\User; use ColorThief\ColorThief; -use Illuminate\Support\Facades\Gate; use Helpers; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\App; +use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\Response; class ArtistsController extends ApiControllerBase diff --git a/app/Http/Controllers/Api/Web/CommentsController.php b/app/Http/Controllers/Api/Web/CommentsController.php index 564cda55..9f1cb8fe 100644 --- a/app/Http/Controllers/Api/Web/CommentsController.php +++ b/app/Http/Controllers/Api/Web/CommentsController.php @@ -20,11 +20,11 @@ namespace App\Http\Controllers\Api\Web; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\App; use App\Commands\CreateCommentCommand; use App\Http\Controllers\ApiControllerBase; use App\Models\Comment; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\Response; class CommentsController extends ApiControllerBase diff --git a/app/Http/Controllers/Api/Web/DashboardController.php b/app/Http/Controllers/Api/Web/DashboardController.php index 389b2edf..91b4dc69 100644 --- a/app/Http/Controllers/Api/Web/DashboardController.php +++ b/app/Http/Controllers/Api/Web/DashboardController.php @@ -20,9 +20,9 @@ namespace App\Http\Controllers\Api\Web; -use Illuminate\Http\Request; use App\Http\Controllers\ApiControllerBase; use App\Models\Track; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Response; diff --git a/app/Http/Controllers/Api/Web/FavouritesController.php b/app/Http/Controllers/Api/Web/FavouritesController.php index c7366d01..6dbc78d2 100644 --- a/app/Http/Controllers/Api/Web/FavouritesController.php +++ b/app/Http/Controllers/Api/Web/FavouritesController.php @@ -20,13 +20,13 @@ namespace App\Http\Controllers\Api\Web; -use Illuminate\Http\Request; use App\Commands\ToggleFavouriteCommand; use App\Http\Controllers\ApiControllerBase; use App\Models\Album; use App\Models\Favourite; use App\Models\Playlist; use App\Models\Track; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Response; diff --git a/app/Http/Controllers/Api/Web/FollowController.php b/app/Http/Controllers/Api/Web/FollowController.php index 79e1a14c..3385e03e 100644 --- a/app/Http/Controllers/Api/Web/FollowController.php +++ b/app/Http/Controllers/Api/Web/FollowController.php @@ -20,9 +20,9 @@ namespace App\Http\Controllers\Api\Web; -use Illuminate\Http\Request; use App\Commands\ToggleFollowingCommand; use App\Http\Controllers\ApiControllerBase; +use Illuminate\Http\Request; class FollowController extends ApiControllerBase { diff --git a/app/Http/Controllers/Api/Web/GenresController.php b/app/Http/Controllers/Api/Web/GenresController.php index 9036aee9..16776970 100644 --- a/app/Http/Controllers/Api/Web/GenresController.php +++ b/app/Http/Controllers/Api/Web/GenresController.php @@ -20,12 +20,12 @@ namespace App\Http\Controllers\Api\Web; -use Illuminate\Http\Request; use App\Commands\CreateGenreCommand; use App\Commands\DeleteGenreCommand; use App\Commands\RenameGenreCommand; use App\Http\Controllers\ApiControllerBase; use App\Models\Genre; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Response; class GenresController extends ApiControllerBase diff --git a/app/Http/Controllers/Api/Web/NotificationsController.php b/app/Http/Controllers/Api/Web/NotificationsController.php index 791f449e..e5199a2a 100644 --- a/app/Http/Controllers/Api/Web/NotificationsController.php +++ b/app/Http/Controllers/Api/Web/NotificationsController.php @@ -20,12 +20,12 @@ namespace App\Http\Controllers\Api\Web; -use Illuminate\Http\Request; use App\Http\Controllers\ApiControllerBase; use App\Models\Notification; use App\Models\Subscription; use App\Models\Track; use App\Models\User; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Minishlink\WebPush\WebPush; diff --git a/app/Http/Controllers/Api/Web/PlaylistsController.php b/app/Http/Controllers/Api/Web/PlaylistsController.php index d5963e61..e858d395 100644 --- a/app/Http/Controllers/Api/Web/PlaylistsController.php +++ b/app/Http/Controllers/Api/Web/PlaylistsController.php @@ -20,7 +20,6 @@ namespace App\Http\Controllers\Api\Web; -use Illuminate\Http\Request; use App\Commands\AddTrackToPlaylistCommand; use App\Commands\CreatePlaylistCommand; use App\Commands\DeletePlaylistCommand; @@ -32,8 +31,9 @@ use App\Models\Playlist; use App\Models\ResourceLogItem; use App\Models\Track; use App\Models\User; -use Illuminate\Support\Facades\Auth; use Illuminate\Database\Eloquent\ModelNotFoundException; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Response; class PlaylistsController extends ApiControllerBase diff --git a/app/Http/Controllers/Api/Web/SearchController.php b/app/Http/Controllers/Api/Web/SearchController.php index b4e0108e..13330409 100644 --- a/app/Http/Controllers/Api/Web/SearchController.php +++ b/app/Http/Controllers/Api/Web/SearchController.php @@ -20,10 +20,10 @@ namespace App\Http\Controllers\Api\Web; -use Illuminate\Http\Request; use App\Http\Controllers\ApiControllerBase; use App\Library\Search; use Elasticsearch; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Response; class SearchController extends ApiControllerBase diff --git a/app/Http/Controllers/Api/Web/ShowSongsController.php b/app/Http/Controllers/Api/Web/ShowSongsController.php index a37a9909..076ec4aa 100644 --- a/app/Http/Controllers/Api/Web/ShowSongsController.php +++ b/app/Http/Controllers/Api/Web/ShowSongsController.php @@ -20,12 +20,12 @@ namespace App\Http\Controllers\Api\Web; -use Illuminate\Http\Request; use App\Commands\CreateShowSongCommand; use App\Commands\DeleteShowSongCommand; use App\Commands\RenameShowSongCommand; use App\Http\Controllers\ApiControllerBase; use App\Models\ShowSong; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Response; class ShowSongsController extends ApiControllerBase diff --git a/app/Http/Controllers/Api/Web/StatsController.php b/app/Http/Controllers/Api/Web/StatsController.php index 645a62b9..56382c9d 100644 --- a/app/Http/Controllers/Api/Web/StatsController.php +++ b/app/Http/Controllers/Api/Web/StatsController.php @@ -20,17 +20,17 @@ namespace App\Http\Controllers\Api\Web; -use Illuminate\Http\Request; use App\Http\Controllers\ApiControllerBase; use App\Models\ResourceLogItem; use App\Models\Track; +use Carbon\Carbon; +use Illuminate\Database\Eloquent\ModelNotFoundException; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Cache; -use Carbon\Carbon; use Illuminate\Support\Facades\DB; -use Illuminate\Database\Eloquent\ModelNotFoundException; -use Illuminate\Support\Str; use Illuminate\Support\Facades\Response; +use Illuminate\Support\Str; class StatsController extends ApiControllerBase { diff --git a/app/Http/Controllers/Api/Web/TracksController.php b/app/Http/Controllers/Api/Web/TracksController.php index 5fae5b74..fb6462cb 100644 --- a/app/Http/Controllers/Api/Web/TracksController.php +++ b/app/Http/Controllers/Api/Web/TracksController.php @@ -20,7 +20,6 @@ namespace App\Http\Controllers\Api\Web; -use Illuminate\Http\Request; use App\Commands\DeleteTrackCommand; use App\Commands\EditTrackCommand; use App\Commands\GenerateTrackFilesCommand; @@ -33,9 +32,10 @@ use App\Models\Track; use App\Models\TrackFile; use App\Models\TrackType; use App\Models\User; +use Illuminate\Database\Eloquent\ModelNotFoundException; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\File; -use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Support\Facades\Response; use Symfony\Component\HttpFoundation\File\UploadedFile; diff --git a/app/Http/Controllers/ArtistsController.php b/app/Http/Controllers/ArtistsController.php index 7ee7d574..d345230d 100644 --- a/app/Http/Controllers/ArtistsController.php +++ b/app/Http/Controllers/ArtistsController.php @@ -20,8 +20,8 @@ namespace App\Http\Controllers; -use Illuminate\Support\Facades\App; use App\Models\User; +use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\Redirect; use Illuminate\Support\Facades\View; diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index 4774d2f6..420d42e4 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -20,17 +20,17 @@ namespace App\Http\Controllers; -use Illuminate\Http\Request; use App\Models\Activity; use App\Models\User; -use Illuminate\Support\Facades\Auth; use Carbon\Carbon; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Log; +use Illuminate\Support\Facades\Redirect; use League\OAuth2\Client\Provider\Exception\IdentityProviderException; use League\OAuth2\Client\Token\AccessToken; -use Illuminate\Support\Facades\Log; use Poniverse\Lib\Client; -use Illuminate\Support\Facades\Redirect; class AuthController extends Controller { diff --git a/app/Http/Controllers/ImagesController.php b/app/Http/Controllers/ImagesController.php index d66983f2..676b962c 100644 --- a/app/Http/Controllers/ImagesController.php +++ b/app/Http/Controllers/ImagesController.php @@ -20,8 +20,8 @@ namespace App\Http\Controllers; -use Illuminate\Support\Facades\App; use App\Models\Image; +use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\Config; use Illuminate\Support\Facades\Redirect; use Illuminate\Support\Facades\Response; diff --git a/app/Http/Controllers/NotificationsController.php b/app/Http/Controllers/NotificationsController.php index 444bd18c..9634e90e 100644 --- a/app/Http/Controllers/NotificationsController.php +++ b/app/Http/Controllers/NotificationsController.php @@ -20,10 +20,10 @@ namespace App\Http\Controllers; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\App; use App\Models\Email; use App\Models\EmailSubscription; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\View; diff --git a/app/Http/Controllers/PlaylistsController.php b/app/Http/Controllers/PlaylistsController.php index 4786121f..01585f19 100644 --- a/app/Http/Controllers/PlaylistsController.php +++ b/app/Http/Controllers/PlaylistsController.php @@ -20,12 +20,12 @@ namespace App\Http\Controllers; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\App; use App\Models\Playlist; use App\Models\ResourceLogItem; use App\Models\Track; use App\PlaylistDownloader; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Redirect; use Illuminate\Support\Facades\View; diff --git a/app/Http/Controllers/TracksController.php b/app/Http/Controllers/TracksController.php index 396cd727..3b0a8629 100644 --- a/app/Http/Controllers/TracksController.php +++ b/app/Http/Controllers/TracksController.php @@ -20,13 +20,13 @@ namespace App\Http\Controllers; -use Illuminate\Support\Facades\App; use App\Models\ResourceLogItem; use App\Models\Track; use App\Models\TrackFile; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Config; -use Illuminate\Http\Request; use Illuminate\Support\Facades\Redirect; use Illuminate\Support\Facades\Response; use Illuminate\Support\Facades\View; diff --git a/app/Http/Middleware/Authorize.php b/app/Http/Middleware/Authorize.php index acac95b2..495343ac 100644 --- a/app/Http/Middleware/Authorize.php +++ b/app/Http/Middleware/Authorize.php @@ -21,8 +21,8 @@ namespace App\Http\Middleware; use Closure; -use Illuminate\Support\Facades\Gate; use Illuminate\Contracts\Auth\Guard; +use Illuminate\Support\Facades\Gate; class Authorize { diff --git a/app/Jobs/DeleteGenre.php b/app/Jobs/DeleteGenre.php index 1a1cc1c9..714519dd 100644 --- a/app/Jobs/DeleteGenre.php +++ b/app/Jobs/DeleteGenre.php @@ -22,10 +22,10 @@ namespace App\Jobs; use App\Models\Genre; use App\Models\Track; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\DB; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Queue\InteractsWithQueue; +use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\DB; use SerializesModels; class DeleteGenre extends Job implements ShouldQueue diff --git a/app/Jobs/DeleteShowSong.php b/app/Jobs/DeleteShowSong.php index 4a4e9dba..99087a50 100644 --- a/app/Jobs/DeleteShowSong.php +++ b/app/Jobs/DeleteShowSong.php @@ -22,10 +22,10 @@ namespace App\Jobs; use App\Models\ShowSong; use App\Models\Track; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\DB; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Queue\InteractsWithQueue; +use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\DB; use SerializesModels; class DeleteShowSong extends Job implements ShouldQueue diff --git a/app/Jobs/EncodeTrackFile.php b/app/Jobs/EncodeTrackFile.php index a7373f39..860c93d6 100644 --- a/app/Jobs/EncodeTrackFile.php +++ b/app/Jobs/EncodeTrackFile.php @@ -25,12 +25,12 @@ use App\Exceptions\InvalidEncodeOptionsException; use App\Models\Track; use App\Models\TrackFile; use Carbon\Carbon; -use Illuminate\Support\Facades\Config; -use Illuminate\Support\Facades\DB; -use Illuminate\Support\Facades\File; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; +use Illuminate\Support\Facades\Config; +use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\File; use Illuminate\Support\Facades\Log; use Symfony\Component\Process\Exception\ProcessFailedException; use Symfony\Component\Process\Process; diff --git a/app/Jobs/Job.php b/app/Jobs/Job.php index c18630f0..d57fdcfb 100644 --- a/app/Jobs/Job.php +++ b/app/Jobs/Job.php @@ -20,9 +20,9 @@ namespace App\Jobs; +use Illuminate\Bus\Queueable; use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\DB; -use Illuminate\Bus\Queueable; abstract class Job { diff --git a/app/Jobs/UpdateSearchIndexForEntity.php b/app/Jobs/UpdateSearchIndexForEntity.php index d4941b01..3e5a2671 100644 --- a/app/Jobs/UpdateSearchIndexForEntity.php +++ b/app/Jobs/UpdateSearchIndexForEntity.php @@ -22,10 +22,10 @@ namespace App\Jobs; use App\Contracts\Searchable; use App\Jobs\Job; -use Illuminate\Support\Facades\DB; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Database\Eloquent\Model; use Illuminate\Queue\InteractsWithQueue; +use Illuminate\Support\Facades\DB; use SerializesModels; class UpdateSearchIndexForEntity extends Job implements ShouldQueue diff --git a/app/Jobs/UpdateTagsForRenamedGenre.php b/app/Jobs/UpdateTagsForRenamedGenre.php index a55e9531..df77d4ae 100644 --- a/app/Jobs/UpdateTagsForRenamedGenre.php +++ b/app/Jobs/UpdateTagsForRenamedGenre.php @@ -22,11 +22,11 @@ namespace App\Jobs; use App\Models\Genre; use App\Models\Track; +use Illuminate\Contracts\Queue\ShouldQueue; +use Illuminate\Queue\InteractsWithQueue; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\DB; -use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use Illuminate\Support\Facades\Log; use SerializesModels; diff --git a/app/Jobs/UpdateTagsForRenamedShowSong.php b/app/Jobs/UpdateTagsForRenamedShowSong.php index bac387d2..6f606786 100644 --- a/app/Jobs/UpdateTagsForRenamedShowSong.php +++ b/app/Jobs/UpdateTagsForRenamedShowSong.php @@ -22,10 +22,10 @@ namespace App\Jobs; use App\Models\ShowSong; use App\Models\Track; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Cache; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Queue\InteractsWithQueue; +use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Log; use SerializesModels; diff --git a/app/Library/Search.php b/app/Library/Search.php index c5110d45..721823b4 100644 --- a/app/Library/Search.php +++ b/app/Library/Search.php @@ -24,10 +24,10 @@ use App\Models\Album; use App\Models\Playlist; use App\Models\Track; use App\Models\User; -use Illuminate\Support\Facades\DB; use Elasticsearch\Client; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Collection; +use Illuminate\Support\Facades\DB; class Search { diff --git a/app/Models/Album.php b/app/Models/Album.php index 2e57cc5e..8f396275 100644 --- a/app/Models/Album.php +++ b/app/Models/Album.php @@ -27,17 +27,17 @@ use App\Exceptions\TrackFileNotFoundException; use App\Traits\IndexedInElasticsearchTrait; use App\Traits\SlugTrait; use App\Traits\TrackCollection; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Cache; -use Illuminate\Support\Facades\DB; use Exception; -use Illuminate\Support\Facades\Gate; use Helpers; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\SoftDeletes; +use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Gate; use Venturecraft\Revisionable\RevisionableTrait; /** diff --git a/app/Models/Announcement.php b/app/Models/Announcement.php index aae6eeaa..035828fe 100644 --- a/app/Models/Announcement.php +++ b/app/Models/Announcement.php @@ -49,7 +49,6 @@ use Illuminate\Database\Eloquent\Model; */ class Announcement extends Model { - protected $casts = [ 'links' => 'array', 'tracks' => 'array', diff --git a/app/Models/Comment.php b/app/Models/Comment.php index 0edd13e3..2ea7c1f8 100644 --- a/app/Models/Comment.php +++ b/app/Models/Comment.php @@ -21,10 +21,10 @@ namespace App\Models; use App\Contracts\Commentable; -use Illuminate\Support\Facades\DB; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\SoftDeletes; +use Illuminate\Support\Facades\DB; /** * App\Models\Comment. diff --git a/app/Models/Follower.php b/app/Models/Follower.php index 3ff0c542..1a9128f9 100644 --- a/app/Models/Follower.php +++ b/app/Models/Follower.php @@ -42,7 +42,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; */ class Follower extends Model { - public $timestamps = false; public function follower():BelongsTo diff --git a/app/Models/Genre.php b/app/Models/Genre.php index 709d3310..3d74ebf5 100644 --- a/app/Models/Genre.php +++ b/app/Models/Genre.php @@ -21,11 +21,11 @@ namespace App\Models; use App\Traits\SlugTrait; -use Illuminate\Support\Facades\DB; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\Relation; use Illuminate\Database\Eloquent\SoftDeletes; +use Illuminate\Support\Facades\DB; use Venturecraft\Revisionable\RevisionableTrait; /** diff --git a/app/Models/Image.php b/app/Models/Image.php index 660ae2e4..68b3c49a 100644 --- a/app/Models/Image.php +++ b/app/Models/Image.php @@ -20,9 +20,9 @@ namespace App\Models; -use Illuminate\Support\Facades\Config; use External; use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Facades\Config; use Illuminate\Support\Facades\Log; use Illuminate\Support\Str; use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException; diff --git a/app/Models/PinnedPlaylist.php b/app/Models/PinnedPlaylist.php index 5c28b3db..e733fc68 100644 --- a/app/Models/PinnedPlaylist.php +++ b/app/Models/PinnedPlaylist.php @@ -41,7 +41,6 @@ use Illuminate\Database\Eloquent\Model; */ class PinnedPlaylist extends Model { - public function user() { return $this->belongsTo(User::class); diff --git a/app/Models/Playlist.php b/app/Models/Playlist.php index e2ec68bc..88decf11 100644 --- a/app/Models/Playlist.php +++ b/app/Models/Playlist.php @@ -27,15 +27,15 @@ use App\Exceptions\TrackFileNotFoundException; use App\Traits\IndexedInElasticsearchTrait; use App\Traits\SlugTrait; use App\Traits\TrackCollection; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Cache; -use Illuminate\Support\Facades\DB; use Helpers; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Foundation\Bus\DispatchesJobs; +use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\DB; use Venturecraft\Revisionable\RevisionableTrait; /** diff --git a/app/Models/ResourceLogItem.php b/app/Models/ResourceLogItem.php index 7102f221..4c37a930 100644 --- a/app/Models/ResourceLogItem.php +++ b/app/Models/ResourceLogItem.php @@ -20,10 +20,10 @@ namespace App\Models; -use Illuminate\Support\Facades\Auth; use Carbon\Carbon; -use Illuminate\Support\Facades\DB; use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Request; /** @@ -53,7 +53,6 @@ class ResourceLogItem extends Model { public $timestamps = false; - const VIEW = 1; const DOWNLOAD = 2; const PLAY = 3; diff --git a/app/Models/ShowSong.php b/app/Models/ShowSong.php index 3aee966f..5e43e2ed 100644 --- a/app/Models/ShowSong.php +++ b/app/Models/ShowSong.php @@ -20,8 +20,8 @@ namespace App\Models; -use Illuminate\Support\Facades\DB; use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Facades\DB; /** * App\Models\ShowSong. diff --git a/app/Models/Track.php b/app/Models/Track.php index 3e5e9d3b..c2499b42 100644 --- a/app/Models/Track.php +++ b/app/Models/Track.php @@ -27,13 +27,8 @@ use App\Exceptions\TrackFileNotFoundException; use App\Models\ResourceLogItem; use App\Traits\IndexedInElasticsearchTrait; use App\Traits\SlugTrait; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Cache; -use Illuminate\Support\Facades\Config; -use Illuminate\Support\Facades\DB; use Exception; use External; -use Illuminate\Support\Facades\Gate; use getid3_writetags; use Helpers; use Illuminate\Database\Eloquent\Factories\HasFactory; @@ -41,8 +36,13 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Support\Str; +use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\Config; +use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\Log; +use Illuminate\Support\Str; use Venturecraft\Revisionable\RevisionableTrait; /** diff --git a/app/Models/TrackFile.php b/app/Models/TrackFile.php index 006e7199..3ff857f9 100644 --- a/app/Models/TrackFile.php +++ b/app/Models/TrackFile.php @@ -20,11 +20,11 @@ namespace App\Models; +use Helpers; +use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\Config; use Illuminate\Support\Facades\File; -use Helpers; -use Illuminate\Database\Eloquent\Model; /** * App\Models\TrackFile. diff --git a/app/Models/TrackType.php b/app/Models/TrackType.php index 2102c224..e7b85bd8 100644 --- a/app/Models/TrackType.php +++ b/app/Models/TrackType.php @@ -35,7 +35,6 @@ use Illuminate\Database\Eloquent\Model; */ class TrackType extends Model { - const ORIGINAL_TRACK = 1; const OFFICIAL_TRACK_REMIX = 2; const FAN_TRACK_REMIX = 3; diff --git a/app/Models/User.php b/app/Models/User.php index 9c216f67..7253e0e4 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -23,9 +23,7 @@ namespace App\Models; use App\Contracts\Commentable; use App\Contracts\Searchable; use App\Traits\IndexedInElasticsearchTrait; -use Illuminate\Support\Facades\Auth; use Carbon\Carbon; -use Illuminate\Support\Facades\DB; use Gravatar; use Illuminate\Auth\Authenticatable; use Illuminate\Auth\Passwords\CanResetPassword; @@ -36,9 +34,11 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Foundation\Auth\Access\Authorizable; +use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Validator; use Illuminate\Support\Str; use League\OAuth2\Client\Token\AccessToken; -use Illuminate\Support\Facades\Validator; use Venturecraft\Revisionable\RevisionableTrait; /** diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index e51c9719..aadae502 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -22,10 +22,10 @@ namespace App\Providers; use Illuminate\Database\Eloquent\Relations\Relation; use Illuminate\Foundation\Application; +use Illuminate\Support\Facades\Validator; use Illuminate\Support\ServiceProvider; use PfmValidator; use Poniverse; -use Illuminate\Support\Facades\Validator; class AppServiceProvider extends ServiceProvider { diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index fbb1fb09..835a6882 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -30,9 +30,9 @@ use App\Policies\GenrePolicy; use App\Policies\ShowSongPolicy; use App\Policies\TrackPolicy; use App\Policies\UserPolicy; -use Illuminate\Support\Facades\Gate; use Illuminate\Contracts\Auth\Access\Gate as GateContract; use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider; +use Illuminate\Support\Facades\Gate; class AuthServiceProvider extends ServiceProvider { diff --git a/app/Traits/IndexedInElasticsearchTrait.php b/app/Traits/IndexedInElasticsearchTrait.php index 39f75e03..5c1e951d 100644 --- a/app/Traits/IndexedInElasticsearchTrait.php +++ b/app/Traits/IndexedInElasticsearchTrait.php @@ -22,10 +22,10 @@ namespace App\Traits; use App\Contracts\Searchable; use App\Jobs\UpdateSearchIndexForEntity; -use Illuminate\Support\Facades\Config; use Elasticsearch; use Elasticsearch\Common\Exceptions\Missing404Exception; use Illuminate\Foundation\Bus\DispatchesJobs; +use Illuminate\Support\Facades\Config; /** * Class IndexedInElasticsearch. diff --git a/app/Traits/TrackCollection.php b/app/Traits/TrackCollection.php index cb312510..81655493 100644 --- a/app/Traits/TrackCollection.php +++ b/app/Traits/TrackCollection.php @@ -24,11 +24,11 @@ namespace App\Traits; use App\Jobs\EncodeTrackFile; use App\Models\Track; use App\Models\TrackFile; -use Illuminate\Support\Facades\File; use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\Relation; use Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\File; /** * Class TrackCollection.