[MediaWiki-commits] [Gerrit] mediawiki...CheckUser[master]: Convert array() to []
jenkins-bot has submitted this change and it was merged. Change subject: Convert array() to [] .. Convert array() to [] Change-Id: I915817daedb7cd9201da5fee5fe0db57f90f0f84 --- M CheckUser.hooks.php M CheckUser.php M CheckUserEncryptedData.php M CheckUserLogPager.php M api/ApiQueryCheckUser.php M api/ApiQueryCheckUserLog.php M maintenance/importCheckUserLogs.php M maintenance/populateCheckUserTable.php M maintenance/purgeOldData.php M phpcs.xml M specials/SpecialCheckUser.php M specials/SpecialCheckUserLog.php 12 files changed, 271 insertions(+), 274 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/CheckUser.hooks.php b/CheckUser.hooks.php index 00730b4..fcf6fdd 100755 --- a/CheckUser.hooks.php +++ b/CheckUser.hooks.php @@ -56,7 +56,7 @@ $dbw = wfGetDB( DB_MASTER ); $cuc_id = $dbw->nextSequenceValue( 'cu_changes_cu_id_seq' ); - $rcRow = array( + $rcRow = [ 'cuc_id' => $cuc_id, 'cuc_namespace' => $attribs['rc_namespace'], 'cuc_title' => $attribs['rc_title'], @@ -74,13 +74,13 @@ 'cuc_xff'=> !$isSquidOnly ? $xff : '', 'cuc_xff_hex'=> ( $xff_ip && !$isSquidOnly ) ? IP::toHex( $xff_ip ) : null, 'cuc_agent' => $agent - ); + ]; # On PG, MW unsets cur_id due to schema incompatibilites. So it may not be set! if ( isset( $attribs['rc_cur_id'] ) ) { $rcRow['cuc_page_id'] = $attribs['rc_cur_id']; } - Hooks::run( 'CheckUserInsertForRecentChange', array( $rc, &$rcRow ) ); + Hooks::run( 'CheckUserInsertForRecentChange', [ $rc, &$rcRow ] ); $dbw->insert( 'cu_changes', $rcRow, __METHOD__ ); return true; @@ -105,7 +105,7 @@ $agent = $wgRequest->getHeader( 'User-Agent' ); $dbw = wfGetDB( DB_MASTER ); $cuc_id = $dbw->nextSequenceValue( 'cu_changes_cu_id_seq' ); - $rcRow = array( + $rcRow = [ 'cuc_id' => $cuc_id, 'cuc_namespace' => NS_USER, 'cuc_title' => '', @@ -124,7 +124,7 @@ 'cuc_xff'=> !$isSquidOnly ? $xff : '', 'cuc_xff_hex'=> ( $xff_ip && !$isSquidOnly ) ? IP::toHex( $xff_ip ) : null, 'cuc_agent' => $agent - ); + ]; $dbw->insert( 'cu_changes', $rcRow, __METHOD__ ); return true; @@ -160,7 +160,7 @@ $agent = $wgRequest->getHeader( 'User-Agent' ); $dbw = wfGetDB( DB_MASTER ); $cuc_id = $dbw->nextSequenceValue( 'cu_changes_cu_id_seq' ); - $rcRow = array( + $rcRow = [ 'cuc_id' => $cuc_id, 'cuc_namespace' => NS_USER, 'cuc_title' => '', @@ -179,11 +179,11 @@ 'cuc_xff'=> !$isSquidOnly ? $xff : '', 'cuc_xff_hex'=> ( $xff_ip && !$isSquidOnly ) ? IP::toHex( $xff_ip ) : null, 'cuc_agent' => $agent - ); + ]; if ( trim( $wgCUPublicKey ) != '' ) { $privateData = $userTo->getEmail() . ":" . $userTo->getId(); $encryptedData = new CheckUserEncryptedData( $privateData, $wgCUPublicKey ); - $rcRow = array_merge( $rcRow, array( 'cuc_private' => serialize( $encryptedData ) ) ); + $rcRow = array_merge( $rcRow, [ 'cuc_private' => serialize( $encryptedData ) ] ); } $dbw->insert( 'cu_changes', $rcRow, __METHOD__ ); @@ -223,7 +223,7 @@ $agent = $wgRequest->getHeader( 'User-Agent' ); $dbw = wfGetDB( DB_MASTER ); $cuc_id = $dbw->nextSequenceValue( 'cu_changes_cu_id_seq' ); - $rcRow = array( + $rcRow = [ 'cuc_id' => $cuc_id, 'cuc_page_id'=> 0, 'cuc_namespace' => NS_USER, @@ -242,7 +242,7 @@ 'cuc_xff'=> !$isSquidOnly ? $xff : '', 'cuc_xff_hex'=> ( $xff_ip && !$isSquidOnly ) ? IP::toHex( $xff_ip ) : null, 'cuc_agent' => $agent - ); + ]; $dbw->insert( 'cu_changes', $rcRow, __METHOD__ ); return true; @@ -262,13 +262,13 @@ $encCutoff = $dbw->addQuotes(
[MediaWiki-commits] [Gerrit] mediawiki...CheckUser[master]: Convert array() to []
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/324854 Change subject: Convert array() to [] .. Convert array() to [] Change-Id: I915817daedb7cd9201da5fee5fe0db57f90f0f84 --- M CheckUser.hooks.php M CheckUser.php M CheckUserEncryptedData.php M CheckUserLogPager.php M api/ApiQueryCheckUser.php M api/ApiQueryCheckUserLog.php M maintenance/importCheckUserLogs.php M maintenance/populateCheckUserTable.php M maintenance/purgeOldData.php M phpcs.xml M specials/SpecialCheckUser.php M specials/SpecialCheckUserLog.php 12 files changed, 271 insertions(+), 274 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CheckUser refs/changes/54/324854/1 diff --git a/CheckUser.hooks.php b/CheckUser.hooks.php index 00730b4..fcf6fdd 100755 --- a/CheckUser.hooks.php +++ b/CheckUser.hooks.php @@ -56,7 +56,7 @@ $dbw = wfGetDB( DB_MASTER ); $cuc_id = $dbw->nextSequenceValue( 'cu_changes_cu_id_seq' ); - $rcRow = array( + $rcRow = [ 'cuc_id' => $cuc_id, 'cuc_namespace' => $attribs['rc_namespace'], 'cuc_title' => $attribs['rc_title'], @@ -74,13 +74,13 @@ 'cuc_xff'=> !$isSquidOnly ? $xff : '', 'cuc_xff_hex'=> ( $xff_ip && !$isSquidOnly ) ? IP::toHex( $xff_ip ) : null, 'cuc_agent' => $agent - ); + ]; # On PG, MW unsets cur_id due to schema incompatibilites. So it may not be set! if ( isset( $attribs['rc_cur_id'] ) ) { $rcRow['cuc_page_id'] = $attribs['rc_cur_id']; } - Hooks::run( 'CheckUserInsertForRecentChange', array( $rc, &$rcRow ) ); + Hooks::run( 'CheckUserInsertForRecentChange', [ $rc, &$rcRow ] ); $dbw->insert( 'cu_changes', $rcRow, __METHOD__ ); return true; @@ -105,7 +105,7 @@ $agent = $wgRequest->getHeader( 'User-Agent' ); $dbw = wfGetDB( DB_MASTER ); $cuc_id = $dbw->nextSequenceValue( 'cu_changes_cu_id_seq' ); - $rcRow = array( + $rcRow = [ 'cuc_id' => $cuc_id, 'cuc_namespace' => NS_USER, 'cuc_title' => '', @@ -124,7 +124,7 @@ 'cuc_xff'=> !$isSquidOnly ? $xff : '', 'cuc_xff_hex'=> ( $xff_ip && !$isSquidOnly ) ? IP::toHex( $xff_ip ) : null, 'cuc_agent' => $agent - ); + ]; $dbw->insert( 'cu_changes', $rcRow, __METHOD__ ); return true; @@ -160,7 +160,7 @@ $agent = $wgRequest->getHeader( 'User-Agent' ); $dbw = wfGetDB( DB_MASTER ); $cuc_id = $dbw->nextSequenceValue( 'cu_changes_cu_id_seq' ); - $rcRow = array( + $rcRow = [ 'cuc_id' => $cuc_id, 'cuc_namespace' => NS_USER, 'cuc_title' => '', @@ -179,11 +179,11 @@ 'cuc_xff'=> !$isSquidOnly ? $xff : '', 'cuc_xff_hex'=> ( $xff_ip && !$isSquidOnly ) ? IP::toHex( $xff_ip ) : null, 'cuc_agent' => $agent - ); + ]; if ( trim( $wgCUPublicKey ) != '' ) { $privateData = $userTo->getEmail() . ":" . $userTo->getId(); $encryptedData = new CheckUserEncryptedData( $privateData, $wgCUPublicKey ); - $rcRow = array_merge( $rcRow, array( 'cuc_private' => serialize( $encryptedData ) ) ); + $rcRow = array_merge( $rcRow, [ 'cuc_private' => serialize( $encryptedData ) ] ); } $dbw->insert( 'cu_changes', $rcRow, __METHOD__ ); @@ -223,7 +223,7 @@ $agent = $wgRequest->getHeader( 'User-Agent' ); $dbw = wfGetDB( DB_MASTER ); $cuc_id = $dbw->nextSequenceValue( 'cu_changes_cu_id_seq' ); - $rcRow = array( + $rcRow = [ 'cuc_id' => $cuc_id, 'cuc_page_id'=> 0, 'cuc_namespace' => NS_USER, @@ -242,7 +242,7 @@ 'cuc_xff'=> !$isSquidOnly ? $xff : '', 'cuc_xff_hex'=> ( $xff_ip && !$isSquidOnly ) ? IP::toHex( $xff_ip ) : null, 'cuc_agent' => $agent - ); + ]; $dbw->insert( 'cu_changes', $rcRow, __METHOD__ ); return true; @@ -262,13 +262,13 @@