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 "rdbms: do not close the connection in LoadBalancerSingle::__destruct"
[lhc/web/wiklou.git]
/
maintenance
/
mwdocgen.php
diff --git
a/maintenance/mwdocgen.php
b/maintenance/mwdocgen.php
index
43041a4
..
791b360
100644
(file)
--- a/
maintenance/mwdocgen.php
+++ b/
maintenance/mwdocgen.php
@@
-33,6
+33,8
@@
* @version first release
*/
* @version first release
*/
+use MediaWiki\Shell\Shell;
+
require_once __DIR__ . '/Maintenance.php';
/**
require_once __DIR__ . '/Maintenance.php';
/**
@@
-88,7
+90,7
@@
class MWDocGen extends Maintenance {
// Do not use wfShellWikiCmd, because mwdoc-filter.php is not
// a Maintenance script.
// Do not use wfShellWikiCmd, because mwdoc-filter.php is not
// a Maintenance script.
- $this->inputFilter =
wfEscapeShellArg
( [
+ $this->inputFilter =
Shell::escape
( [
$wgPhpCli,
$IP . '/maintenance/mwdoc-filter.php'
] );
$wgPhpCli,
$IP . '/maintenance/mwdoc-filter.php'
] );
@@
-138,8
+140,7
@@
class MWDocGen extends Maintenance {
$tmpFile = tempnam( wfTempDir(), 'MWDocGen-' );
if ( file_put_contents( $tmpFile, $conf ) === false ) {
$tmpFile = tempnam( wfTempDir(), 'MWDocGen-' );
if ( file_put_contents( $tmpFile, $conf ) === false ) {
- $this->error( "Could not write doxygen configuration to file $tmpFile\n",
- /** exit code: */ 1 );
+ $this->fatalError( "Could not write doxygen configuration to file $tmpFile\n" );
}
$command = $this->doxygen . ' ' . $tmpFile;
}
$command = $this->doxygen . ' ' . $tmpFile;
@@
-161,11
+162,10
@@
TEXT
);
if ( $exitcode !== 0 ) {
);
if ( $exitcode !== 0 ) {
- $this->error( "Something went wrong (exit: $exitcode)\n",
- $exitcode );
+ $this->fatalError( "Something went wrong (exit: $exitcode)\n", $exitcode );
}
}
}
}
}
}
-$maintClass =
'MWDocGen'
;
+$maintClass =
MWDocGen::class
;
require_once RUN_MAINTENANCE_IF_MAIN;
require_once RUN_MAINTENANCE_IF_MAIN;