Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4512 from beganovich/v5-remove-trailing-slash-from-setup

Browse Source 
(v5) Remove trailing slash from URLs on setup
This commit is contained in:
Benjamin Beganović 2020-12-17 12:32:47 +01:00 committed by GitHub
commit 5ea07fde66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/SetupController.php
View File

@ -98,14 +98,8 @@ class SetupController extends Controller
$mail_driver = $request->input('mail_driver'); $mail_driver = $request->input('mail_driver');
$url = $request->input('url');
if (substr($url, -1) != '/') {
$url = $url . '/';
}
$env_values = [ $env_values = [
'APP_URL' => $url, 'APP_URL' => $request->input('url'),
'REQUIRE_HTTPS' => $request->input('https') ? 'true' : 'false', 'REQUIRE_HTTPS' => $request->input('https') ? 'true' : 'false',
'APP_DEBUG' => $request->input('debug') ? '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 * @param CheckDatabaseRequest $request
* @return Response * @return Application|ResponseFactory|JsonResponse|Response
*/ */
public function checkDB(CheckDatabaseRequest $request): Response public function checkDB(CheckDatabaseRequest $request)
{ {
try { try {
$status = SystemHealth::dbCheck($request); $status = SystemHealth::dbCheck($request);

14
composer.lock generated
View File

@ -5247,16 +5247,16 @@
}, },
{ {
"name": "phpseclib/phpseclib", "name": "phpseclib/phpseclib",
"version": "2.0.29", "version": "2.0.30",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpseclib/phpseclib.git", "url": "https://github.com/phpseclib/phpseclib.git",
"reference": "497856a8d997f640b4a516062f84228a772a48a8" "reference": "136b9ca7eebef78be14abf90d65c5e57b6bc5d36"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/497856a8d997f640b4a516062f84228a772a48a8", "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/136b9ca7eebef78be14abf90d65c5e57b6bc5d36",
"reference": "497856a8d997f640b4a516062f84228a772a48a8", "reference": "136b9ca7eebef78be14abf90d65c5e57b6bc5d36",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -5264,7 +5264,7 @@
}, },
"require-dev": { "require-dev": {
"phing/phing": "~2.7", "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" "squizlabs/php_codesniffer": "~2.0"
}, },
"suggest": { "suggest": {
@ -5336,7 +5336,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/phpseclib/phpseclib/issues", "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": [ "funding": [
{ {
@ -5352,7 +5352,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2020-09-08T04:24:43+00:00" "time": "2020-12-17T05:42:04+00:00"
}, },
{ {
"name": "predis/predis", "name": "predis/predis",