Merge "Add CollationFa"

[lhc/web/wiklou.git] / includes / filerepo / FileBackendDBRepoWrapper.php

diff --git a/includes/filerepo/FileBackendDBRepoWrapper.php b/includes/filerepo/FileBackendDBRepoWrapper.php
index c83e5b1..5bc60a0 100644 (file)
--- a/includes/filerepo/FileBackendDBRepoWrapper.php
+++ b/includes/filerepo/FileBackendDBRepoWrapper.php
@@ -27,7 +27,7 @@
  * @brief Proxy backend that manages file layout rewriting for FileRepo.
  *
  * LocalRepo may be configured to store files under their title names or by SHA-1.
- * This acts as a shim in the later case, providing backwards compatability for
+ * This acts as a shim in the latter case, providing backwards compatability for
  * most callers. All "public"/"deleted" zone files actually go in an "original"
  * container and are never changed.
  *
@@ -50,8 +50,10 @@ class FileBackendDBRepoWrapper extends FileBackend {
        protected $dbs;
 
        public function __construct( array $config ) {
-               $config['name'] = $config['backend']->getName();
-               $config['wikiId'] = $config['backend']->getWikiId();
+               /** @var FileBackend $backend */
+               $backend = $config['backend'];
+               $config['name'] = $backend->getName();
+               $config['wikiId'] = $backend->getWikiId();
                parent::__construct( $config );
                $this->backend = $config['backend'];
                $this->repoName = $config['repoName'];
@@ -79,7 +81,7 @@ class FileBackendDBRepoWrapper extends FileBackend {
         * @return string
         */
        public function getBackendPath( $path, $latest = true ) {
-               $paths = $this->getBackendPaths( array( $path ), $latest );
+               $paths = $this->getBackendPaths( [ $path ], $latest );
                return current( $paths );
        }
 
@@ -94,10 +96,10 @@ class FileBackendDBRepoWrapper extends FileBackend {
         * @return array Translated paths in same order
         */
        public function getBackendPaths( array $paths, $latest = true ) {
-               $db = $this->getDB( $latest ? DB_MASTER : DB_SLAVE );
+               $db = $this->getDB( $latest ? DB_MASTER : DB_REPLICA );
 
                // @TODO: batching
-               $resolved = array();
+               $resolved = [];
                foreach ( $paths as $i => $path ) {
                        if ( !$latest && $this->resolvedPathCache->has( $path, 'target', 10 ) ) {
                                $resolved[$i] = $this->resolvedPathCache->get( $path, 'target' );
@@ -110,12 +112,12 @@ class FileBackendDBRepoWrapper extends FileBackend {
                                $name = basename( $path );
                                if ( strpos( $path, '!' ) !== false ) {
                                        $sha1 = $db->selectField( 'oldimage', 'oi_sha1',
-                                               array( 'oi_archive_name' => $name ),
+                                               [ 'oi_archive_name' => $name ],
                                                __METHOD__
                                        );
                                } else {
                                        $sha1 = $db->selectField( 'image', 'img_sha1',
-                                               array( 'img_name' => $name ),
+                                               [ 'img_name' => $name ],
                                                __METHOD__
                                        );
                                }
@@ -135,7 +137,7 @@ class FileBackendDBRepoWrapper extends FileBackend {
                        }
                }
 
-               $res = array();
+               $res = [];
                foreach ( $paths as $i => $path ) {
                        $res[$i] = $resolved[$i];
                }
@@ -256,7 +258,7 @@ class FileBackendDBRepoWrapper extends FileBackend {
                return $this->translateSrcParams( __FUNCTION__, $params );
        }
 
-       public function getScopedLocksForOps( array $ops, Status $status ) {
+       public function getScopedLocksForOps( array $ops, StatusValue $status ) {
                return $this->backend->getScopedLocksForOps( $ops, $status );
        }
 
@@ -324,7 +326,7 @@ class FileBackendDBRepoWrapper extends FileBackend {
 
                $results = $this->backend->$function( $params );
 
-               $contents = array();
+               $contents = [];
                foreach ( $results as $path => $result ) {
                        $contents[$pathMap[$path]] = $result;
                }
@@ -342,7 +344,7 @@ class FileBackendDBRepoWrapper extends FileBackend {
         */
        protected function mungeOpPaths( array $ops ) {
                // Ops that use 'src' and do not mutate core file data there
-               static $srcRefOps = array( 'store', 'copy', 'describe' );
+               static $srcRefOps = [ 'store', 'copy', 'describe' ];
                foreach ( $ops as &$op ) {
                        if ( isset( $op['src'] ) && in_array( $op['op'], $srcRefOps ) ) {
                                $op['src'] = $this->getBackendPath( $op['src'], true );