Always instantiate transformers directly

app/Events/NewPrivateNotificationEvent.php

@@ -6,6 +6,7 @@
 namespace App\Events;
 
 use App\Models\Notification;
+use App\Transformers\NotificationTransformer;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Queue\SerializesModels;
 
@@ -45,7 +46,7 @@ public function broadcastOn()
 
     public function broadcastWith()
     {
-        return json_item($this->notification, 'Notification');
+        return json_item($this->notification, new NotificationTransformer());
     }
 
     public function getReceiverIds()

app/Http/Controllers/AccountController.php

@@ -20,8 +20,10 @@
 use App\Models\UserNotificationOption;
 use App\Models\UserProfileCustomization;
 use App\Transformers\CurrentUserTransformer;
+use App\Transformers\GithubUserTransformer;
 use App\Transformers\LegacyApiKeyTransformer;
 use App\Transformers\LegacyIrcKeyTransformer;
+use App\Transformers\OAuth\ClientTransformer;
 use Auth;
 use DB;
 use Mail;
@@ -111,8 +113,8 @@ public function edit()
         $sessions = SessionStore::sessions($user->getKey());
         $currentSessionId = \Session::getId();
 
-        $authorizedClients = json_collection(Client::forUser($user), 'OAuth\Client', 'user');
-        $ownClients = json_collection($user->oauthClients()->where('revoked', false)->get(), 'OAuth\Client', ['redirect', 'secret']);
+        $authorizedClients = json_collection(Client::forUser($user), new ClientTransformer(), 'user');
+        $ownClients = json_collection($user->oauthClients()->where('revoked', false)->get(), new ClientTransformer(), ['redirect', 'secret']);
 
         $legacyApiKey = $user->apiKeys()->available()->first();
         $legacyApiKeyJson = $legacyApiKey === null ? null : json_item($legacyApiKey, new LegacyApiKeyTransformer());
@@ -123,7 +125,7 @@ public function edit()
         $notificationOptions = $user->notificationOptions->keyBy('name');
 
         $githubUser = GithubUser::canAuthenticate() && $user->githubUser !== null
-            ? json_item($user->githubUser, 'GithubUser')
+            ? json_item($user->githubUser, new GithubUserTransformer())
             : null;
 
         return ext_view('accounts.edit', compact(

app/Http/Controllers/Admin/ContestsController.php

@@ -9,6 +9,7 @@
 use App\Models\ContestJudgeVote;
 use App\Models\DeletedUser;
 use App\Models\UserContestEntry;
+use App\Transformers\UserContestEntryTransformer;
 use ZipStream\ZipStream;
 
 class ContestsController extends Controller
@@ -50,7 +51,7 @@ public function show($id)
 
         return ext_view('admin.contests.show', [
             'contest' => $contest,
-            'entries' => json_collection($entries, 'UserContestEntry', ['user']),
+            'entries' => json_collection($entries, new UserContestEntryTransformer(), ['user']),
             'judgeVoteCounts' => $judgeVoteCounts ?? null,
         ]);
     }

app/Http/Controllers/ChangelogController.php

@@ -10,6 +10,8 @@
 use App\Models\Build;
 use App\Models\BuildPropagationHistory;
 use App\Models\UpdateStream;
+use App\Transformers\BuildHistoryChartTransformer;
+use App\Transformers\BuildTransformer;
 use App\Transformers\UpdateStreamTransformer;
 use Cache;
 
@@ -180,7 +182,7 @@ public function index()
             'changelog_entries.github_user',
             ...static::changelogEntryMessageIncludes($params['message_formats']),
         ];
