X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Ffilebackend%2Flockmanager%2FLockManager.php;h=567a29892ebe4e89b66429d89fd8023800fed61b;hp=8115fd42a9618190c9695c9c89172e51e5032b2e;hb=708c02281e6e8880ae2cebbda7f353ce97841f94;hpb=415b31766677e190c13322742b4e42da1157538c

diff --git a/includes/filebackend/lockmanager/LockManager.php b/includes/filebackend/lockmanager/LockManager.php
index 8115fd42a9..567a29892e 100644
--- a/includes/filebackend/lockmanager/LockManager.php
+++ b/includes/filebackend/lockmanager/LockManager.php
@@ -44,14 +44,14 @@
  */
 abstract class LockManager {
 	/** @var array Mapping of lock types to the type actually used */
-	protected $lockTypeMap = array(
+	protected $lockTypeMap = [
 		self::LOCK_SH => self::LOCK_SH,
 		self::LOCK_UW => self::LOCK_EX, // subclasses may use self::LOCK_SH
 		self::LOCK_EX => self::LOCK_EX
-	);
+	];
 
 	/** @var array Map of (resource path => lock type => count) */
-	protected $locksHeld = array();
+	protected $locksHeld = [];
 
 	protected $domain; // string; domain (usually wiki ID)
 	protected $lockTTL; // integer; maximum time locks can be held
@@ -90,7 +90,7 @@ abstract class LockManager {
 	 * @return Status
 	 */
 	final public function lock( array $paths, $type = self::LOCK_EX, $timeout = 0 ) {
-		return $this->lockByType( array( $type => $paths ), $timeout );
+		return $this->lockByType( [ $type => $paths ], $timeout );
 	}
 
 	/**
@@ -103,7 +103,7 @@ abstract class LockManager {
 	 */
 	final public function lockByType( array $pathsByType, $timeout = 0 ) {
 		$pathsByType = $this->normalizePathsByType( $pathsByType );
-		$msleep = array( 0, 50, 100, 300, 500 ); // retry backoff times
+		$msleep = [ 0, 50, 100, 300, 500 ]; // retry backoff times
 		$start = microtime( true );
 		do {
 			$status = $this->doLockByType( $pathsByType );
@@ -126,7 +126,7 @@ abstract class LockManager {
 	 * @return Status
 	 */
 	final public function unlock( array $paths, $type = self::LOCK_EX ) {
-		return $this->unlockByType( array( $type => $paths ) );
+		return $this->unlockByType( [ $type => $paths ] );
 	}
 
 	/**
@@ -152,7 +152,7 @@ abstract class LockManager {
 	 * @return string
 	 */
 	final protected function sha1Base36Absolute( $path ) {
-		return wfBaseConvert( sha1( "{$this->domain}:{$path}" ), 16, 36, 31 );
+		return Wikimedia\base_convert( sha1( "{$this->domain}:{$path}" ), 16, 36, 31 );
 	}
 
 	/**
@@ -176,7 +176,7 @@ abstract class LockManager {
 	 * @since 1.22
 	 */
 	final protected function normalizePathsByType( array $pathsByType ) {
-		$res = array();
+		$res = [];
 		foreach ( $pathsByType as $type => $paths ) {
 			$res[$this->lockTypeMap[$type]] = array_unique( $paths );
 		}
@@ -192,7 +192,7 @@ abstract class LockManager {
 	 */
 	protected function doLockByType( array $pathsByType ) {
 		$status = Status::newGood();
-		$lockedByType = array(); // map of (type => paths)
+		$lockedByType = []; // map of (type => paths)
 		foreach ( $pathsByType as $type => $paths ) {
 			$status->merge( $this->doLock( $paths, $type ) );
 			if ( $status->isOK() ) {