jenkins-bot has submitted this change and it was merged.
Change subject: Use lowercase key words
......................................................................
Use lowercase key words
Change-Id: I57569b7082a0decc8128ecadd8ec5d1a5c327673
---
M includes/Export.php
M includes/media/BitmapMetadataHandler.php
M includes/media/Exif.php
M includes/media/FormatMetadata.php
M includes/media/IPTC.php
M includes/media/MediaHandler.php
M includes/media/SVGMetadataExtractor.php
M includes/media/XMP.php
M includes/media/XMPInfo.php
M includes/rcfeed/JSONRCFeedFormatter.php
M languages/classes/LanguageKk_cyrl.php
M languages/classes/LanguageTyv.php
M maintenance/locking/LockServerDaemon.php
M tests/phpunit/includes/TitlePermissionTest.php
14 files changed, 23 insertions(+), 23 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Export.php b/includes/Export.php
index 98de4c0..3d34763 100644
--- a/includes/Export.php
+++ b/includes/Export.php
@@ -604,7 +604,7 @@
if ( $row->page_is_redirect ) {
$page = WikiPage::factory( $title );
$redirect = $page->getRedirectTarget();
- if ( $redirect instanceOf Title &&
$redirect->isValidRedirectTarget() ) {
+ if ( $redirect instanceof Title &&
$redirect->isValidRedirectTarget() ) {
$out .= ' ' . Xml::element( 'redirect',
array( 'title' => self::canonicalTitle( $redirect ) ) ) . "\n";
}
}
diff --git a/includes/media/BitmapMetadataHandler.php
b/includes/media/BitmapMetadataHandler.php
index 7c39c81..00b4298 100644
--- a/includes/media/BitmapMetadataHandler.php
+++ b/includes/media/BitmapMetadataHandler.php
@@ -116,7 +116,7 @@
function getMetadataArray() {
// this seems a bit ugly... This is all so its merged in right
order
// based on the MWG recomendation.
- $temp = Array();
+ $temp = array();
krsort( $this->metaPriority );
foreach ( $this->metaPriority as $pri ) {
foreach ( $pri as $type ) {
@@ -153,7 +153,7 @@
$seg = JpegMetadataExtractor::segmentSplitter( $filename );
if ( isset( $seg['COM'] ) && isset( $seg['COM'][0] ) ) {
- $meta->addMetadata( Array( 'JPEGFileComment' =>
$seg['COM'] ), 'native' );
+ $meta->addMetadata( array( 'JPEGFileComment' =>
$seg['COM'] ), 'native' );
}
if ( isset( $seg['PSIR'] ) && count( $seg['PSIR'] ) > 0 ) {
foreach ( $seg['PSIR'] as $curPSIRValue ) {
diff --git a/includes/media/Exif.php b/includes/media/Exif.php
index 9a2794a..50dd266 100644
--- a/includes/media/Exif.php
+++ b/includes/media/Exif.php
@@ -319,7 +319,7 @@
* Make $this->mFilteredExifData
*/
function makeFilteredData() {
- $this->mFilteredExifData = Array();
+ $this->mFilteredExifData = array();
foreach ( array_keys( $this->mRawExifData ) as $section ) {
if ( !in_array( $section, array_keys( $this->mExifTags
) ) ) {
diff --git a/includes/media/FormatMetadata.php
b/includes/media/FormatMetadata.php
index 1b1841c..40c3161 100644
--- a/includes/media/FormatMetadata.php
+++ b/includes/media/FormatMetadata.php
@@ -105,7 +105,7 @@
// This seems ugly to wrap non-array's in an array just
to unwrap again,
// especially when most of the time it is not an array
if ( !is_array( $tags[$tag] ) ) {
- $vals = Array( $vals );
+ $vals = array( $vals );
}
// _type is a special value to say what array type
diff --git a/includes/media/IPTC.php b/includes/media/IPTC.php
index 544dd21..dc163ac 100644
--- a/includes/media/IPTC.php
+++ b/includes/media/IPTC.php
@@ -40,7 +40,7 @@
*/
static function parse( $rawData ) {
$parsed = iptcparse( $rawData );
- $data = Array();
+ $data = array();
if ( !is_array( $parsed ) ) {
return $data;
}
@@ -225,7 +225,7 @@
if ( isset( $parsed['2#060'] ) ) {
$time = $parsed['2#060'];
} else {
- $time = Array();
+ $time = array();
}
$timestamp = self::timeHelper( $val,
$time, $c );
if ( $timestamp ) {
@@ -239,7 +239,7 @@
if ( isset( $parsed['2#063'] ) ) {
$time = $parsed['2#063'];
} else {
- $time = Array();
+ $time = array();
}
$timestamp = self::timeHelper( $val,
$time, $c );
if ( $timestamp ) {
@@ -252,7 +252,7 @@
if ( isset( $parsed['2#035'] ) ) {
$time = $parsed['2#035'];
} else {
- $time = Array();
+ $time = array();
}
$timestamp = self::timeHelper( $val,
$time, $c );
if ( $timestamp ) {
@@ -265,7 +265,7 @@
if ( isset( $parsed['2#038'] ) ) {
$time = $parsed['2#038'];
} else {
- $time = Array();
+ $time = array();
}
$timestamp = self::timeHelper( $val,
$time, $c );
if ( $timestamp ) {
diff --git a/includes/media/MediaHandler.php b/includes/media/MediaHandler.php
index ddb8efd..c53c829 100644
--- a/includes/media/MediaHandler.php
+++ b/includes/media/MediaHandler.php
@@ -138,8 +138,8 @@
* @return string version string
*/
static function getMetadataVersion() {
- $version = Array( '2' ); // core metadata version
- wfRunHooks( 'GetMetadataVersion', Array( &$version ) );
+ $version = array( '2' ); // core metadata version
+ wfRunHooks( 'GetMetadataVersion', array( &$version ) );
return implode( ';', $version );
}
diff --git a/includes/media/SVGMetadataExtractor.php
b/includes/media/SVGMetadataExtractor.php
index 2e33bb9..831e043 100644
--- a/includes/media/SVGMetadataExtractor.php
+++ b/includes/media/SVGMetadataExtractor.php
@@ -45,7 +45,7 @@
private $reader = null;
private $mDebug = false;
- private $metadata = Array();
+ private $metadata = array();
/**
* Constructor
diff --git a/includes/media/XMP.php b/includes/media/XMP.php
index 7eb3d19..3b31053 100644
--- a/includes/media/XMP.php
+++ b/includes/media/XMP.php
@@ -155,7 +155,7 @@
$data = $this->results;
- wfRunHooks( 'XMPGetResults', Array( &$data ) );
+ wfRunHooks( 'XMPGetResults', array( &$data ) );
if ( isset( $data['xmp-special']['AuthorsPosition'] )
&& is_string( $data['xmp-special']['AuthorsPosition'] )
diff --git a/includes/media/XMPInfo.php b/includes/media/XMPInfo.php
index f0b2cb5..afc9ece 100644
--- a/includes/media/XMPInfo.php
+++ b/includes/media/XMPInfo.php
@@ -35,7 +35,7 @@
if ( !self::$ranHooks ) {
// This is for if someone makes a custom metadata
extension.
// For example, a medical wiki might want to decode
DICOM xmp properties.
- wfRunHooks( 'XMPGetInfo', Array( &self::$items ) );
+ wfRunHooks( 'XMPGetInfo', array( &self::$items ) );
self::$ranHooks = true; // Only want to do this once.
}
return self::$items;
diff --git a/includes/rcfeed/JSONRCFeedFormatter.php
b/includes/rcfeed/JSONRCFeedFormatter.php
index f4cb992..144ec95 100644
--- a/includes/rcfeed/JSONRCFeedFormatter.php
+++ b/includes/rcfeed/JSONRCFeedFormatter.php
@@ -44,8 +44,8 @@
break;
case RC_NEW:
- $packet['length'] = array( 'old' => NULL, 'new'
=> $attrib['rc_new_len'] );
- $packet['revision'] = array( 'old' => NULL,
'new' => $attrib['rc_this_oldid'] );
+ $packet['length'] = array( 'old' => null, 'new'
=> $attrib['rc_new_len'] );
+ $packet['revision'] = array( 'old' => null,
'new' => $attrib['rc_this_oldid'] );
break;
case RC_LOG:
diff --git a/languages/classes/LanguageKk_cyrl.php
b/languages/classes/LanguageKk_cyrl.php
index 5a7bbf3..4e08613 100644
--- a/languages/classes/LanguageKk_cyrl.php
+++ b/languages/classes/LanguageKk_cyrl.php
@@ -727,7 +727,7 @@
$lastLetter[0] = $ar[count( $ar ) - 1];
// Find the last vowel in the word
- $lastLetter[1] = NULL;
+ $lastLetter[1] = null;
foreach ( $wordReversed as $xvalue ) {
foreach ( $allVowels as $yvalue ) {
if ( strcmp( $xvalue, $yvalue ) == 0 ) {
@@ -737,7 +737,7 @@
continue;
}
}
- if ( $lastLetter[1] !== NULL ) {
+ if ( $lastLetter[1] !== null ) {
break;
} else {
continue;
diff --git a/languages/classes/LanguageTyv.php
b/languages/classes/LanguageTyv.php
index fc1e8a8..f362329 100644
--- a/languages/classes/LanguageTyv.php
+++ b/languages/classes/LanguageTyv.php
@@ -66,7 +66,7 @@
$wordReversed = array_reverse( $ar[0] ); // Here's an array
with the order of the letters in the word reversed so we can find a match
quicker *shrug*
// Find the last vowel in the word
- $wordLastVowel = NULL;
+ $wordLastVowel = null;
foreach ( $wordReversed as $xvalue ) {
foreach ( $allVowels as $yvalue ) {
if ( strcmp( $xvalue, $yvalue ) == 0 ) {
@@ -76,7 +76,7 @@
continue;
}
}
- if ( $wordLastVowel !== NULL ) {
+ if ( $wordLastVowel !== null ) {
break;
} else {
continue;
diff --git a/maintenance/locking/LockServerDaemon.php
b/maintenance/locking/LockServerDaemon.php
index 01fbac7..d98654e 100644
--- a/maintenance/locking/LockServerDaemon.php
+++ b/maintenance/locking/LockServerDaemon.php
@@ -149,7 +149,7 @@
$socketArray->addSocket( $this->sock ); // add listening socket
do {
list( $read, $write ) =
$socketArray->socketsForSelect();
- if ( socket_select( $read, $write, $except = NULL, NULL
) < 1 ) {
+ if ( socket_select( $read, $write, $except = null, null
) < 1 ) {
continue; // wait
}
// Check if there is a client trying to connect...
diff --git a/tests/phpunit/includes/TitlePermissionTest.php
b/tests/phpunit/includes/TitlePermissionTest.php
index 4a0a755..c7cbc7b 100644
--- a/tests/phpunit/includes/TitlePermissionTest.php
+++ b/tests/phpunit/includes/TitlePermissionTest.php
@@ -47,7 +47,7 @@
date_default_timezone_set( $localZone );
$this->title = Title::makeTitle( NS_MAIN, "Main Page" );
- if ( !isset( $this->userUser ) || !( $this->userUser instanceOf
User ) ) {
+ if ( !isset( $this->userUser ) || !( $this->userUser instanceof
User ) ) {
$this->userUser = User::newFromName( $this->userName );
if ( !$this->userUser->getID() ) {
--
To view, visit https://gerrit.wikimedia.org/r/97207
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I57569b7082a0decc8128ecadd8ec5d1a5c327673
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Parent5446 <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
