cmp167/cmp-php-util
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix warn

Browse Source
This commit is contained in:
cmp167
2023-09-06 03:11:28 +12:00
parent fe2e8b11a3
commit 8f803e6c06
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmpUtil.php
View File

@@ -411,7 +411,7 @@
break; break;
} }
if(!@$opt["silent"]) if(!isset($opt["silent"]) || !$opt["silent"])
$this->d("Call stdInEventAdd"); $this->d("Call stdInEventAdd");
($opt["stdInEventAdd"]["call"]) ( ($opt["stdInEventAdd"]["call"]) (
@@ -429,7 +429,7 @@
break; break;
} }
if(!@$opt["silent"]) if(!isset($opt["silent"]) || !$opt["silent"])
$this->d("Call stdOutEventAdd"); $this->d("Call stdOutEventAdd");
($opt["stdOutEventAdd" ]["call"]) ( ($opt["stdOutEventAdd" ]["call"]) (
@@ -447,7 +447,7 @@
break; break;
} }
if(!@$opt["silent"]) if(!isset($opt["silent"]) || !$opt["silent"])
$this->d("Call stdErrEventAdd"); $this->d("Call stdErrEventAdd");
($opt["stdErrEventAdd"]["call"]) ( ($opt["stdErrEventAdd"]["call"]) (
@@ -457,10 +457,10 @@
} while(0); } while(0);
do { do {
if(!@$opt["eventWait"]) if(!isset($opt["eventWait"]) || !$opt["eventWait"])
break; break;
if(!@$opt["silent"]) if(!isset($opt["silent"]) || !$opt["silent"])
$this->d("Call eventWait"); $this->d("Call eventWait");
if(!is_callable(@$opt["eventWait"]["call"])) { if(!is_callable(@$opt["eventWait"]["call"])) {
@@ -477,7 +477,7 @@
function cmpSysExec($cmaRaw, $opt = []) { function cmpSysExec($cmaRaw, $opt = []) {
$cmdStr = $this->cmpShellEsc($cmaRaw); $cmdStr = $this->cmpShellEsc($cmaRaw);
if(!@$opt["silent"]) { if(!isset($opt["silent"]) || !$opt["silent"]) {
$this->d("cmpSysExec: " . $cmdStr); $this->d("cmpSysExec: " . $cmdStr);
} }
@@ -489,7 +489,7 @@
$workDir = "/tmp"; $workDir = "/tmp";
if(@$opt["workDir"]) if(isset($opt["workDir"]) && $opt["workDir"])
$workDir = $opt["workDir"]; $workDir = $opt["workDir"];
$envAll = null; $envAll = null;
@@ -517,7 +517,7 @@
stream_set_blocking($ppsAll[1], 0); stream_set_blocking($ppsAll[1], 0);
stream_set_blocking($ppsAll[2], 0); stream_set_blocking($ppsAll[2], 0);
if(@$opt["stdin"]) { if(isset($opt["stdin"]) && $opt["stdin"]) {
fwrite($ppsAll[0], $opt["stdin"]); fwrite($ppsAll[0], $opt["stdin"]);
fclose($ppsAll[0]); fclose($ppsAll[0]);
} }
@@ -554,7 +554,7 @@
$retVal = proc_close($prcRes); $retVal = proc_close($prcRes);
if(!@$opt["return"] || @$opt["return"] == "full") { if(!isset($opt["return"]) || !$opt["return"] || $opt["return"] == "full") {
return array( return array(
"retval" => $retVal, "retval" => $retVal,
"stdout" => $out, "stdout" => $out,
@@ -569,7 +569,7 @@
if(!@$opt["noerror"]) { if(!@$opt["noerror"]) {
if($retVal !== $val) { if($retVal !== $val) {
if(!@$opt["silent"]) { if(!isset($opt["silent"]) || !$opt["silent"]) {
$this->d($err); $this->d($err);
$this->d("Return code: " . $retVal); $this->d("Return code: " . $retVal);
} }