Skip to content

Commit 2b48de0

Browse files
author
Hedius
committed
PHP 7.3 fixes
1 parent f1236a6 commit 2b48de0

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

app/bfacp/Http/Controllers/HomeController.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,12 @@ public function scoreboard()
7070

7171
return $p;
7272
})->lists('display_name', 'name');
73-
73+
74+
// compact throws a warning if a value is undefined
75+
set_error_handler(function() { /* ignore errors */ });
7476
$adminview = View::make('partials.scoreboard.admin.admin',
7577
compact('validPermissions', 'presetMessages'))->render();
78+
restore_error_handler();
7679
} else {
7780
$adminview = null;
7881
}

app/config/app.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
*/
7575

7676
'key' => getenv('APP_KEY') ?: 'YourSecretKey!!!',
77-
'cipher' => MCRYPT_RIJNDAEL_256,
77+
'cipher' => 'AES-256-CBC',
7878
/*
7979
|--------------------------------------------------------------------------
8080
| Autoloaded Service Providers
@@ -96,7 +96,7 @@
9696
'Illuminate\Database\DatabaseServiceProvider',
9797
'Illuminate\Database\MigrationServiceProvider',
9898
'Illuminate\Database\SeedServiceProvider',
99-
'Illuminate\Encryption\EncryptionServiceProvider',
99+
'Tomgrohl\Laravel\Encryption\EncryptionServiceProvider',
100100
'Illuminate\Filesystem\FilesystemServiceProvider',
101101
'Illuminate\Foundation\Providers\ArtisanServiceProvider',
102102
'Illuminate\Foundation\Providers\ConsoleSupportServiceProvider',

bootstrap/start.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
$setupFilePath = $app['path.base'] . '/app/bfacp/setup.php';
7070
$jsBuildsPath = $app['path.public'] . '/js/builds';
7171

72-
if (version_compare(phpversion(), '5.5.0', '<') || !extension_loaded('mcrypt') || !extension_loaded('pdo')) {
72+
if (version_compare(phpversion(), '5.5.0', '<') || !extension_loaded('pdo')) {
7373
die(View::make('system.requirements', ['required_php_version' => '5.5.0']));
7474
}
7575

0 commit comments

Comments
 (0)