X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=blobdiff_plain;f=includes%2Fshell%2FShell.php;h=478a615039fc52c4f7880c08ad770b36c6c1241b;hb=b5cbb5ab3f084da72b12fbca770a3694d03931e9;hp=467e4ef9a9dc67b0ae050a4c6b0d840dd5c4ac68;hpb=8e744f6f482b80a806d43fb4ea2eded4c7fd517f;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/shell/Shell.php b/includes/shell/Shell.php index 467e4ef9a9..478a615039 100644 --- a/includes/shell/Shell.php +++ b/includes/shell/Shell.php @@ -116,7 +116,7 @@ class Shell { * Example: [ 'convert', '-font', 'font name' ] would produce "'convert' '-font' 'font name'" * @return Command */ - public static function command( ...$commands ) { + public static function command( ...$commands ): Command { if ( count( $commands ) === 1 && is_array( reset( $commands ) ) ) { // If only one argument has been passed, and that argument is an array, // treat it as a list of arguments @@ -230,9 +230,10 @@ class Shell { * @param array $options Associative array of options: * 'php': The path to the php executable * 'wrapper': Path to a PHP wrapper to handle the maintenance script + * @phan-param array{php?:string,wrapper?:string} $options * @return Command */ - public static function makeScriptCommand( $script, $parameters, $options = [] ) { + public static function makeScriptCommand( $script, $parameters, $options = [] ): Command { global $wgPhpCli; // Give site config file a chance to run the script in a wrapper. // The caller may likely want to call wfBasename() on $script.