Shift to helper methods

Laravel offers many helper functions, including: `view()`, `response()`, `redirect()`, `config()`, and more.

Review the [Helpers][1] documentation for more details.

[1]: https://laravel.com/docs/5.7/helpers

app/Http/Controllers/Api/Mobile/TracksController.php

@@ -44,7 +44,7 @@ class TracksController extends Controller
             'tracks' => $tracks->toArray(),
         ];
 
-        return Response::json($json, 200);
+        return response()->json($json, 200);
     }
 
     public function popular()
@@ -56,6 +56,6 @@ class TracksController extends Controller
             'tracks' => $tracks->toArray(),
         ];
 
-        return Response::json($json, 200);
+        return response()->json($json, 200);
     }
 }

app/Http/Controllers/Api/V1/TracksController.php

@@ -60,9 +60,9 @@ class TracksController extends ApiControllerBase
         $this->authorize('edit', $track);
 
         if ($track->status === Track::STATUS_PROCESSING) {
-            return Response::json(['message' => 'Processing...'], 202);
+            return response()->json(['message' => 'Processing...'], 202);
         } elseif ($track->status === Track::STATUS_COMPLETE) {
-            return Response::json([
+            return response()->json([
                 'message' => $track->published_at
                     ? 'Processing complete! The track is live at the track_url. The artist can edit the track by visiting its edit_url.'
                     : 'Processing complete! The artist must publish the track by visiting its edit_url.',
@@ -71,7 +71,7 @@ class TracksController extends ApiControllerBase
             ], 201);
         } else {
             // something went wrong
-            return Response::json(['error' => 'Processing failed! Please contact logic@pony.fm to figure out what went wrong.'], 500);
+            return response()->json(['error' => 'Processing failed! Please contact logic@pony.fm to figure out what went wrong.'], 500);
         }
     }
 
@@ -92,10 +92,10 @@ class TracksController extends ApiControllerBase
             ->where('id', $id)->first();
 
         if (! $track) {
-            return Response::json(['message' => 'Track not found.'], 404);
+            return response()->json(['message' => 'Track not found.'], 404);
         }
 
-        return Response::json(self::trackToJson($track, false, true), 200);
+        return response()->json(self::trackToJson($track, false, true), 200);
     }
 
     /**
@@ -114,10 +114,10 @@ class TracksController extends ApiControllerBase
             ->where('hash', $hash)->first();
 
         if (! $track) {
-            return Response::json(['message' => 'Track not found.'], 403);
+            return response()->json(['message' => 'Track not found.'], 403);
         }
 
-        return Response::json(self::trackToJson($track, true, false), 200);
+        return response()->json(self::trackToJson($track, true, false), 200);
     }
 
     /**

app/Http/Controllers/Api/Web/AccountController.php

@@ -35,7 +35,7 @@ class AccountController extends ApiControllerBase
     {
         $this->authorize('edit', $user);
 
-        return Response::json([
+        return response()->json([
             'user' => $user->toArray(),
         ]);
     }
@@ -48,10 +48,10 @@ class AccountController extends ApiControllerBase
             $user = User::where('id', $current_user->id)->whereNull('disabled_at')->first();
 
             if ($user == null) {
-                return Response::json(['error' => 'You are not logged in'], 404);
+                return response()->json(['error' => 'You are not logged in'], 404);
             }
 
-            return Response::json([
+            return response()->json([
                 'id' => $user->id,
                 'name' => $user->display_name,
                 'slug' => $user->slug,
@@ -64,7 +64,7 @@ class AccountController extends ApiControllerBase
                 'created_at' => $user->created_at,
             ], 200);
         } else {
-            return Response::json(['error' => 'You are not logged in'], 404);
+            return response()->json(['error' => 'You are not logged in'], 404);
         }
     }
 
@@ -81,15 +81,15 @@ class AccountController extends ApiControllerBase
             }
 
             if ($user == null) {
-                return Response::json(['error' => 'User does not exist'], 404);
+                return response()->json(['error' => 'User does not exist'], 404);
             }
 
             if (Gate::denies('edit', $user)) {
-                return Response::json(['error' => 'You cannot do that. So stop trying!'], 403);
+                return response()->json(['error' => 'You cannot do that. So stop trying!'], 403);
             }
         }
 
-        return Response::json([
+        return response()->json([
             'id'  => $user->id,
             'bio' => $user->bio,
             'can_see_explicit_content' => $user->can_see_explicit_content == 1,

app/Http/Controllers/Api/Web/AlbumsController.php

@@ -85,7 +85,7 @@ class AlbumsController extends ApiControllerBase
             unset($returned_album['formats']);
         }
 
-        return Response::json([
+        return response()->json([
             'album' => $returned_album,
         ], 200);
     }
@@ -114,7 +114,7 @@ class AlbumsController extends ApiControllerBase
             $url = null;
         }
 
-        return Response::json(['url' => $url], 200);
+        return response()->json(['url' => $url], 200);
     }
 
     public function getIndex()
@@ -143,7 +143,7 @@ class AlbumsController extends ApiControllerBase
             $albums[] = Album::mapPublicAlbumSummary($album);
         }
 
-        return Response::json(
+        return response()->json(
             ['albums' => $albums, 'current_page' => $page, 'total_pages' => ceil($count / $perPage)],
             200
         );
@@ -172,7 +172,7 @@ class AlbumsController extends ApiControllerBase
             ];
         }
 
-        return Response::json($albums, 200);
+        return response()->json($albums, 200);
     }
 
     public function getEdit($id)
@@ -194,7 +194,7 @@ class AlbumsController extends ApiControllerBase
             ];
         }
 
-        return Response::json([
+        return response()->json([
             'id' => $album->id,
             'title' => $album->title,
             'user_id' => $album->user_id,

app/Http/Controllers/Api/Web/AnnouncementsController.php

@@ -41,7 +41,7 @@ class AnnouncementsController extends Controller
 
         $announcement = $query->first();
 
-        return Response::json(
+        return response()->json(
             ['announcement' => $announcement],
             200
         );
@@ -54,7 +54,7 @@ class AnnouncementsController extends Controller
         $announcements = Announcement::orderBy('start_time', 'desc')
             ->get();
 
-        return Response::json([
+        return response()->json([
             'announcements' => $announcements->toArray(),
         ], 200);
     }
@@ -68,7 +68,7 @@ class AnnouncementsController extends Controller
 
         $announcement = $query->first();
 
-        return Response::json(
+        return response()->json(
             ['announcement' => $announcement],
             200
         );

app/Http/Controllers/Api/Web/ArtistsController.php

@@ -78,7 +78,7 @@ class ArtistsController extends ApiControllerBase
             }
         }
 
-        return Response::json([
+        return response()->json([
             'tracks' => $tracks,
             'albums' => $albums,
         ], 200);
@@ -122,7 +122,7 @@ class ArtistsController extends ApiControllerBase
             $albums[] = Album::mapPublicAlbumSummary($album);
         }
 
-        return Response::json(['singles' => $singles, 'albumTracks' => $tracks, 'albums' => $albums], 200);
+        return response()->json(['singles' => $singles, 'albumTracks' => $tracks, 'albums' => $albums], 200);
     }
 
     public function getShow($slug)
@@ -178,7 +178,7 @@ class ArtistsController extends ApiControllerBase
         $followers = Follower::where('artist_id', $user->id)
             ->count();
 
-        return Response::json([
+        return response()->json([
             'artist' => [
                 'id' => $user->id,
                 'name' => $user->display_name,
@@ -227,7 +227,7 @@ class ArtistsController extends ApiControllerBase
             $users[] = User::mapPublicUserSummary($user);
         }
 
-        return Response::json(
+        return response()->json(
             ['artists' => $users, 'current_page' => $page, 'total_pages' => ceil($count / $perPage)],
             200
         );

app/Http/Controllers/Api/Web/CommentsController.php

@@ -63,6 +63,6 @@ class CommentsController extends ApiControllerBase
             $comments[] = Comment::mapPublic($comment);
         }
 
-        return Response::json(['list' => $comments, 'count' => count($comments)]);
+        return response()->json(['list' => $comments, 'count' => count($comments)]);
     }
 }

app/Http/Controllers/Api/Web/DashboardController.php

@@ -49,7 +49,7 @@ class DashboardController extends ApiControllerBase
             $recentTracks[] = Track::mapPublicTrackSummary($track);
         }
 
-        return Response::json([
+        return response()->json([
             'recent_tracks' => $recentTracks,
             'popular_tracks' => Track::popular(30, Auth::check() && Auth::user()->can_see_explicit_content),
         ], 200);

app/Http/Controllers/Api/Web/FavouritesController.php

@@ -65,7 +65,7 @@ class FavouritesController extends ApiControllerBase
             $tracks[] = Track::mapPublicTrackSummary($fav->track);
         }
 
-        return Response::json(['tracks' => $tracks], 200);
+        return response()->json(['tracks' => $tracks], 200);
     }
 
     public function getAlbums()
@@ -92,7 +92,7 @@ class FavouritesController extends ApiControllerBase
             $albums[] = Album::mapPublicAlbumSummary($fav->album);
         }
 
-        return Response::json(['albums' => $albums], 200);
+        return response()->json(['albums' => $albums], 200);
     }
 
     public function getPlaylist()
@@ -120,6 +120,6 @@ class FavouritesController extends ApiControllerBase
             $playlists[] = Playlist::mapPublicPlaylistSummary($fav->playlist);
         }
 
-        return Response::json(['playlists' => $playlists], 200);
+        return response()->json(['playlists' => $playlists], 200);
     }
 }

app/Http/Controllers/Api/Web/GenresController.php

@@ -40,7 +40,7 @@ class GenresController extends ApiControllerBase
             ->orderBy('name', 'asc')
             ->get();
 
-        return Response::json([
+        return response()->json([
             'genres' => $genres->toArray(),
         ], 200);
     }

app/Http/Controllers/Api/Web/ImagesController.php

@@ -48,6 +48,6 @@ class ImagesController extends ApiControllerBase
             ];
         }
 
-        return Response::json($images, 200);
+        return response()->json($images, 200);
     }
 }

app/Http/Controllers/Api/Web/PlaylistsController.php

@@ -94,7 +94,7 @@ class PlaylistsController extends ApiControllerBase
             $playlists[] = Playlist::mapPublicPlaylistSummary($playlist);
         }
 
-        return Response::json([
+        return response()->json([
             'playlists' => $playlists,
             'current_page' => $page,
             'total_pages' => ceil($count / $perPage),
@@ -124,7 +124,7 @@ class PlaylistsController extends ApiControllerBase
             $playlist->view_count++;
         }
 
-        return Response::json(Playlist::mapPublicPlaylistShow($playlist), 200);
+        return response()->json(Playlist::mapPublicPlaylistShow($playlist), 200);
     }
 
     public function getCachedPlaylist($id, $format)
@@ -155,7 +155,7 @@ class PlaylistsController extends ApiControllerBase
             $url = null;
         }
 
-        return Response::json(['url' => $url], 200);
+        return response()->json(['url' => $url], 200);
     }
 
     public function getPinned()
@@ -179,7 +179,7 @@ class PlaylistsController extends ApiControllerBase
             $playlists[] = $mapped;
         }
 
-        return Response::json($playlists, 200);
+        return response()->json($playlists, 200);
     }
 
     public function getOwned(User $user)
@@ -209,7 +209,7 @@ class PlaylistsController extends ApiControllerBase
             ];
         }
 
-        return Response::json($playlists, 200);
+        return response()->json($playlists, 200);
     }
 
     /**

app/Http/Controllers/Api/Web/SearchController.php

@@ -32,7 +32,7 @@ class SearchController extends ApiControllerBase
     {
         $results = $search->searchAllContent(Request::query('query'));
 
-        return Response::json([
+        return response()->json([
             'results' => $results,
         ], 200);
     }

app/Http/Controllers/Api/Web/ShowSongsController.php

@@ -41,7 +41,7 @@ class ShowSongsController extends ApiControllerBase
             ->select('id', 'title', 'slug')
             ->get();
 
-        return Response::json([
+        return response()->json([
             'showsongs' => $songs->toArray(),
         ], 200);
     }

app/Http/Controllers/Api/Web/StatsController.php

@@ -101,9 +101,9 @@ class StatsController extends ApiControllerBase
         }
 
         if ($hourly) {
-            return Response::json(['playStats' => $output, 'type' => 'Hourly'], 200);
+            return response()->json(['playStats' => $output, 'type' => 'Hourly'], 200);
         } else {
-            return Response::json(['playStats' => $output, 'type' => 'Daily'], 200);
+            return response()->json(['playStats' => $output, 'type' => 'Daily'], 200);
         }
     }
 

app/Http/Controllers/Api/Web/TaxonomiesController.php

@@ -31,7 +31,7 @@ class TaxonomiesController extends ApiControllerBase
 {
     public function getAll()
     {
-        return \Response::json([
+        return response()->json([
             'licenses' => License::all()->toArray(),
             'genres' => Genre::with('trackCountRelation')
                 ->orderBy('name')

app/Http/Controllers/Api/Web/TracksController.php

@@ -54,12 +54,12 @@ class TracksController extends ApiControllerBase
         $this->authorize('edit', $track);
 
         if ($track->status === Track::STATUS_PROCESSING) {
-            return Response::json(['message' => 'Processing...'], 202);
+            return response()->json(['message' => 'Processing...'], 202);
         } elseif ($track->status === Track::STATUS_COMPLETE) {
-            return Response::json(['message' => 'Processing complete!'], 201);
+            return response()->json(['message' => 'Processing complete!'], 201);
         } else {
             // something went wrong
-            return Response::json(['error' => 'Processing failed!'], 500);
+            return response()->json(['error' => 'Processing failed!'], 500);
         }
     }
 
@@ -95,12 +95,12 @@ class TracksController extends ApiControllerBase
         $this->authorize('edit', $track);
 
         if ($track->version_upload_status === Track::STATUS_PROCESSING) {
-            return Response::json(['message' => 'Processing...'], 202);
+            return response()->json(['message' => 'Processing...'], 202);
         } elseif ($track->version_upload_status === Track::STATUS_COMPLETE) {
-            return Response::json(['message' => 'Processing complete!'], 201);
+            return response()->json(['message' => 'Processing complete!'], 201);
         } else {
             // something went wrong
-            return Response::json(['error' => 'Processing failed!'], 500);
+            return response()->json(['error' => 'Processing failed!'], 500);
         }
     }
 
@@ -119,7 +119,7 @@ class TracksController extends ApiControllerBase
             ];
         }
 
-        return Response::json(['current_version' => $track->current_version, 'versions' => $versions], 200);
+        return response()->json(['current_version' => $track->current_version, 'versions' => $versions], 200);
     }
 
     public function getChangeVersion($trackId, $newVersion)
@@ -159,7 +159,7 @@ class TracksController extends ApiControllerBase
             unset($returned_track['formats']);
         }
 
-        return Response::json(['track' => $returned_track], 200);
+        return response()->json(['track' => $returned_track], 200);
     }
 
     public function getCachedTrack($id, $format)
@@ -199,7 +199,7 @@ class TracksController extends ApiControllerBase
             $url = null;
         }
 
-        return Response::json(['url' => $url], 200);
+        return response()->json(['url' => $url], 200);
     }
 
     public function getIndex($all = false, $unknown = false)
@@ -240,7 +240,7 @@ class TracksController extends ApiControllerBase
             $ids[] = $track->id;
         }
 
-        return Response::json([
+        return response()->json([
             'tracks' => $tracks,
             'current_page' => $page,
             'total_pages' => ceil($totalCount / $perPage),
@@ -270,7 +270,7 @@ class TracksController extends ApiControllerBase
             $tracks[] = Track::mapPrivateTrackSummary($track);
         }
 
-        return Response::json($tracks, 200);
+        return response()->json($tracks, 200);
     }
 
     public function getEdit($id)
@@ -282,7 +282,7 @@ class TracksController extends ApiControllerBase
 
         $this->authorize('edit', $track);
 
-        return Response::json(Track::mapPrivateTrackShow($track), 200);
+        return response()->json(Track::mapPrivateTrackShow($track), 200);
     }
 
     /**

app/Http/Controllers/ApiControllerBase.php

@@ -40,22 +40,22 @@ abstract class ApiControllerBase extends Controller
 
         $result = $command->execute();
         if ($result->didFail()) {
-            return Response::json([
+            return response()->json([
                 'message' => 'Validation failed',
                 'errors' => $result->getMessages(),
             ], $result->getStatusCode());
         }
 
-        return Response::json($result->getResponse(), $result->getStatusCode());
+        return response()->json($result->getResponse(), $result->getStatusCode());
     }
 
     public function notAuthorized()
     {
-        return Response::json(['message' => 'You may not do this!'], 403);
+        return response()->json(['message' => 'You may not do this!'], 403);
     }
 
     public function notFound($message)
     {
-        return Response::json(['message' => $message], 403);
+        return response()->json(['message' => $message], 403);
     }
 }

app/Http/Controllers/AuthController.php

@@ -136,7 +136,7 @@ class AuthController extends Controller
 
         // Only email address updates are supported at this time.
         if ('email' !== $updatedAttribute) {
-            return \Response::json(['message' => 'Unsupported Poniverse account attribute.'], 400);
+            return response()->json(['message' => 'Unsupported Poniverse account attribute.'], 400);
         }
 
         $user = User::wherePoniverseId($poniverseId)->first();
@@ -154,7 +154,7 @@ class AuthController extends Controller
         $user->{$updatedAttribute} = $newUserData->{$updatedAttribute};
         $user->save();
 
-        return \Response::json(['message' => 'Successfully updated this user!'], 200);
+        return response()->json(['message' => 'Successfully updated this user!'], 200);
     }
 
     protected function loginRedirect($user, $rememberMe = true)

app/Http/Controllers/TracksController.php

@@ -110,7 +110,7 @@ class TracksController extends Controller
             'html' => '<iframe src="'.action('TracksController@getEmbed', ['id' => $track->id]).'" width="100%" height="150" allowTransparency="true" frameborder="0" seamless allowfullscreen></iframe>',
         ];
 
-        return Response::json($output);
+        return response()->json($output);
     }
 
     public function getTrack($id, $slug)

app/Http/Middleware/JsonExceptions.php

@@ -40,7 +40,7 @@ class JsonExceptions
         try {
             $response = $next($request);
         } catch (HttpException $e) {
-            return \Response::json([
+            return response()->json([
                 'message' => $e->getMessage(),
             ], $e->getStatusCode());
         }