dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Deprecate wfShellWikiCmd()
[lhc/web/wiklou.git]
/
includes
/
shell
/
Result.php
diff --git
a/includes/shell/Result.php
b/includes/shell/Result.php
index
c1429df
..
a105cd1
100644
(file)
--- a/
includes/shell/Result.php
+++ b/
includes/shell/Result.php
@@
-32,13
+32,18
@@
class Result {
/** @var string */
private $stdout;
/** @var string */
private $stdout;
+ /** @var string|null */
+ private $stderr;
+
/**
* @param int $exitCode
* @param string $stdout
/**
* @param int $exitCode
* @param string $stdout
+ * @param string|null $stderr
*/
*/
- public function __construct( $exitCode, $stdout ) {
+ public function __construct( $exitCode, $stdout
, $stderr = null
) {
$this->exitCode = $exitCode;
$this->stdout = $stdout;
$this->exitCode = $exitCode;
$this->stdout = $stdout;
+ $this->stderr = $stderr;
}
/**
}
/**
@@
-58,4
+63,14
@@
class Result {
public function getStdout() {
return $this->stdout;
}
public function getStdout() {
return $this->stdout;
}
+
+ /**
+ * Returns stderr of the process or null if the Command was configured to add stderr to stdout
+ * with includeStderr( true )
+ *
+ * @return string|null
+ */
+ public function getStderr() {
+ return $this->stderr;
+ }
}
}