lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #9774 from uberbrady/snipeit_restore_php73

Browse source 
Better debugging output, and remove non-PHP-7.3-compatible option
This commit is contained in:
snipe 2021-06-30 15:22:48 -07:00 • committed by GitHub
commit 19994e2097
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Console/Commands/RestoreFromBackup.php
View file

@ -61,7 +61,7 @@ class RestoreFromBackup extends Command
$za = new ZipArchive(); $za = new ZipArchive();
$errcode = $za->open($filename, ZipArchive::RDONLY); $errcode = $za->open($filename/* , ZipArchive::RDONLY */); // that constant only exists in PHP 7.4 and higher
if ($errcode !== true) { if ($errcode !== true) {
$errors = [ $errors = [
ZipArchive::ER_EXISTS => "File already exists.", ZipArchive::ER_EXISTS => "File already exists.",
@ -248,8 +248,13 @@ class RestoreFromBackup extends Command
} }
fclose($pipes[0]); fclose($pipes[0]);
fclose($sql_contents); fclose($sql_contents);
$this->line(stream_get_contents($pipes[1]));
fclose($pipes[1]); fclose($pipes[1]);
$this->error(stream_get_contents($pipes[2]));
fclose($pipes[2]); fclose($pipes[2]);
//wait, have to do fclose() on all pipes first? //wait, have to do fclose() on all pipes first?
$close_results = proc_close($proc_results); $close_results = proc_close($proc_results);
if($close_results != 0) { if($close_results != 0) {