From c3bbadcc8315eb3ff26bf07243a4989f8ec260be Mon Sep 17 00:00:00 2001
From: Kunal Mehta <legoktm@member.fsf.org>
Date: Tue, 17 Oct 2017 21:49:46 -0700
Subject: [PATCH 1/1] Shell\Command: Move code that builds final shell command
 into separate method

Change-Id: I6aae209fd0b20057b5f7f7129db92c184ec945f8
---
 includes/shell/Command.php | 57 +++++++++++++++++++++++---------------
 1 file changed, 35 insertions(+), 22 deletions(-)

diff --git a/includes/shell/Command.php b/includes/shell/Command.php
index bd44ef8937..1816c5aed1 100644
--- a/includes/shell/Command.php
+++ b/includes/shell/Command.php
@@ -198,19 +198,12 @@ class Command {
 	}
 
 	/**
-	 * Executes command. Afterwards, getExitCode() and getOutput() can be used to access execution
-	 * results.
+	 * String together all the options and build the final command
+	 * to execute
 	 *
-	 * @return Result
-	 * @throws Exception
-	 * @throws ProcOpenError
-	 * @throws ShellDisabledError
+	 * @return array [ command, whether to use log pipe ]
 	 */
-	public function execute() {
-		$this->everExecuted = true;
-
-		$profileMethod = $this->method ?: wfGetCaller();
-
+	protected function buildFinalCommand() {
 		$envcmd = '';
 		foreach ( $this->env as $k => $v ) {
 			if ( wfIsWindows() ) {
@@ -229,9 +222,9 @@ class Command {
 			}
 		}
 
+		$useLogPipe = false;
 		$cmd = $envcmd . trim( $this->command );
 
-		$useLogPipe = false;
 		if ( is_executable( '/bin/bash' ) ) {
 			$time = intval( $this->limits['time'] );
 			$wallTime = intval( $this->limits['walltime'] );
@@ -240,22 +233,42 @@ class Command {
 
 			if ( $time > 0 || $mem > 0 || $filesize > 0 || $wallTime > 0 ) {
 				$cmd = '/bin/bash ' . escapeshellarg( __DIR__ . '/limit.sh' ) . ' ' .
-					   escapeshellarg( $cmd ) . ' ' .
-					   escapeshellarg(
-						   "MW_INCLUDE_STDERR=" . ( $this->useStderr ? '1' : '' ) . ';' .
-						   "MW_CPU_LIMIT=$time; " .
-						   'MW_CGROUP=' . escapeshellarg( $this->cgroup ) . '; ' .
-						   "MW_MEM_LIMIT=$mem; " .
-						   "MW_FILE_SIZE_LIMIT=$filesize; " .
-						   "MW_WALL_CLOCK_LIMIT=$wallTime; " .
-						   "MW_USE_LOG_PIPE=yes"
-					   );
+					escapeshellarg( $cmd ) . ' ' .
+					escapeshellarg(
+						"MW_INCLUDE_STDERR=" . ( $this->useStderr ? '1' : '' ) . ';' .
+						"MW_CPU_LIMIT=$time; " .
+						'MW_CGROUP=' . escapeshellarg( $this->cgroup ) . '; ' .
+						"MW_MEM_LIMIT=$mem; " .
+						"MW_FILE_SIZE_LIMIT=$filesize; " .
+						"MW_WALL_CLOCK_LIMIT=$wallTime; " .
+						"MW_USE_LOG_PIPE=yes"
+					);
 				$useLogPipe = true;
 			}
 		}
 		if ( !$useLogPipe && $this->useStderr ) {
 			$cmd .= ' 2>&1';
 		}
+
+		return [ $cmd, $useLogPipe ];
+	}
+
+	/**
+	 * Executes command. Afterwards, getExitCode() and getOutput() can be used to access execution
+	 * results.
+	 *
+	 * @return Result
+	 * @throws Exception
+	 * @throws ProcOpenError
+	 * @throws ShellDisabledError
+	 */
+	public function execute() {
+		$this->everExecuted = true;
+
+		$profileMethod = $this->method ?: wfGetCaller();
+
+		list( $cmd, $useLogPipe ) = $this->buildFinalCommand();
+
 		$this->logger->debug( __METHOD__ . ": $cmd" );
 
 		// Don't try to execute commands that exceed Linux's MAX_ARG_STRLEN.
-- 
2.20.1