X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Ffilerepo%2FFileBackendDBRepoWrapper.php;h=5bc60a0e0af889aea4cdb4460733a35b63d2601e;hb=685d6dbca432cd0805bc27869deda6efb9dbca6b;hp=0401d0cdecd3d5116fbe2ed4264b0e70430a18cf;hpb=d29f4906c0964b0f783d2f8f8c81fa70ec647342;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/filerepo/FileBackendDBRepoWrapper.php b/includes/filerepo/FileBackendDBRepoWrapper.php
index 0401d0cdec..5bc60a0e0a 100644
--- 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.
  *
@@ -46,12 +46,14 @@ class FileBackendDBRepoWrapper extends FileBackend {
 	protected $dbHandleFunc;
 	/** @var ProcessCacheLRU */
 	protected $resolvedPathCache;
-	/** @var Array Map of (index => DBConnRef) */
+	/** @var DBConnRef[] */
 	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,29 +96,28 @@ 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 );
-		$origBasePath = $this->backend->getContainerStoragePath( "{$this->repoName}-original" );
+		$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' );
 				continue;
 			}
 
-			list( , $container, $rel ) = FileBackend::splitStoragePath( $path );
+			list( , $container ) = FileBackend::splitStoragePath( $path );
 
 			if ( $container === "{$this->repoName}-public" ) {
 				$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__
 					);
 				}
@@ -136,7 +137,7 @@ class FileBackendDBRepoWrapper extends FileBackend {
 			}
 		}
 
-		$res = array();
+		$res = [];
 		foreach ( $paths as $i => $path ) {
 			$res[$i] = $resolved[$i];
 		}
@@ -257,8 +258,8 @@ class FileBackendDBRepoWrapper extends FileBackend {
 		return $this->translateSrcParams( __FUNCTION__, $params );
 	}
 
-	public function getScopedLocksForOps( array $ops, Status $status ) {
-		return $this->backend->getScopedFileLocks( $ops, $status );
+	public function getScopedLocksForOps( array $ops, StatusValue $status ) {
+		return $this->backend->getScopedLocksForOps( $ops, $status );
 	}
 
 	/**
@@ -271,7 +272,7 @@ class FileBackendDBRepoWrapper extends FileBackend {
 	 */
 	public function getPathForSHA1( $sha1 ) {
 		if ( strlen( $sha1 ) < 3 ) {
-			throw new MWException( "Invalid file SHA-1." );
+			throw new InvalidArgumentException( "Invalid file SHA-1." );
 		}
 		return $this->backend->getContainerStoragePath( "{$this->repoName}-original" ) .
 			"/{$sha1[0]}/{$sha1[1]}/{$sha1[2]}/{$sha1}";
@@ -284,11 +285,11 @@ class FileBackendDBRepoWrapper extends FileBackend {
 	 * @return DBConnRef
 	 */
 	protected function getDB( $index ) {
-		if ( !isset( $this->db[$index] ) ) {
+		if ( !isset( $this->dbs[$index] ) ) {
 			$func = $this->dbHandleFunc;
-			$this->db[$index] = $func( $index );
+			$this->dbs[$index] = $func( $index );
 		}
-		return $this->db[$index];
+		return $this->dbs[$index];
 	}
 
 	/**
@@ -325,7 +326,7 @@ class FileBackendDBRepoWrapper extends FileBackend {
 
 		$results = $this->backend->$function( $params );
 
-		$contents = array();
+		$contents = [];
 		foreach ( $results as $path => $result ) {
 			$contents[$pathMap[$path]] = $result;
 		}
@@ -343,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 );