From: Max Semenik <maxsem.wiki@gmail.com>
Date: Wed, 18 Oct 2017 01:54:17 +0000 (-0700)
Subject: Don't trigger PHP errors for unused Shell\Command
X-Git-Tag: 1.31.0-rc.0~1733
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=4d9a95f97005705ade05c71d4c1a64fd3844272c;p=lhc%2Fweb%2Fwiklou.git

Don't trigger PHP errors for unused Shell\Command

Change-Id: Id29da4f21a44ccb18d8a2ae11348d69ca3233aa5
---

diff --git a/includes/shell/Command.php b/includes/shell/Command.php
index 59f40bff26..a16f4af32f 100644
--- a/includes/shell/Command.php
+++ b/includes/shell/Command.php
@@ -83,12 +83,14 @@ class Command {
 	 */
 	public function __destruct() {
 		if ( !$this->everExecuted ) {
+			$context = [ 'command' => $this->command ];
 			$message = __CLASS__ . " was instantiated, but execute() was never called.";
 			if ( $this->method ) {
-				$message .= " Calling method: {$this->method}.";
+				$message .= ' Calling method: {method}.';
+				$context['method'] = $this->method;
 			}
-			$message .= " Command: {$this->command}";
-			trigger_error( $message, E_USER_NOTICE );
+			$message .= ' Command: {command}';
+			$this->logger->warning( $message, $context );
 		}
 	}
 
diff --git a/tests/phpunit/includes/shell/CommandTest.php b/tests/phpunit/includes/shell/CommandTest.php
index 34434b9aaf..32d855ea39 100644
--- a/tests/phpunit/includes/shell/CommandTest.php
+++ b/tests/phpunit/includes/shell/CommandTest.php
@@ -6,17 +6,6 @@ use MediaWiki\Shell\Command;
  * @group Shell
  */
 class CommandTest extends PHPUnit_Framework_TestCase {
-	/**
-	 * @expectedException PHPUnit_Framework_Error_Notice
-	 */
-	public function testDestruct() {
-		if ( defined( 'HHVM_VERSION' ) ) {
-			$this->markTestSkipped( 'destructors are unreliable in HHVM' );
-		}
-		$command = new Command();
-		$command->params( 'true' );
-	}
-
 	private function requirePosix() {
 		if ( wfIsWindows() ) {
 			$this->markTestSkipped( 'This test requires a POSIX environment.' );