From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 6 Oct 2015 20:50:04 +0000 (-0700)
Subject: Fix AssembleUploadChunksJob/PublishStashedFileJob IDEA errors
X-Git-Tag: 1.31.0-rc.0~9516^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=95ec2c32e68e79dca80100c6e3b24941ad8108e4

Fix AssembleUploadChunksJob/PublishStashedFileJob IDEA errors

* Use getMessage() on the Exception objects
* Use a dummy WebRequestUpload to pass to continueChunks()
  instead of an object of a completely wrong type

Change-Id: I01ec5c141a6f37ee425af3236d728b9128b98522
---

diff --git a/includes/jobqueue/jobs/AssembleUploadChunksJob.php b/includes/jobqueue/jobs/AssembleUploadChunksJob.php
index a1de77e63b..4de19bc5ae 100644
--- a/includes/jobqueue/jobs/AssembleUploadChunksJob.php
+++ b/includes/jobqueue/jobs/AssembleUploadChunksJob.php
@@ -33,6 +33,7 @@ class AssembleUploadChunksJob extends Job {
 	}
 
 	public function run() {
+		/** @noinspection PhpUnusedLocalVariableInspection */
 		$scope = RequestContext::importScopedSession( $this->params['session'] );
 		$context = RequestContext::getMain();
 		$user = $context->getUser();
@@ -53,7 +54,7 @@ class AssembleUploadChunksJob extends Job {
 			$upload->continueChunks(
 				$this->params['filename'],
 				$this->params['filekey'],
-				$context->getRequest()
+				new WebRequestUpload( $context->getRequest(), 'null' )
 			);
 
 			// Combine all of the chunks into a local file and upload that to a new stash file
@@ -104,7 +105,7 @@ class AssembleUploadChunksJob extends Job {
 					'status' => Status::newFatal( 'api-error-stashfailed' )
 				)
 			);
-			$this->setLastError( get_class( $e ) . ": " . $e->getText() );
+			$this->setLastError( get_class( $e ) . ": " . $e->getMessage() );
 			// To be extra robust.
 			MWExceptionHandler::rollbackMasterChangesAndLog( $e );
 
diff --git a/includes/jobqueue/jobs/PublishStashedFileJob.php b/includes/jobqueue/jobs/PublishStashedFileJob.php
index 8a180ec35c..59166e8035 100644
--- a/includes/jobqueue/jobs/PublishStashedFileJob.php
+++ b/includes/jobqueue/jobs/PublishStashedFileJob.php
@@ -35,6 +35,7 @@ class PublishStashedFileJob extends Job {
 	}
 
 	public function run() {
+		/** @noinspection PhpUnusedLocalVariableInspection */
 		$scope = RequestContext::importScopedSession( $this->params['session'] );
 		$context = RequestContext::getMain();
 		$user = $context->getUser();
@@ -120,7 +121,7 @@ class PublishStashedFileJob extends Job {
 					'status' => Status::newFatal( 'api-error-publishfailed' )
 				)
 			);
-			$this->setLastError( get_class( $e ) . ": " . $e->getText() );
+			$this->setLastError( get_class( $e ) . ": " . $e->getMessage() );
 			// To prevent potential database referential integrity issues.
 			// See bug 32551.
 			MWExceptionHandler::rollbackMasterChangesAndLog( $e );