Convert all array() syntax to []

[lhc/web/wiklou.git] / includes / filebackend / lockmanager / DBLockManager.php

diff --git a/includes/filebackend/lockmanager/DBLockManager.php b/includes/filebackend/lockmanager/DBLockManager.php
index c93b4b4..f4410ca 100644 (file)
--- a/includes/filebackend/lockmanager/DBLockManager.php
+++ b/includes/filebackend/lockmanager/DBLockManager.php
@@ -47,7 +47,7 @@ abstract class DBLockManager extends QuorumLockManager {
 
        protected $session = 0; // random integer
        /** @var array Map Database connections (DB name => Database) */
-       protected $conns = array();
+       protected $conns = [];
 
        /**
         * Construct a new instance from configuration.
@@ -76,7 +76,7 @@ abstract class DBLockManager extends QuorumLockManager {
 
                $this->dbServers = isset( $config['dbServers'] )
                        ? $config['dbServers']
-                       : array(); // likely just using 'localDBMaster'
+                       : []; // likely just using 'localDBMaster'
                // Sanitize srvsByBucket config to prevent PHP errors
                $this->srvsByBucket = array_filter( $config['dbsByBucket'], 'is_array' );
                $this->srvsByBucket = array_values( $this->srvsByBucket ); // consecutive
@@ -149,7 +149,7 @@ abstract class DBLockManager extends QuorumLockManager {
                        $db = null;
                        if ( $lockDb === 'localDBMaster' ) {
                                $lb = wfGetLBFactory()->getMainLB( $this->domain );
-                               $db = $lb->getConnection( DB_MASTER, array(), $this->domain );
+                               $db = $lb->getConnection( DB_MASTER, [], $this->domain );
                        } elseif ( isset( $this->dbServers[$lockDb] ) ) {
                                $config = $this->dbServers[$lockDb];
                                $db = DatabaseBase::factory( $config['type'], $config );
@@ -162,7 +162,7 @@ abstract class DBLockManager extends QuorumLockManager {
                        # If the connection drops, try to avoid letting the DB rollback
                        # and release the locks before the file operations are finished.
                        # This won't handle the case of DB server restarts however.
-                       $options = array();
+                       $options = [];
                        if ( $this->lockExpiry > 0 ) {
                                $options['connTimeout'] = $this->lockExpiry;
                        }
@@ -241,11 +241,11 @@ abstract class DBLockManager extends QuorumLockManager {
  */
 class MySqlLockManager extends DBLockManager {
        /** @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_SH,
                self::LOCK_EX => self::LOCK_EX
-       );
+       ];
 
        /**
         * @param string $lockDb
@@ -271,28 +271,28 @@ class MySqlLockManager extends DBLockManager {
 
                $db = $this->getConnection( $lockSrv ); // checked in isServerUp()
 
-               $keys = array(); // list of hash keys for the paths
-               $data = array(); // list of rows to insert
-               $checkEXKeys = array(); // list of hash keys that this has no EX lock on
+               $keys = []; // list of hash keys for the paths
+               $data = []; // list of rows to insert
+               $checkEXKeys = []; // list of hash keys that this has no EX lock on
                # Build up values for INSERT clause
                foreach ( $paths as $path ) {
                        $key = $this->sha1Base36Absolute( $path );
                        $keys[] = $key;
-                       $data[] = array( 'fls_key' => $key, 'fls_session' => $this->session );
+                       $data[] = [ 'fls_key' => $key, 'fls_session' => $this->session ];
                        if ( !isset( $this->locksHeld[$path][self::LOCK_EX] ) ) {
                                $checkEXKeys[] = $key;
                        }
                }
 
                # Block new writers (both EX and SH locks leave entries here)...
-               $db->insert( 'filelocks_shared', $data, __METHOD__, array( 'IGNORE' ) );
+               $db->insert( 'filelocks_shared', $data, __METHOD__, [ 'IGNORE' ] );
                # Actually do the locking queries...
                if ( $type == self::LOCK_SH ) { // reader locks
                        $blocked = false;
                        # Bail if there are any existing writers...
                        if ( count( $checkEXKeys ) ) {
                                $blocked = $db->selectField( 'filelocks_exclusive', '1',
-                                       array( 'fle_key' => $checkEXKeys ),
+                                       [ 'fle_key' => $checkEXKeys ],
                                        __METHOD__
                                );
                        }
@@ -304,20 +304,20 @@ class MySqlLockManager extends DBLockManager {
                        # This may detect readers, but the safe check for them is below.
                        # Note: if two writers come at the same time, both bail :)
                        $blocked = $db->selectField( 'filelocks_shared', '1',
-                               array( 'fls_key' => $keys, "fls_session != $encSession" ),
+                               [ 'fls_key' => $keys, "fls_session != $encSession" ],
                                __METHOD__
                        );
                        if ( !$blocked ) {
                                # Build up values for INSERT clause
-                               $data = array();
+                               $data = [];
                                foreach ( $keys as $key ) {
-                                       $data[] = array( 'fle_key' => $key );
+                                       $data[] = [ 'fle_key' => $key ];
                                }
                                # Block new readers/writers...
                                $db->insert( 'filelocks_exclusive', $data, __METHOD__ );
                                # Bail if there are any existing readers...
                                $blocked = $db->selectField( 'filelocks_shared', '1',
-                                       array( 'fls_key' => $keys, "fls_session != $encSession" ),
+                                       [ 'fls_key' => $keys, "fls_session != $encSession" ],
                                        __METHOD__
                                );
                        }
@@ -361,11 +361,11 @@ class MySqlLockManager extends DBLockManager {
  */
 class PostgreSqlLockManager extends DBLockManager {
        /** @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_SH,
                self::LOCK_EX => self::LOCK_EX
-       );
+       ];
 
        protected function doGetLocksOnServer( $lockSrv, array $paths, $type ) {
                $status = Status::newGood();
@@ -378,11 +378,11 @@ class PostgreSqlLockManager extends DBLockManager {
                        function ( $key ) {
                                return Wikimedia\base_convert( substr( $key, 0, 15 ), 16, 10 );
                        },
-                       array_map( array( $this, 'sha1Base16Absolute' ), $paths )
+                       array_map( [ $this, 'sha1Base16Absolute' ], $paths )
                ) );
 
                // Try to acquire all the locks...
-               $fields = array();
+               $fields = [];
                foreach ( $bigints as $bigint ) {
                        $fields[] = ( $type == self::LOCK_SH )
                                ? "pg_try_advisory_lock_shared({$db->addQuotes( $bigint )}) AS K$bigint"
@@ -393,7 +393,7 @@ class PostgreSqlLockManager extends DBLockManager {
 
                if ( in_array( 'f', $row ) ) {
                        // Release any acquired locks if some could not be acquired...
-                       $fields = array();
+                       $fields = [];
                        foreach ( $row as $kbigint => $ok ) {
                                if ( $ok === 't' ) { // locked
                                        $bigint = substr( $kbigint, 1 ); // strip off the "K"