IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix #4603

Browse Source
This commit is contained in:
James Cole
2021-04-05 12:42:34 +02:00
parent aba3b361be
commit fa0397e431
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Http/Controllers/System/InstallController.php
View File

@@ -36,6 +36,7 @@ use Illuminate\Support\Arr;
use Illuminate\View\View; use Illuminate\View\View;
use Laravel\Passport\Passport; use Laravel\Passport\Passport;
use Log; use Log;
use phpseclib\Crypt\RSA as LegacyRSA;
use phpseclib3\Crypt\RSA; use phpseclib3\Crypt\RSA;
/** /**
@@ -217,18 +218,18 @@ class InstallController extends Controller
public function keys(): void public function keys(): void
{ {
// switch on PHP version. // switch on PHP version.
$result = version_compare(phpversion(), '8.0');
Log::info(sprintf('PHP version is %s', $result)); // switch on class existence.
if (-1 === $result) { Log::info(sprintf('PHP version is %s', phpversion()));
Log::info('Will run PHP7 code.'); if (class_exists(LegacyRSA::class)) {
// PHP 7 // PHP 7
$rsa = new \phpseclib\Crypt\RSA; Log::info('Will run PHP7 code.');
$keys = $rsa->createKey(4096); $keys = (new LegacyRSA)->createKey(4096);
} }
if ($result >= 0) { if (!class_exists(LegacyRSA::class)) {
Log::info('Will run PHP8 code.');
// PHP 8 // PHP 8
Log::info('Will run PHP8 code.');
$keys = RSA::createKey(4096); $keys = RSA::createKey(4096);
} }