X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fshell%2FCommand.php;h=20b94459cb93c3c462c438be85e0b432567e2f44;hb=0bb36bf5aaa72e3af0d7e47177895184f315fbb6;hp=1936d000fc42cb2dbd115479b8397fd510282dad;hpb=1404a1f6bf6065035e74c287951b1c2126f11e55;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/shell/Command.php b/includes/shell/Command.php
index 1936d000fc..20b94459cb 100644
--- 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 Wikimedia\AtEase\AtEase;
 
 /**
  * Class used for executing shell commands
@@ -111,11 +112,10 @@ class Command {
 	 * Adds parameters to the command. All parameters are sanitized via Shell::escape().
 	 * Null values are ignored.
 	 *
-	 * @param string|string[] $args,...
+	 * @param string|string[] ...$args
 	 * @return $this
 	 */
-	public function params( /* ... */ ) {
-		$args = func_get_args();
+	public function params( ...$args ): Command {
 		if ( count( $args ) === 1 && is_array( reset( $args ) ) ) {
 			// If only one argument has been passed, and that argument is an array,
 			// treat it as a list of arguments
@@ -130,11 +130,10 @@ class Command {
 	 * Adds unsafe parameters to the command. These parameters are NOT sanitized in any way.
 	 * Null values are ignored.
 	 *
-	 * @param string|string[] $args,...
+	 * @param string|string[] ...$args
 	 * @return $this
 	 */
-	public function unsafeParams( /* ... */ ) {
-		$args = func_get_args();
+	public function unsafeParams( ...$args ): Command {
 		if ( count( $args ) === 1 && is_array( reset( $args ) ) ) {
 			// If only one argument has been passed, and that argument is an array,
 			// treat it as a list of arguments
@@ -157,7 +156,7 @@ class Command {
 	 *   filesize (for ulimit -f), memory, time, walltime.
 	 * @return $this
 	 */
-	public function limits( array $limits ) {
+	public function limits( array $limits ): Command {
 		if ( !isset( $limits['walltime'] ) && isset( $limits['time'] ) ) {
 			// Emulate the behavior of old wfShellExec() where walltime fell back on time
 			// if the latter was overridden and the former wasn't
@@ -174,7 +173,7 @@ class Command {
 	 * @param string[] $env array of variable name => value
 	 * @return $this
 	 */
-	public function environment( array $env ) {
+	public function environment( array $env ): Command {
 		$this->env = $env;
 
 		return $this;
@@ -186,7 +185,7 @@ class Command {
 	 * @param string $method
 	 * @return $this
 	 */
-	public function profileMethod( $method ) {
+	public function profileMethod( $method ): Command {
 		$this->method = $method;
 
 		return $this;
@@ -198,7 +197,7 @@ class Command {
 	 * @param string|null $inputString
 	 * @return $this
 	 */
-	public function input( $inputString ) {
+	public function input( $inputString ): Command {
 		$this->inputString = is_null( $inputString ) ? null : (string)$inputString;
 
 		return $this;
@@ -211,7 +210,7 @@ class Command {
 	 * @param bool $yesno
 	 * @return $this
 	 */
-	public function includeStderr( $yesno = true ) {
+	public function includeStderr( $yesno = true ): Command {
 		$this->doIncludeStderr = $yesno;
 
 		return $this;
@@ -223,7 +222,7 @@ class Command {
 	 * @param bool $yesno
 	 * @return $this
 	 */
-	public function logStderr( $yesno = true ) {
+	public function logStderr( $yesno = true ): Command {
 		$this->doLogStderr = $yesno;
 
 		return $this;
@@ -235,7 +234,7 @@ class Command {
 	 * @param string|false $cgroup Absolute file path to the cgroup, or false to not use a cgroup
 	 * @return $this
 	 */
-	public function cgroup( $cgroup ) {
+	public function cgroup( $cgroup ): Command {
 		$this->cgroup = $cgroup;
 
 		return $this;
@@ -248,7 +247,7 @@ class Command {
 	 * @param int $restrictions
 	 * @return $this
 	 */
-	public function restrict( $restrictions ) {
+	public function restrict( $restrictions ): Command {
 		$this->restrictions |= $restrictions;
 
 		return $this;
@@ -275,7 +274,7 @@ class Command {
 	 *
 	 * @return $this
 	 */
-	public function whitelistPaths( array $paths ) {
+	public function whitelistPaths( array $paths ): Command {
 		// Default implementation is a no-op
 		return $this;
 	}
@@ -429,13 +428,13 @@ class Command {
 			}
 
 			// clear get_last_error without actually raising an error
-			// from https://secure.php.net/manual/en/function.error-get-last.php#113518
+			// from https://www.php.net/manual/en/function.error-get-last.php#113518
 			// TODO replace with clear_last_error when requirements are bumped to PHP7
 			set_error_handler( function () {
 			}, 0 );
-			\Wikimedia\suppressWarnings();
+			AtEase::suppressWarnings();
 			trigger_error( '' );
-			\Wikimedia\restoreWarnings();
+			AtEase::restoreWarnings();
 			restore_error_handler();
 
 			$readPipes = array_filter( $pipes, function ( $fd ) use ( $desc ) {