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
Merge "Selenium: replace UserLoginPage with BlankPage where possible"
[lhc/web/wiklou.git]
/
includes
/
shell
/
Command.php
diff --git
a/includes/shell/Command.php
b/includes/shell/Command.php
index
109097a
..
7742075
100644
(file)
--- a/
includes/shell/Command.php
+++ b/
includes/shell/Command.php
@@
-26,6
+26,7
@@
use MediaWiki\ShellDisabledError;
use Profiler;
use Psr\Log\LoggerAwareTrait;
use Psr\Log\NullLogger;
use Profiler;
use Psr\Log\LoggerAwareTrait;
use Psr\Log\NullLogger;
+use Wikimedia\AtEase\AtEase;
/**
* Class used for executing shell commands
/**
* Class used for executing shell commands
@@
-72,14
+73,14
@@
class Command {
private $cgroup = false;
/**
private $cgroup = false;
/**
- *
b
itfield with restrictions
+ *
B
itfield with restrictions
*
* @var int
*/
protected $restrictions = 0;
/**
*
* @var int
*/
protected $restrictions = 0;
/**
- *
Constructor.
Don't call directly, instead use Shell::command()
+ * Don't call directly, instead use Shell::command()
*
* @throws ShellDisabledError
*/
*
* @throws ShellDisabledError
*/
@@
-92,7
+93,7
@@
class Command {
}
/**
}
/**
- *
Destructor. Makes sur
e programmer didn't forget to execute the command after all
+ *
Makes sure th
e programmer didn't forget to execute the command after all
*/
public function __destruct() {
if ( !$this->everExecuted ) {
*/
public function __destruct() {
if ( !$this->everExecuted ) {
@@
-431,9
+432,9
@@
class Command {
// TODO replace with clear_last_error when requirements are bumped to PHP7
set_error_handler( function () {
}, 0 );
// TODO replace with clear_last_error when requirements are bumped to PHP7
set_error_handler( function () {
}, 0 );
-
\Wikimedia\
suppressWarnings();
+
AtEase::
suppressWarnings();
trigger_error( '' );
trigger_error( '' );
-
\Wikimedia\
restoreWarnings();
+
AtEase::
restoreWarnings();
restore_error_handler();
$readPipes = array_filter( $pipes, function ( $fd ) use ( $desc ) {
restore_error_handler();
$readPipes = array_filter( $pipes, function ( $fd ) use ( $desc ) {