From 185ead4ed0cc6c094acdb9b33d0b2c812abe4932 Mon Sep 17 00:00:00 2001 From: Peter Deltchev Date: Sun, 12 Jun 2016 04:49:24 -0700 Subject: [PATCH] Improved a bunch of use statements. --- app/Commands/CreateAlbumCommand.php | 4 ++-- app/Commands/CreateCommentCommand.php | 4 ++-- app/Commands/CreatePlaylistCommand.php | 4 ++-- app/Commands/EditPlaylistCommand.php | 4 ++-- app/Commands/RemoveTrackFromPlaylistCommand.php | 4 ++-- app/Commands/SaveAccountSettingsCommand.php | 4 ++-- app/Commands/ToggleFavouriteCommand.php | 4 ++-- app/Console/Commands/ClearTrackCache.php | 1 - app/Http/Controllers/AccountController.php | 4 ++-- app/Http/Controllers/AdminController.php | 1 - app/Http/Controllers/Api/Web/AccountController.php | 6 +++--- app/Http/Controllers/Api/Web/CommentsController.php | 4 ++-- app/Http/Controllers/Api/Web/DashboardController.php | 5 ++--- app/Http/Controllers/Api/Web/FavouritesController.php | 6 +++--- app/Http/Controllers/Api/Web/FollowController.php | 2 +- app/Http/Controllers/Api/Web/TaxonomiesController.php | 2 +- app/Http/Controllers/ImagesController.php | 4 ++-- app/Http/Controllers/PlaylistsController.php | 2 +- app/Http/Controllers/TracksController.php | 2 +- .../2015_10_29_153827_update_track_files_with_filesize.php | 1 - 20 files changed, 32 insertions(+), 36 deletions(-) diff --git a/app/Commands/CreateAlbumCommand.php b/app/Commands/CreateAlbumCommand.php index c52bfd15..5665a5b3 100644 --- a/app/Commands/CreateAlbumCommand.php +++ b/app/Commands/CreateAlbumCommand.php @@ -22,8 +22,8 @@ namespace Poniverse\Ponyfm\Commands; use Poniverse\Ponyfm\Models\Album; use Poniverse\Ponyfm\Models\Image; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Validator; +use Auth; +use Validator; class CreateAlbumCommand extends CommandBase { diff --git a/app/Commands/CreateCommentCommand.php b/app/Commands/CreateCommentCommand.php index 00546f3b..70696d9f 100644 --- a/app/Commands/CreateCommentCommand.php +++ b/app/Commands/CreateCommentCommand.php @@ -26,8 +26,8 @@ use Poniverse\Ponyfm\Models\Comment; use Poniverse\Ponyfm\Models\Playlist; use Poniverse\Ponyfm\Models\Track; use Poniverse\Ponyfm\Models\User; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Validator; +use Auth; +use Validator; class CreateCommentCommand extends CommandBase { diff --git a/app/Commands/CreatePlaylistCommand.php b/app/Commands/CreatePlaylistCommand.php index 92e3498c..6a6ef66e 100644 --- a/app/Commands/CreatePlaylistCommand.php +++ b/app/Commands/CreatePlaylistCommand.php @@ -22,8 +22,8 @@ namespace Poniverse\Ponyfm\Commands; use Notification; use Poniverse\Ponyfm\Models\Playlist; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Validator; +use Auth; +use Validator; class CreatePlaylistCommand extends CommandBase { diff --git a/app/Commands/EditPlaylistCommand.php b/app/Commands/EditPlaylistCommand.php index 1cc66bc0..abe13e25 100644 --- a/app/Commands/EditPlaylistCommand.php +++ b/app/Commands/EditPlaylistCommand.php @@ -22,8 +22,8 @@ namespace Poniverse\Ponyfm\Commands; use Poniverse\Ponyfm\Models\PinnedPlaylist; use Poniverse\Ponyfm\Models\Playlist; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Validator; +use Auth; +use Validator; class EditPlaylistCommand extends CommandBase { diff --git a/app/Commands/RemoveTrackFromPlaylistCommand.php b/app/Commands/RemoveTrackFromPlaylistCommand.php index e80242ce..e47ff886 100644 --- a/app/Commands/RemoveTrackFromPlaylistCommand.php +++ b/app/Commands/RemoveTrackFromPlaylistCommand.php @@ -22,8 +22,8 @@ namespace Poniverse\Ponyfm\Commands; use Poniverse\Ponyfm\Models\Playlist; use Poniverse\Ponyfm\Models\Track; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\DB; +use Auth; +use DB; class RemoveTrackFromPlaylistCommand extends CommandBase { diff --git a/app/Commands/SaveAccountSettingsCommand.php b/app/Commands/SaveAccountSettingsCommand.php index 91901977..df3a303b 100644 --- a/app/Commands/SaveAccountSettingsCommand.php +++ b/app/Commands/SaveAccountSettingsCommand.php @@ -23,8 +23,8 @@ namespace Poniverse\Ponyfm\Commands; use Poniverse\Ponyfm\Models\Image; use Poniverse\Ponyfm\Models\User; use Gate; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Validator; +use Auth; +use Validator; class SaveAccountSettingsCommand extends CommandBase { diff --git a/app/Commands/ToggleFavouriteCommand.php b/app/Commands/ToggleFavouriteCommand.php index b97d9981..68c3ce74 100644 --- a/app/Commands/ToggleFavouriteCommand.php +++ b/app/Commands/ToggleFavouriteCommand.php @@ -25,8 +25,8 @@ use Poniverse\Ponyfm\Contracts\Favouritable; use Poniverse\Ponyfm\Models\Favourite; use Poniverse\Ponyfm\Models\Playlist; use Poniverse\Ponyfm\Models\ResourceUser; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\DB; +use Auth; +use DB; use Poniverse\Ponyfm\Models\Track; class ToggleFavouriteCommand extends CommandBase diff --git a/app/Console/Commands/ClearTrackCache.php b/app/Console/Commands/ClearTrackCache.php index 88e5b279..50cde6f0 100644 --- a/app/Console/Commands/ClearTrackCache.php +++ b/app/Console/Commands/ClearTrackCache.php @@ -23,7 +23,6 @@ namespace Poniverse\Ponyfm\Console\Commands; use Carbon\Carbon; use File; use Illuminate\Console\Command; -use Illuminate\Support\Facades\Cache; use Poniverse\Ponyfm\Models\TrackFile; class ClearTrackCache extends Command diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index c110b3db..fbbc1566 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -20,8 +20,8 @@ namespace Poniverse\Ponyfm\Http\Controllers; -use Illuminate\Support\Facades\Config; -use Illuminate\Support\Facades\Redirect; +use Config; +use Redirect; use View; class AccountController extends Controller diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index 1e52d708..450da761 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -20,7 +20,6 @@ namespace Poniverse\Ponyfm\Http\Controllers; -use Illuminate\Support\Facades\Redirect; use View; class AdminController extends Controller diff --git a/app/Http/Controllers/Api/Web/AccountController.php b/app/Http/Controllers/Api/Web/AccountController.php index 86eedaa7..ff1f39c6 100644 --- a/app/Http/Controllers/Api/Web/AccountController.php +++ b/app/Http/Controllers/Api/Web/AccountController.php @@ -25,9 +25,9 @@ use Poniverse\Ponyfm\Http\Controllers\ApiControllerBase; use Poniverse\Ponyfm\Commands\SaveAccountSettingsCommand; use Poniverse\Ponyfm\Models\User; use Gate; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Input; -use Illuminate\Support\Facades\Response; +use Auth; +use Input; +use Response; class AccountController extends ApiControllerBase { diff --git a/app/Http/Controllers/Api/Web/CommentsController.php b/app/Http/Controllers/Api/Web/CommentsController.php index efbe16ac..3b82bb1e 100644 --- a/app/Http/Controllers/Api/Web/CommentsController.php +++ b/app/Http/Controllers/Api/Web/CommentsController.php @@ -24,8 +24,8 @@ use App; use Poniverse\Ponyfm\Commands\CreateCommentCommand; use Poniverse\Ponyfm\Models\Comment; use Poniverse\Ponyfm\Http\Controllers\ApiControllerBase; -use Illuminate\Support\Facades\Input; -use Illuminate\Support\Facades\Response; +use Input; +use Response; class CommentsController extends ApiControllerBase { diff --git a/app/Http/Controllers/Api/Web/DashboardController.php b/app/Http/Controllers/Api/Web/DashboardController.php index 2ae700ac..de9239dd 100644 --- a/app/Http/Controllers/Api/Web/DashboardController.php +++ b/app/Http/Controllers/Api/Web/DashboardController.php @@ -22,9 +22,8 @@ namespace Poniverse\Ponyfm\Http\Controllers\Api\Web; use Poniverse\Ponyfm\Http\Controllers\ApiControllerBase; use Poniverse\Ponyfm\Models\Track; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Input; -use Illuminate\Support\Facades\Response; +use Auth; +use Response; class DashboardController extends ApiControllerBase { diff --git a/app/Http/Controllers/Api/Web/FavouritesController.php b/app/Http/Controllers/Api/Web/FavouritesController.php index db445e34..a75fbbff 100644 --- a/app/Http/Controllers/Api/Web/FavouritesController.php +++ b/app/Http/Controllers/Api/Web/FavouritesController.php @@ -26,9 +26,9 @@ use Poniverse\Ponyfm\Models\Favourite; use Poniverse\Ponyfm\Http\Controllers\ApiControllerBase; use Poniverse\Ponyfm\Models\Playlist; use Poniverse\Ponyfm\Models\Track; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Input; -use Illuminate\Support\Facades\Response; +use Auth; +use Input; +use Response; class FavouritesController extends ApiControllerBase { diff --git a/app/Http/Controllers/Api/Web/FollowController.php b/app/Http/Controllers/Api/Web/FollowController.php index 6650bf9f..d0f79595 100644 --- a/app/Http/Controllers/Api/Web/FollowController.php +++ b/app/Http/Controllers/Api/Web/FollowController.php @@ -22,7 +22,7 @@ namespace Poniverse\Ponyfm\Http\Controllers\Api\Web; use Poniverse\Ponyfm\Commands\ToggleFollowingCommand; use Poniverse\Ponyfm\Http\Controllers\ApiControllerBase; -use Illuminate\Support\Facades\Input; +use Input; class FollowController extends ApiControllerBase { diff --git a/app/Http/Controllers/Api/Web/TaxonomiesController.php b/app/Http/Controllers/Api/Web/TaxonomiesController.php index 4c09ad02..d92429bf 100644 --- a/app/Http/Controllers/Api/Web/TaxonomiesController.php +++ b/app/Http/Controllers/Api/Web/TaxonomiesController.php @@ -25,7 +25,7 @@ use Poniverse\Ponyfm\Http\Controllers\ApiControllerBase; use Poniverse\Ponyfm\Models\License; use Poniverse\Ponyfm\Models\ShowSong; use Poniverse\Ponyfm\Models\TrackType; -use Illuminate\Support\Facades\DB; +use DB; class TaxonomiesController extends ApiControllerBase { diff --git a/app/Http/Controllers/ImagesController.php b/app/Http/Controllers/ImagesController.php index f0cd9920..6413e6c3 100644 --- a/app/Http/Controllers/ImagesController.php +++ b/app/Http/Controllers/ImagesController.php @@ -22,8 +22,8 @@ namespace Poniverse\Ponyfm\Http\Controllers; use Poniverse\Ponyfm\Models\Image; use Config; -use Illuminate\Support\Facades\App; -use Illuminate\Support\Facades\Redirect; +use App; +use Redirect; use Response; class ImagesController extends Controller diff --git a/app/Http/Controllers/PlaylistsController.php b/app/Http/Controllers/PlaylistsController.php index f0ea6a82..275f08ff 100644 --- a/app/Http/Controllers/PlaylistsController.php +++ b/app/Http/Controllers/PlaylistsController.php @@ -26,7 +26,7 @@ use Poniverse\Ponyfm\Models\ResourceLogItem; use Poniverse\Ponyfm\Models\Track; use Poniverse\Ponyfm\PlaylistDownloader; use Auth; -use Illuminate\Support\Facades\Redirect; +use Redirect; use View; class PlaylistsController extends Controller diff --git a/app/Http/Controllers/TracksController.php b/app/Http/Controllers/TracksController.php index 079e12cc..d5501a46 100644 --- a/app/Http/Controllers/TracksController.php +++ b/app/Http/Controllers/TracksController.php @@ -25,7 +25,7 @@ use Poniverse\Ponyfm\Models\Track; use Poniverse\Ponyfm\Models\TrackFile; use Auth; use Config; -use Illuminate\Support\Facades\App; +use App; use Redirect; use Response; use View; diff --git a/database/migrations/2015_10_29_153827_update_track_files_with_filesize.php b/database/migrations/2015_10_29_153827_update_track_files_with_filesize.php index 70f80ef4..6fd18847 100644 --- a/database/migrations/2015_10_29_153827_update_track_files_with_filesize.php +++ b/database/migrations/2015_10_29_153827_update_track_files_with_filesize.php @@ -20,7 +20,6 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; -use Illuminate\Support\Facades\Artisan; class UpdateTrackFilesWithFilesize extends Migration {