X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fshell%2FShellTest.php;h=bf46f44b0c674b74b6ad6307f732dbdf2c6bd919;hb=981e98179a48cdba456c7f108c00b4e3cab92265;hp=986a66560e901ffa46b71cf479274dc501324679;hpb=220bda9175a18458449e9d754fb48830c1f76f25;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/shell/ShellTest.php b/tests/phpunit/includes/shell/ShellTest.php
index 986a66560e..bf46f44b0c 100644
--- a/tests/phpunit/includes/shell/ShellTest.php
+++ b/tests/phpunit/includes/shell/ShellTest.php
@@ -1,12 +1,14 @@
 <?php
 
+use MediaWiki\Shell\Command;
 use MediaWiki\Shell\Shell;
+use Wikimedia\TestingAccessWrapper;
 
 /**
  * @covers \MediaWiki\Shell\Shell
  * @group Shell
  */
-class ShellTest extends PHPUnit_Framework_TestCase {
+class ShellTest extends MediaWikiTestCase {
 
 	use MediaWikiCoversValidator;
 
@@ -32,4 +34,72 @@ class ShellTest extends PHPUnit_Framework_TestCase {
 			'skip nulls' => [ [ 'ls', null ], "'ls'" ],
 		];
 	}
+
+	/**
+	 * @covers \MediaWiki\Shell\Shell::makeScriptCommand
+	 * @dataProvider provideMakeScriptCommand
+	 *
+	 * @param string $expected
+	 * @param string $script
+	 * @param string[] $parameters
+	 * @param string[] $options
+	 * @param callable|null $hook
+	 */
+	public function testMakeScriptCommand( $expected,
+										   $script,
+										   $parameters,
+										   $options = [],
+										   $hook = null
+	) {
+		// Running tests under Vagrant involves MWMultiVersion that uses the below hook
+		$this->setMwGlobals( 'wgHooks', [] );
+
+		if ( $hook ) {
+			$this->setTemporaryHook( 'wfShellWikiCmd', $hook );
+		}
+
+		$command = Shell::makeScriptCommand( $script, $parameters, $options );
+		$command->params( 'safe' )
+			->unsafeParams( 'unsafe' );
+
+		$this->assertType( Command::class, $command );
+
+		$wrapper = TestingAccessWrapper::newFromObject( $command );
+		$this->assertEquals( $expected, $wrapper->command );
+		$this->assertEquals( 0, $wrapper->restrictions & Shell::NO_LOCALSETTINGS );
+	}
+
+	public function provideMakeScriptCommand() {
+		global $wgPhpCli;
+
+		return [
+			[
+				"'$wgPhpCli' 'maintenance/foobar.php' 'bar'\\''\"baz' 'safe' unsafe",
+				'maintenance/foobar.php',
+				[ 'bar\'"baz' ],
+			],
+			[
+				"'$wgPhpCli' 'changed.php' '--wiki=somewiki' 'bar'\\''\"baz' 'safe' unsafe",
+				'maintenance/foobar.php',
+				[ 'bar\'"baz' ],
+				[],
+				function ( &$script, array &$parameters ) {
+					$script = 'changed.php';
+					array_unshift( $parameters, '--wiki=somewiki' );
+				}
+			],
+			[
+				"'/bin/perl' 'maintenance/foobar.php' 'bar'\\''\"baz' 'safe' unsafe",
+				'maintenance/foobar.php',
+				[ 'bar\'"baz' ],
+				[ 'php' => '/bin/perl' ],
+			],
+			[
+				"'$wgPhpCli' 'foobinize' 'maintenance/foobar.php' 'bar'\\''\"baz' 'safe' unsafe",
+				'maintenance/foobar.php',
+				[ 'bar\'"baz' ],
+				[ 'wrapper' => 'foobinize' ],
+			],
+		];
+	}
 }