-        $buildsJson = json_collection($builds, 'Build', $buildJsonIncludes);
+        $buildsJson = json_collection($builds, new BuildTransformer(), $buildJsonIncludes);
 
         $indexJson = [
             'streams' => $updateStreams,
@@ -390,7 +392,7 @@ function () use ($build) {
 
     private function buildJson(Build $build): array
     {
-        return json_item($build, 'Build', [
+        return json_item($build, new BuildTransformer(), [
             'changelog_entries',
             'changelog_entries.github_user',
             ...static::changelogEntryMessageIncludes(get_arr(request('message_formats'))),
@@ -438,7 +440,7 @@ private function chartConfig($stream)
         }
 
         return [
-            'build_history' => json_collection($history, 'BuildHistoryChart'),
+            'build_history' => json_collection($history, new BuildHistoryChartTransformer()),
             'order' => $chartOrder,
             'stream_name' => $streamName ?? null,
             'streams' => $streams ?? null,

app/Http/Controllers/ChatController.php

@@ -11,6 +11,7 @@
 use App\Models\Chat\Message;
 use App\Models\User;
 use App\Transformers\Chat\ChannelTransformer;
+use App\Transformers\UserCompactTransformer;
 
 class ChatController extends Controller
 {
@@ -47,7 +48,7 @@ public function index()
                 $sendToJson = [
                     'can_message_error' => ($channel?->checkCanMessage($user) ?? priv_check('ChatPmStart', $targetUser))->message(),
                     'channel_id' => $channel?->getKey(),
-                    'target' => json_item($targetUser, 'UserCompact'),
+                    'target' => json_item($targetUser, new UserCompactTransformer()),
                 ];
             }
         } elseif ($params['channel_id'] !== null) {

app/Http/Controllers/EventsController.php

@@ -8,6 +8,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\Event;
+use App\Transformers\EventTransformer;
 
 /**
  * @group Events
@@ -63,7 +64,7 @@ public function index()
             ->getWithHasMore();
 
         return [
-            'events' => json_collection($events, 'Event'),
+            'events' => json_collection($events, new EventTransformer()),
             ...cursor_for_response($cursorHelper->next($events, $hasMore)),
         ];
     }

app/Http/Controllers/Forum/PostsController.php

@@ -7,6 +7,7 @@
 
 use App\Exceptions\ModelNotSavedException;
 use App\Models\Forum\Post;
+use App\Transformers\Forum\PostTransformer;
 use Auth;
 use DB;
 use Request;
@@ -129,7 +130,7 @@ public function update($id)
         $post->refresh();
 
         if (is_api_request()) {
-            return json_item($post, 'Forum\Post', ['body']);
+            return json_item($post, new PostTransformer(), ['body']);
         }
 
         return ext_view('forum.topics._posts', [

app/Http/Controllers/Forum/TopicsController.php

@@ -493,9 +493,9 @@ public function show($id)
 
         if ($isJsonRequest) {
             return array_merge([
-                'posts' => json_collection($posts, 'Forum\Post', ['body']),
+                'posts' => json_collection($posts, new PostTransformer(), ['body']),
                 'search' => ['limit' => $params['limit'], 'sort' => $cursorHelper->getSortName()],
-                'topic' => json_item($topic, 'Forum\Topic'),
+                'topic' => json_item($topic, new TopicTransformer()),
             ], cursor_for_response($nextCursor));
         }
 

app/Http/Controllers/GroupHistoryController.php

@@ -10,6 +10,8 @@
 use App\Models\Group;
 use App\Models\User;
 use App\Models\UserGroupEvent;
+use App\Transformers\GroupTransformer;
+use App\Transformers\UserGroupEventTransformer;
 
 class GroupHistoryController extends Controller
 {
@@ -69,8 +71,8 @@ public function index()
         );
         $json = [
             ...cursor_for_response($cursorHelper->next($events, $hasMore)),
-            'events' => json_collection($events, 'UserGroupEvent'),
-            'groups' => json_collection($groups, 'Group'),
+            'events' => json_collection($events, new UserGroupEventTransformer()),
+            'groups' => json_collection($groups, new GroupTransformer()),
             'params' => $params,
         ];
 

app/Http/Controllers/GroupsController.php

@@ -5,6 +5,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Transformers\GroupTransformer;
 use App\Transformers\UserCompactTransformer;
 
 class GroupsController extends Controller
@@ -21,7 +22,7 @@ public function show($id)
             ->orderBy('username', 'asc')
             ->get();
 
-        $groupJson = json_item($group, 'Group', ['description']);
+        $groupJson = json_item($group, new GroupTransformer(), ['description']);
         $usersJson = json_collection(
             $users,
             (new UserCompactTransformer())->setMode($currentMode),

app/Http/Controllers/HomeController.php

@@ -19,6 +19,7 @@
 use App\Models\NewsPost;
 use App\Models\UserDonation;
 use App\Transformers\MenuImageTransformer;
+use App\Transformers\NewsPostTransformer;
 use Auth;
 use Carbon\CarbonImmutable;
 use DeviceDetector\DeviceDetector;
@@ -146,7 +147,7 @@ public function index()
                 'featuredStream',
             ));
         } else {
-            $news = json_collection($news, 'NewsPost');
+            $news = json_collection($news, new NewsPostTransformer());
 
             return ext_view('home.landing', ['stats' => new CurrentStats(), 'news' => $news]);
         }

app/Http/Controllers/LegacyMatchesController.php

@@ -8,6 +8,7 @@
 use App\Models\LegacyMatch\LegacyMatch;
 use App\Models\User;
 use App\Transformers\LegacyMatch\EventTransformer;
+use App\Transformers\LegacyMatch\LegacyMatchTransformer;
 use App\Transformers\UserCompactTransformer;
 
 /**
@@ -81,7 +82,7 @@ public function index()
             ->getWithHasMore();
 
         return [
-            'matches' => json_collection($matches, 'LegacyMatch\LegacyMatch'),
+            'matches' => json_collection($matches, new LegacyMatchTransformer()),
             'params' => [
                 'limit' => $limit,
                 'sort' => $cursorHelper->getSortName(),
@@ -214,7 +215,7 @@ private function eventsJson($params)
             ->first();
 
         return [
-            'match' => json_item($match, 'LegacyMatch\LegacyMatch'),
+            'match' => json_item($match, new LegacyMatchTransformer()),
             'events' => $events,
             'users' => $users,
             'first_event_id' => $eventEndIds->first_event_id ?? 0,

app/Http/Controllers/Multiplayer/RoomsController.php

@@ -18,6 +18,7 @@
 use App\Transformers\Multiplayer\PlaylistItemTransformer;
 use App\Transformers\Multiplayer\RealtimeRoomEventTransformer;
 use App\Transformers\Multiplayer\RoomTransformer;
+use App\Transformers\Multiplayer\UserScoreAggregateTransformer;
 use App\Transformers\UserCompactTransformer;
 use Ds\Map;
 use Ds\Set;
@@ -220,12 +221,12 @@ public function leaderboard($roomId)
         return [
             'leaderboard' => json_collection(
                 $room->topScores()->paginate($limit),
-                'Multiplayer\UserScoreAggregate',
+                new UserScoreAggregateTransformer(),
                 ['user.country', 'user.cover', 'user.team']
             ),
             'user_score' => $userScore !== null ? json_item(
                 $userScore,
-                'Multiplayer\UserScoreAggregate',
+                new UserScoreAggregateTransformer(),
                 ['position', 'user.country', 'user.cover', 'user.team']
             ) : null,
         ];

app/Http/Controllers/NewsController.php

@@ -7,6 +7,7 @@
 
 use App\Libraries\CommentBundle;
 use App\Models\NewsPost;
+use App\Transformers\NewsPostTransformer;
 
 /**
  * @group News
@@ -94,7 +95,7 @@ public function index()
         }
 
         $postsJson = [
-            'news_posts' => json_collection($posts, 'NewsPost', ['preview']),
+            'news_posts' => json_collection($posts, new NewsPostTransformer(), ['preview']),
             'news_sidebar' => $this->sidebarMeta($posts[0] ?? null),
             'search' => $search['params'],
             ...cursor_for_response($search['cursorHelper']->next($posts, $hasMore)),
@@ -188,7 +189,7 @@ public function show($slug)
             abort(404);
         }
 
-        $postJson = json_item($post, 'NewsPost', ['content', 'navigation']);
+        $postJson = json_item($post, new NewsPostTransformer(), ['content', 'navigation']);
 
         if (is_json_request()) {
             return $postJson;
@@ -246,7 +247,7 @@ function () use ($currentYear) {
 
                 return [
                     'current_year' => $currentYear,
-                    'news_posts' => json_collection($posts, 'NewsPost'),
+                    'news_posts' => json_collection($posts, new NewsPostTransformer()),
                     'years' => $years,
                 ];
             }

app/Http/Controllers/OAuth/ClientsController.php

@@ -7,6 +7,7 @@
 
 use App\Http\Controllers\Controller;
 use App\Models\OAuth\Client;
+use App\Transformers\OAuth\ClientTransformer;
 
 class ClientsController extends Controller
 {
@@ -28,7 +29,7 @@ public function destroy($clientId)
 
     public function index()
     {
-        return json_collection(auth()->user()->oauthClients()->where('revoked', false)->get(), 'OAuth\Client', ['redirect', 'secret']);
+        return json_collection(auth()->user()->oauthClients()->where('revoked', false)->get(), new ClientTransformer(), ['redirect', 'secret']);
     }
 
     public function resetSecret($clientId)
@@ -39,7 +40,7 @@ public function resetSecret($clientId)
             return error_popup(osu_trans('oauth.client.reset_failed'));
         }
 
-        return json_item($client, 'OAuth\Client', ['redirect', 'secret']);
+        return json_item($client, new ClientTransformer(), ['redirect', 'secret']);
     }
 
     public function store()
@@ -66,7 +67,7 @@ public function store()
             ], 422);
         }
 
-        return json_item($client, 'OAuth\Client', ['redirect', 'secret']);
+        return json_item($client, new ClientTransformer(), ['redirect', 'secret']);
     }
 
     public function update($clientId)
@@ -82,6 +83,6 @@ public function update($clientId)
             ], 422);
         }
 
-        return json_item($client, 'OAuth\Client', ['redirect', 'secret']);
+        return json_item($client, new ClientTransformer(), ['redirect', 'secret']);
     }
 }

app/Http/Controllers/SeasonalBackgroundsController.php

@@ -6,6 +6,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\Contest;
+use App\Transformers\SeasonalBackgroundTransformer;
 use Carbon\Carbon;
 use stdClass;
 
@@ -24,7 +25,7 @@ public function index()
         return [
             'ends_at' => json_time(Carbon::parse($GLOBALS['cfg']['osu']['seasonal']['ends_at'])),
 
-            'backgrounds' => json_collection($backgrounds, 'SeasonalBackground'),
+            'backgrounds' => json_collection($backgrounds, new SeasonalBackgroundTransformer()),
         ];
     }
 }

app/Http/Controllers/SpotlightsController.php

@@ -6,6 +6,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\Spotlight;
+use App\Transformers\SpotlightTransformer;
 
 /**
  * @group Ranking
@@ -33,7 +34,7 @@ public function __construct()
     public function index()
     {
         return [
-            'spotlights' => json_collection(Spotlight::orderBy('chart_id', 'desc')->get(), 'Spotlight'),
+            'spotlights' => json_collection(Spotlight::orderBy('chart_id', 'desc')->get(), new SpotlightTransformer()),
         ];
     }
 }