Use dedicated controllers for route closures

This way we can use route caching.

Author: driesvints

app/Http/Controllers/Admin/OverviewController.php

@@ -0,0 +1,15 @@
+<?php
+namespace Lio\Http\Controllers\Admin;
+
+use Lio\Http\Controllers\Controller;
+
+class OverviewController extends Controller
+{
+    /**
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function overview()
+    {
+        return redirect()->route('admin.users');
+    }
+}

app/Http/Controllers/HomeController.php

@@ -0,0 +1,29 @@
+<?php
+namespace Lio\Http\Controllers;
+
+class HomeController extends Controller
+{
+    /**
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function index()
+    {
+        return redirect()->action('Forum\ForumThreadsController@getIndex');
+    }
+
+    /**
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function rss()
+    {
+        return redirect()->home();
+    }
+
+    /**
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function redirectToMainWebsite()
+    {
+        return redirect('http://laravel.io/');
+    }
+}

app/Http/routes.php

@@ -1,27 +1,18 @@
 <?php
 
+// Home
 Route::group(['domain' => 'wiki.laravel.io'], function() {
-    Route::get('{wildcard}', function($wildcard) {
-        return Redirect::to('http://laravel.io/');
-    });
+    Route::get('{wildcard}', 'HomeController@redirectToMainWebsite');
 });
 Route::group(['domain' => 'forum.laravel.io'], function() {
-    Route::get('{wildcard}', function($wildcard) {
-        return Redirect::to('http://laravel.io/');
-    });
+    Route::get('{wildcard}', 'HomeController@redirectToMainWebsite');
 });
 Route::group(['domain' => 'forums.laravel.io'], function() {
-    Route::get('{wildcard}', function($wildcard) {
-        return Redirect::to('http://laravel.io/');
-    });
+    Route::get('{wildcard}', 'HomeController@redirectToMainWebsite');
 });
 
-Route::get('/', ['as' => 'home', 'uses' => function () {
-    return redirect()->action('Forum\ForumThreadsController@getIndex');
-}]);
-Route::get('rss', function () {
-    return redirect()->home();
-});
+Route::get('/', ['as' => 'home', 'uses' => 'HomeController@index']);
+Route::get('rss', 'HomeController@rss');
 
 // Auth
 Route::group(['namespace' => 'Auth'], function () {
@@ -33,31 +24,22 @@
 
     Route::get('confirm-email/{confirmation_code}', ['as' => 'auth.confirm', 'uses' => 'AuthController@confirmEmail']);
     Route::get('resend-email-confirmation', ['as' => 'auth.reconfirm', 'uses' => 'AuthController@resendEmailConfirmation']);
-
-    // Keep to maintain backwards compatibility with sent emails.
-    Route::get('signup/confirm-email/{confirmation_code}', function ($code) {
-        return redirect()->route('auth.confirm', $code);
-    });
 });
 
-// user profile
-Route::get('user/{userSlug}', ['as' => 'user', 'uses' => 'UsersController@getProfile']);
-Route::get('user/{userSlug}/threads', 'UsersController@getThreads');
-Route::get('user/{userSlug}/replies', 'UsersController@getReplies');
+// Users
+Route::get('user/{username}', ['as' => 'user', 'uses' => 'UsersController@getProfile']);
+Route::get('user/{username}/threads', 'UsersController@getThreads');
+Route::get('user/{username}/replies', 'UsersController@getReplies');
 
 Route::group(['middleware' => 'auth'], function () {
-    Route::get('user/{userSlug}/settings', ['as' => 'user.settings', 'uses' => 'UsersController@getSettings']);
-    Route::put('user/{userSlug}/settings', ['as' => 'user.settings.update', 'uses' => 'UsersController@putSettings']);
+    Route::get('user/{username}/settings', ['as' => 'user.settings', 'uses' => 'UsersController@getSettings']);
+    Route::put('user/{username}/settings', ['as' => 'user.settings.update', 'uses' => 'UsersController@putSettings']);
 });
 
-// chat
+// Chat
 Route::get('chat', 'ChatController@getIndex');
-// chat legacy
-Route::get('irc', function() {
-    return Redirect::action('ChatController@getIndex');
-});
 
-// paste bin
+// Paste Bin
 Route::get('bin', 'PastesController@getCreate');
 Route::get('bin/fork/{hash}', 'PastesController@getFork');
 Route::get('bin/{hash}/raw', 'PastesController@getRaw');
@@ -68,24 +50,24 @@
     Route::post('bin/fork/{hash}', 'PastesController@postFork');
 });
 
-// forum
+// Forum
 Route::group(['namespace' => 'Forum'], function() {
     Route::group(['middleware' => ['auth', 'confirmed']], function() {
         Route::get('forum/create-thread', 'ForumThreadsController@getCreateThread');
         Route::post('forum/create-thread', 'ForumThreadsController@postCreateThread');
 
-        Route::get('forum/mark-as-solved/{threadId}/{replyId}', 'ForumThreadsController@getMarkQuestionSolved');
-        Route::get('forum/mark-as-unsolved/{threadId}', 'ForumThreadsController@getMarkQuestionUnsolved');
+        Route::get('forum/mark-as-solved/{thread}/{reply}', 'ForumThreadsController@getMarkQuestionSolved');
+        Route::get('forum/mark-as-unsolved/{thread}', 'ForumThreadsController@getMarkQuestionUnsolved');
 
-        Route::get('forum/edit-thread/{threadId}', 'ForumThreadsController@getEditThread');
-        Route::post('forum/edit-thread/{threadId}', 'ForumThreadsController@postEditThread');
-        Route::get('forum/edit-reply/{replyId}', 'ForumRepliesController@getEditReply');
-        Route::post('forum/edit-reply/{replyId}', 'ForumRepliesController@postEditReply');
+        Route::get('forum/edit-thread/{thread}', 'ForumThreadsController@getEditThread');
+        Route::post('forum/edit-thread/{thread}', 'ForumThreadsController@postEditThread');
+        Route::get('forum/edit-reply/{reply}', 'ForumRepliesController@getEditReply');
+        Route::post('forum/edit-reply/{reply}', 'ForumRepliesController@postEditReply');
 
-        Route::get('forum/delete/reply/{replyId}', 'ForumRepliesController@getDelete');
-        Route::post('forum/delete/reply/{replyId}', 'ForumRepliesController@postDelete');
-        Route::get('forum/delete/thread/{threadId}', 'ForumThreadsController@getDelete');
-        Route::post('forum/delete/thread/{threadId}', 'ForumThreadsController@postDelete');
+        Route::get('forum/delete/reply/{reply}', 'ForumRepliesController@getDelete');
+        Route::post('forum/delete/reply/{reply}', 'ForumRepliesController@postDelete');
+        Route::get('forum/delete/thread/{thread}', 'ForumThreadsController@getDelete');
+        Route::post('forum/delete/thread/{thread}', 'ForumThreadsController@postDelete');
 
         Route::post('forum/{slug}', 'ForumRepliesController@postCreateReply');
     });
@@ -98,11 +80,9 @@
     Route::get('forum/{slug}', 'ForumThreadsController@getShowThread');
 });
 
-// admin
+// Admin
 Route::group(['middleware' => ['auth', 'confirmed'], 'before' => 'has_role:manage_users', 'prefix' => 'admin', 'namespace' => 'Admin'], function() {
-    Route::get('/', function() {
-        return redirect()->route('admin.users');
-    });
+    Route::get('/', 'OverviewController@overview');
 
     Route::get('users', ['as' => 'admin.users', 'uses' => 'UsersController@getIndex']);
     Route::get('users/search', ['as' => 'admin.users.search', 'uses' => 'UsersController@search']);