Merge "Fix 'Tags' padding to keep it farther from the edge and document the source...

[lhc/web/wiklou.git] / includes / upload / UploadFromChunks.php

diff --git a/includes/upload/UploadFromChunks.php b/includes/upload/UploadFromChunks.php
index 3dabc0d..ee6f250 100644 (file)
--- a/includes/upload/UploadFromChunks.php
+++ b/includes/upload/UploadFromChunks.php
@@ -64,7 +64,7 @@ class UploadFromChunks extends UploadFromFile {
        }
 
        /**
-        * {@inheritdoc}
+        * @inheritDoc
         */
        public function tryStashFile( User $user, $isPartial = false ) {
                try {
@@ -77,7 +77,7 @@ class UploadFromChunks extends UploadFromFile {
        }
 
        /**
-        * {@inheritdoc}
+        * @inheritDoc
         * @throws UploadChunkVerificationException
         * @deprecated since 1.28 Use tryStashFile() instead
         */
@@ -88,7 +88,7 @@ class UploadFromChunks extends UploadFromFile {
        }
 
        /**
-        * {@inheritdoc}
+        * @inheritDoc
         * @throws UploadChunkVerificationException
         * @deprecated since 1.28
         */
@@ -99,7 +99,7 @@ class UploadFromChunks extends UploadFromFile {
        }
 
        /**
-        * {@inheritdoc}
+        * @inheritDoc
         * @throws UploadChunkVerificationException
         * @deprecated since 1.28
         */
@@ -158,7 +158,7 @@ class UploadFromChunks extends UploadFromFile {
 
        /**
         * Append the final chunk and ready file for parent::performUpload()
-        * @return FileRepoStatus
+        * @return Status
         */
        public function concatenateChunks() {
                $chunkIndex = $this->getChunkIndex();
@@ -210,7 +210,7 @@ class UploadFromChunks extends UploadFromFile {
                // override doStashFile() with completely different functionality in this class...
                $error = $this->runUploadStashFileHook( $this->user );
                if ( $error ) {
-                       call_user_func_array( [ $status, 'fatal' ], $error );
+                       $status->fatal( ...$error );
                        return $status;
                }
                try {
@@ -358,7 +358,7 @@ class UploadFromChunks extends UploadFromFile {
         *
         * @param string $chunkPath
         * @throws UploadChunkFileException
-        * @return FileRepoStatus
+        * @return Status
         */
        private function outputChunk( $chunkPath ) {
                // Key is fileKey + chunk index
@@ -422,9 +422,9 @@ class UploadChunkFileException extends MWException {
 
 class UploadChunkVerificationException extends MWException {
        public $msg;
-       public function __construct( $res ) {
-               $this->msg = call_user_func_array( 'wfMessage', $res );
-               parent::__construct( call_user_func_array( 'wfMessage', $res )
+       public function __construct( array $res ) {
+               $this->msg = wfMessage( ...$res );
+               parent::__construct( wfMessage( ...$res )
                        ->inLanguage( 'en' )->useDatabase( false )->text() );
        }
 }