Merge "Reset scoped session for upload jobs after deferred updates"

[lhc/web/wiklou.git] / includes / jobqueue / jobs / AssembleUploadChunksJob.php

diff --git a/includes/jobqueue/jobs/AssembleUploadChunksJob.php b/includes/jobqueue/jobs/AssembleUploadChunksJob.php
index 3699afe..bc2f7c4 100644 (file)
--- a/includes/jobqueue/jobs/AssembleUploadChunksJob.php
+++ b/includes/jobqueue/jobs/AssembleUploadChunksJob.php
@@ -51,7 +51,7 @@ class AssembleUploadChunksJob extends Job {
                        UploadBase::setSessionStatus(
                                $user,
                                $this->params['filekey'],
-                               array( 'result' => 'Poll', 'stage' => 'assembling', 'status' => Status::newGood() )
+                               [ 'result' => 'Poll', 'stage' => 'assembling', 'status' => Status::newGood() ]
                        );
 
                        $upload = new UploadFromChunks( $user );
@@ -67,7 +67,7 @@ class AssembleUploadChunksJob extends Job {
                                UploadBase::setSessionStatus(
                                        $user,
                                        $this->params['filekey'],
-                                       array( 'result' => 'Failure', 'stage' => 'assembling', 'status' => $status )
+                                       [ 'result' => 'Failure', 'stage' => 'assembling', 'status' => $status ]
                                );
                                $this->setLastError( $status->getWikiText() );
 
@@ -91,23 +91,23 @@ class AssembleUploadChunksJob extends Job {
                        UploadBase::setSessionStatus(
                                $user,
                                $this->params['filekey'],
-                               array(
+                               [
                                        'result' => 'Success',
                                        'stage' => 'assembling',
                                        'filekey' => $newFileKey,
                                        'imageinfo' => $imageInfo,
                                        'status' => Status::newGood()
-                               )
+                               ]
                        );
                } catch ( Exception $e ) {
                        UploadBase::setSessionStatus(
                                $user,
                                $this->params['filekey'],
-                               array(
+                               [
                                        'result' => 'Failure',
                                        'stage' => 'assembling',
                                        'status' => Status::newFatal( 'api-error-stashfailed' )
-                               )
+                               ]
                        );
                        $this->setLastError( get_class( $e ) . ": " . $e->getMessage() );
                        // To be extra robust.
@@ -122,7 +122,7 @@ class AssembleUploadChunksJob extends Job {
        public function getDeduplicationInfo() {
                $info = parent::getDeduplicationInfo();
                if ( is_array( $info['params'] ) ) {
-                       $info['params'] = array( 'filekey' => $info['params']['filekey'] );
+                       $info['params'] = [ 'filekey' => $info['params']['filekey'] ];
                }
 
                return $info;