mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-25 05:34:06 -08:00
Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
3d5b1b6c6d
|
@ -242,7 +242,7 @@ return [
|
|||
|
|
||||
*/
|
||||
|
||||
'min_php' => '7.4.0',
|
||||
'min_php' => '8.1.2',
|
||||
|
||||
|
||||
/*
|
||||
|
|
12
upgrade.php
12
upgrade.php
|
@ -59,8 +59,8 @@ echo "- clear out old cache settings\n\n";
|
|||
|
||||
// Fetching most current upgrade requirements from github. Read more here: https://github.com/snipe/snipe-it/pull/14127
|
||||
$remote_requirements_file = "https://raw.githubusercontent.com/snipe/snipe-it/$branch/.upgrade_requirements.json";
|
||||
$upgrade_requirements = json_decode(url_get_contents($remote_requirements_file), true);
|
||||
|
||||
$upgrade_requirements_raw = url_get_contents($remote_requirements_file);
|
||||
$upgrade_requirements = json_decode($upgrade_requirements_raw, true);
|
||||
if (! $upgrade_requirements) {
|
||||
if(!$skip_php_checks){
|
||||
echo "\nERROR: Failed to retrieve remote requirements from $remote_requirements_file\n\n";
|
||||
|
@ -68,6 +68,14 @@ if (! $upgrade_requirements) {
|
|||
echo "NOTE: You passed a custom branch: $branch\n";
|
||||
echo " If the above URL doesn't work, that may be why. Please check you branch spelling/extistance\n\n";
|
||||
}
|
||||
|
||||
if (json_last_error()) {
|
||||
print "JSON DECODE ERROR DETECTED:\n";
|
||||
print json_last_error_msg() . "\n\n";
|
||||
print "Raw curl output:\n";
|
||||
print $upgrade_requirements_raw . "\n\n";
|
||||
}
|
||||
|
||||
echo "We suggest correcting this, but if you can't, please verify that your requirements conform to those at that url.\n\n";
|
||||
echo " -- DANGER -- DO AT YOUR OWN RISK --\n";
|
||||
echo " IF YOU ARE SURE, re-run this script with --skip-php-compatibility-checks to skip this check.\n";
|
||||
|
|
Loading…
Reference in a new issue