From c78a03b095efe92458485da7fbcf13ae473fba6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 17 Dec 2020 11:10:47 +0100
Subject: [PATCH] Remove trailing slash from URLs on setup

---
 app/Http/Controllers/SetupController.php | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index 8f4f1e3ef711..bf8a3c18f2e9 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -98,14 +98,8 @@ class SetupController extends Controller
 
         $mail_driver = $request->input('mail_driver');
 
-        $url = $request->input('url');
-
-        if (substr($url, -1) != '/') {
-            $url = $url . '/';
-        }
-
         $env_values = [
-            'APP_URL' => $url,
+            'APP_URL' => $request->input('url'),
             'REQUIRE_HTTPS' => $request->input('https') ? 'true' : 'false',
             'APP_DEBUG' => $request->input('debug') ? 'true' : 'false',
 
@@ -165,12 +159,12 @@ class SetupController extends Controller
     }
 
     /**
-     * Return status based on check of database connection.
+     * Return status based on database check.
      *
      * @param CheckDatabaseRequest $request
-     * @return Response
+     * @return Application|ResponseFactory|JsonResponse|Response
      */
-    public function checkDB(CheckDatabaseRequest $request): Response
+    public function checkDB(CheckDatabaseRequest $request)
     {
         try {
             $status = SystemHealth::dbCheck($request);