From e5f5e951378352028169011a2482681aae0f181a Mon Sep 17 00:00:00 2001 From: umherirrender Date: Fri, 26 Oct 2012 17:42:13 +0200 Subject: [PATCH] Fix indentation whitespace errors Change-Id: Ie268bee2098c589c050e1b5b0e93fe1b3feca86f --- includes/MimeMagic.php | 2 +- includes/OutputPage.php | 2 +- includes/Skin.php | 2 +- includes/WebRequest.php | 2 +- includes/json/Services_JSON.php | 2 +- includes/media/SVG.php | 2 +- includes/parser/LinkHolderArray.php | 2 +- includes/resourceloader/ResourceLoader.php | 2 +- maintenance/archives/patch-uploadstash.sql | 2 +- tests/phpunit/data/db/sqlite/tables-1.18.sql | 2 +- tests/phpunit/includes/GlobalFunctions/wfBCP47Test.php | 2 +- tests/phpunit/includes/MWNamespaceTest.php | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/includes/MimeMagic.php b/includes/MimeMagic.php index 88383d8f38..65a2a6fa79 100644 --- a/includes/MimeMagic.php +++ b/includes/MimeMagic.php @@ -433,7 +433,7 @@ class MimeMagic { $ext = explode( ' ', $ext ); $extension = strtolower( $extension ); - return in_array( $extension, $ext ); + return in_array( $extension, $ext ); } /** diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 3578568651..ff83f700ad 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -2982,7 +2982,7 @@ $templates ); if ( $wgContLang->hasVariants() ) { $vars['wgUserVariant'] = $wgContLang->getPreferredVariant(); - } + } foreach ( $title->getRestrictionTypes() as $type ) { $vars['wgRestriction' . ucfirst( $type )] = $title->getRestrictions( $type ); } diff --git a/includes/Skin.php b/includes/Skin.php index 24d48bc44c..9e5613e982 100644 --- a/includes/Skin.php +++ b/includes/Skin.php @@ -73,7 +73,7 @@ abstract class Skin extends ContextSource { return $wgValidSkinNames; } - /** + /** * Fetch the skinname messages for available skins. * @return array of strings */ diff --git a/includes/WebRequest.php b/includes/WebRequest.php index aeac69420a..e251ac5bb5 100644 --- a/includes/WebRequest.php +++ b/includes/WebRequest.php @@ -382,7 +382,7 @@ class WebRequest { /** * Unset an arbitrary value from our get/post data. - * + * * @param $key String: key name to use * @return Mixed: old value if one was present, null otherwise */ diff --git a/includes/json/Services_JSON.php b/includes/json/Services_JSON.php index 398ed6a28f..2566072dba 100644 --- a/includes/json/Services_JSON.php +++ b/includes/json/Services_JSON.php @@ -283,7 +283,7 @@ class Services_JSON return $this->encode2($var); } - /** + /** * encodes an arbitrary variable into JSON format * * @param $var Mixed: any number, boolean, string, array, or object to be encoded. diff --git a/includes/media/SVG.php b/includes/media/SVG.php index 75d474c0ab..53716df6b9 100644 --- a/includes/media/SVG.php +++ b/includes/media/SVG.php @@ -252,7 +252,7 @@ class SvgHandler extends ImageHandler { try { $metadata = SVGMetadataExtractor::getMetadata( $filename ); } catch( Exception $e ) { - // Broken file? + // Broken file? wfDebug( __METHOD__ . ': ' . $e->getMessage() . "\n" ); return '0'; } diff --git a/includes/parser/LinkHolderArray.php b/includes/parser/LinkHolderArray.php index 49160e8a71..9f1fff22de 100644 --- a/includes/parser/LinkHolderArray.php +++ b/includes/parser/LinkHolderArray.php @@ -43,7 +43,7 @@ class LinkHolderArray { } } - /** + /** * Don't serialize the parent object, it is big, and not needed when it is * a parameter to mergeForeign(), which is the only application of * serializing at present. diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php index 670586383d..b4bd98cd8e 100644 --- a/includes/resourceloader/ResourceLoader.php +++ b/includes/resourceloader/ResourceLoader.php @@ -347,7 +347,7 @@ class ResourceLoader { return array_keys( $this->moduleInfos ); } - /** + /** * Get a list of test module names for one (or all) frameworks. * If the given framework id is unknkown, or if the in-object variable is not an array, * then it will return an empty array. diff --git a/maintenance/archives/patch-uploadstash.sql b/maintenance/archives/patch-uploadstash.sql index 556d6b2877..14eaeab082 100644 --- a/maintenance/archives/patch-uploadstash.sql +++ b/maintenance/archives/patch-uploadstash.sql @@ -33,7 +33,7 @@ CREATE TABLE /*_*/uploadstash ( us_sha1 varchar(31) NOT NULL, us_mime varchar(255), -- Media type as defined by the MEDIATYPE_xxx constants, should duplicate definition in the image table - us_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE") default NULL, + us_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE") default NULL, -- image-specific properties us_image_width int unsigned, us_image_height int unsigned, diff --git a/tests/phpunit/data/db/sqlite/tables-1.18.sql b/tests/phpunit/data/db/sqlite/tables-1.18.sql index bedf6c3345..b106d2b7ef 100644 --- a/tests/phpunit/data/db/sqlite/tables-1.18.sql +++ b/tests/phpunit/data/db/sqlite/tables-1.18.sql @@ -296,7 +296,7 @@ CREATE TABLE /*_*/uploadstash ( us_size int unsigned NOT NULL, us_sha1 varchar(31) NOT NULL, us_mime varchar(255), - us_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE") default NULL, + us_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE") default NULL, us_image_width int unsigned, us_image_height int unsigned, us_image_bits smallint unsigned diff --git a/tests/phpunit/includes/GlobalFunctions/wfBCP47Test.php b/tests/phpunit/includes/GlobalFunctions/wfBCP47Test.php index f4ec7a5f89..4a0f406854 100644 --- a/tests/phpunit/includes/GlobalFunctions/wfBCP47Test.php +++ b/tests/phpunit/includes/GlobalFunctions/wfBCP47Test.php @@ -7,7 +7,7 @@ class wfBCP47 extends MediaWikiTestCase { * test @see wfBCP47(). * Please note the BCP explicitly state that language codes are case * insensitive, there are some exceptions to the rule :) - * This test is used to verify our formatting against all lower and + * This test is used to verify our formatting against all lower and * all upper cases language code. * * @see http://tools.ietf.org/html/bcp47 diff --git a/tests/phpunit/includes/MWNamespaceTest.php b/tests/phpunit/includes/MWNamespaceTest.php index 5de5cc95da..01d406a0d0 100644 --- a/tests/phpunit/includes/MWNamespaceTest.php +++ b/tests/phpunit/includes/MWNamespaceTest.php @@ -449,7 +449,7 @@ class MWNamespaceTest extends MediaWikiTestCase { * $wgCapitalLinkOverrides = array(); by default * $wgCapitalLinks = true; by default * This function test $wgCapitalLinks - * + * * Global setting correctness is tested against the NS_PROJECT and * NS_PROJECT_TALK namespaces since they are not hardcoded nor specials */ -- 2.20.1