mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-04 08:05:23 +00:00
Code Issues Projects Releases Wiki Activity

Add libsodium shim, and mark the sodium extension as 'optional'

Browse Source 
Trying to handle some composer.lock conflicts, as savely as possible.
This commit is contained in:
Brady Wetherington
2023-01-31 16:39:46 -08:00
parent df64e0e291
commit 3a2b54fd47
3 changed files with 95 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
upgrade.php
View File

@ -176,6 +176,10 @@ $required_exts_array =
'zip',
];
$recommended_exts_array =
[
'sodium', //note that extensions need to be in BOTH the $required_exts_array and this one to be 'optional'
];
$ext_missing = '';
$ext_installed = '';
@ -205,8 +209,10 @@ foreach ($required_exts_array as $required_ext) {
}
// If this isn't an either/or option, just add it to the string of errors conventionally
} else {
} elseif (!in_array($required_ext, $recommended_exts_array)){
$ext_missing .= '✘ MISSING PHP EXTENSION: '.$required_ext."\n";
} else {
$ext_installed .= '- '.$required_ext." is *NOT* installed, but is recommended...\n";
}
// The required extension string was found in the array of installed extensions - yay!