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 1/2] 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);

From 0e6a20b9c9b68137ea23140a40d4e4d48423e70f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 17 Dec 2020 11:17:00 +0100
Subject: [PATCH 2/2] Update lock file

---
 composer.lock | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/composer.lock b/composer.lock
index 00adfea76b2a..e1022e8d84bd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -5247,16 +5247,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.29",
+            "version": "2.0.30",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "497856a8d997f640b4a516062f84228a772a48a8"
+                "reference": "136b9ca7eebef78be14abf90d65c5e57b6bc5d36"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/497856a8d997f640b4a516062f84228a772a48a8",
-                "reference": "497856a8d997f640b4a516062f84228a772a48a8",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/136b9ca7eebef78be14abf90d65c5e57b6bc5d36",
+                "reference": "136b9ca7eebef78be14abf90d65c5e57b6bc5d36",
                 "shasum": ""
             },
             "require": {
@@ -5264,7 +5264,7 @@
             },
             "require-dev": {
                 "phing/phing": "~2.7",
-                "phpunit/phpunit": "^4.8.35|^5.7|^6.0",
+                "phpunit/phpunit": "^4.8.35|^5.7|^6.0|^9.4",
                 "squizlabs/php_codesniffer": "~2.0"
             },
             "suggest": {
@@ -5336,7 +5336,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/2.0"
+                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.30"
             },
             "funding": [
                 {
@@ -5352,7 +5352,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-09-08T04:24:43+00:00"
+            "time": "2020-12-17T05:42:04+00:00"
         },
         {
             "name": "predis/predis",