Merge "Http::getProxy() method to get proxy configuration"

[lhc/web/wiklou.git] / includes / filerepo / file / OldLocalFile.php

diff --git a/includes/filerepo/file/OldLocalFile.php b/includes/filerepo/file/OldLocalFile.php
index fd92e11..31e62ec 100644 (file)
--- a/includes/filerepo/file/OldLocalFile.php
+++ b/includes/filerepo/file/OldLocalFile.php
@@ -88,7 +88,7 @@ class OldLocalFile extends LocalFile {
        static function newFromKey( $sha1, $repo, $timestamp = false ) {
                $dbr = $repo->getSlaveDB();
 
-               $conds = array( 'oi_sha1' => $sha1 );
+               $conds = [ 'oi_sha1' => $sha1 ];
                if ( $timestamp ) {
                        $conds['oi_timestamp'] = $dbr->timestamp( $timestamp );
                }
@@ -106,7 +106,7 @@ class OldLocalFile extends LocalFile {
         * @return array
         */
        static function selectFields() {
-               return array(
+               return [
                        'oi_name',
                        'oi_archive_name',
                        'oi_size',
@@ -123,7 +123,7 @@ class OldLocalFile extends LocalFile {
                        'oi_timestamp',
                        'oi_deleted',
                        'oi_sha1',
-               );
+               ];
        }
 
        /**
@@ -181,14 +181,14 @@ class OldLocalFile extends LocalFile {
                        ? $this->repo->getMasterDB()
                        : $this->repo->getSlaveDB();
 
-               $conds = array( 'oi_name' => $this->getName() );
+               $conds = [ 'oi_name' => $this->getName() ];
                if ( is_null( $this->requestedTime ) ) {
                        $conds['oi_archive_name'] = $this->archive_name;
                } else {
                        $conds['oi_timestamp'] = $dbr->timestamp( $this->requestedTime );
                }
                $row = $dbr->selectRow( 'oldimage', $this->getCacheFields( 'oi_' ),
-                       $conds, __METHOD__, array( 'ORDER BY' => 'oi_timestamp DESC' ) );
+                       $conds, __METHOD__, [ 'ORDER BY' => 'oi_timestamp DESC' ] );
                if ( $row ) {
                        $this->loadFromRow( $row, 'oi_' );
                } else {
@@ -204,7 +204,7 @@ class OldLocalFile extends LocalFile {
 
                $this->extraDataLoaded = true;
                $dbr = $this->repo->getSlaveDB();
-               $conds = array( 'oi_name' => $this->getName() );
+               $conds = [ 'oi_name' => $this->getName() ];
                if ( is_null( $this->requestedTime ) ) {
                        $conds['oi_archive_name'] = $this->archive_name;
                } else {
@@ -212,12 +212,12 @@ class OldLocalFile extends LocalFile {
                }
                // In theory the file could have just been renamed/deleted...oh well
                $row = $dbr->selectRow( 'oldimage', $this->getLazyCacheFields( 'oi_' ),
-                       $conds, __METHOD__, array( 'ORDER BY' => 'oi_timestamp DESC' ) );
+                       $conds, __METHOD__, [ 'ORDER BY' => 'oi_timestamp DESC' ] );
 
                if ( !$row ) { // fallback to master
                        $dbr = $this->repo->getMasterDB();
                        $row = $dbr->selectRow( 'oldimage', $this->getLazyCacheFields( 'oi_' ),
-                               $conds, __METHOD__, array( 'ORDER BY' => 'oi_timestamp DESC' ) );
+                               $conds, __METHOD__, [ 'ORDER BY' => 'oi_timestamp DESC' ] );
                }
 
                if ( $row ) {
@@ -271,7 +271,7 @@ class OldLocalFile extends LocalFile {
 
                wfDebug( __METHOD__ . ': upgrading ' . $this->archive_name . " to the current schema\n" );
                $dbw->update( 'oldimage',
-                       array(
+                       [
                                'oi_size' => $this->size, // sanity
                                'oi_width' => $this->width,
                                'oi_height' => $this->height,
@@ -281,9 +281,9 @@ class OldLocalFile extends LocalFile {
                                'oi_minor_mime' => $minor,
                                'oi_metadata' => $this->metadata,
                                'oi_sha1' => $this->sha1,
-                       ), array(
+                       ], [
                                'oi_name' => $this->getName(),
-                               'oi_archive_name' => $this->archive_name ),
+                               'oi_archive_name' => $this->archive_name ],
                        __METHOD__
                );
        }
@@ -332,16 +332,13 @@ class OldLocalFile extends LocalFile {
         * @param string $timestamp
         * @param string $comment
         * @param User $user
-        * @param int $flags
         * @return FileRepoStatus
         */
-       function uploadOld( $srcPath, $archiveName, $timestamp, $comment, $user, $flags = 0 ) {
+       function uploadOld( $srcPath, $archiveName, $timestamp, $comment, $user ) {
                $this->lock();
 
                $dstRel = 'archive/' . $this->getHashPath() . $archiveName;
-               $status = $this->publishTo( $srcPath, $dstRel,
-                       $flags & File::DELETE_SOURCE ? FileRepo::DELETE_SOURCE : 0
-               );
+               $status = $this->publishTo( $srcPath, $dstRel );
 
                if ( $status->isGood() ) {
                        if ( !$this->recordOldUpload( $srcPath, $archiveName, $timestamp, $comment, $user ) ) {
@@ -364,9 +361,8 @@ class OldLocalFile extends LocalFile {
         * @param User $user User who did this upload
         * @return bool
         */
-       function recordOldUpload( $srcPath, $archiveName, $timestamp, $comment, $user ) {
+       protected function recordOldUpload( $srcPath, $archiveName, $timestamp, $comment, $user ) {
                $dbw = $this->repo->getMasterDB();
-               $dbw->begin( __METHOD__ );
 
                $dstPath = $this->repo->getZonePath( 'public' ) . '/' . $this->getRel();
                $props = $this->repo->getFileProps( $dstPath );
@@ -375,7 +371,7 @@ class OldLocalFile extends LocalFile {
                }
 
                $dbw->insert( 'oldimage',
-                       array(
+                       [
                                'oi_name' => $this->getName(),
                                'oi_archive_name' => $archiveName,
                                'oi_size' => $props['size'],
@@ -391,11 +387,9 @@ class OldLocalFile extends LocalFile {
                                'oi_major_mime' => $props['major_mime'],
                                'oi_minor_mime' => $props['minor_mime'],
                                'oi_sha1' => $props['sha1'],
-                       ), __METHOD__
+                       ], __METHOD__
                );
 
-               $dbw->commit( __METHOD__ );
-
                return true;
        }