"else if" to "elseif"

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index f4b9d59..195e106 100644 (file)
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -197,7 +197,7 @@ class UserMailer {
                $ret = wfRunHooks( 'AlternateUserMailer', array( $headers, $to, $from, $subject, $body ) );
                if ( $ret === false ) {
                        return Status::newGood();
-               } else if ( $ret !== true ) {
+               } elseif ( $ret !== true ) {
                        return Status::newFatal( 'php-mail-error', $ret );
                }
 

diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php
index bb3a039..54753f2 100644 (file)
--- a/includes/resourceloader/ResourceLoaderStartUpModule.php
+++ b/includes/resourceloader/ResourceLoaderStartUpModule.php
@@ -168,7 +168,7 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
                                }
                                // Modules with a group but no foreign source pass four arguments (name, timestamp, dependencies, group)
                                // to mw.loader.register()
-                               else if ( $module->getSource() === 'local' ) {
+                               elseif ( $module->getSource() === 'local' ) {
                                        $registrations[] = array(
                                                $name, $mtime,  $module->getDependencies(), $module->getGroup() );
                                }

diff --git a/includes/specials/SpecialAllmessages.php b/includes/specials/SpecialAllmessages.php
index da23f5b..45ba406 100644 (file)
--- a/includes/specials/SpecialAllmessages.php
+++ b/includes/specials/SpecialAllmessages.php
@@ -411,7 +411,7 @@ class AllmessagesTablePager extends TablePager {
        function getCellAttrs( $field, $value ){
                if( $this->mCurrentRow->am_customised && $field == 'am_title' ){
                        return array( 'rowspan' => '2', 'class' => $field );
-               } else if( $field == 'am_title' ) {
+               } elseif( $field == 'am_title' ) {
                        return array( 'class' => $field );
                } else {
                        return array( 'lang' => $this->langcode, 'dir' => $this->lang->getDir(), 'class' => $field );

diff --git a/includes/specials/SpecialPasswordReset.php b/includes/specials/SpecialPasswordReset.php
index 40cb956..b1189ad 100644 (file)
--- a/includes/specials/SpecialPasswordReset.php
+++ b/includes/specials/SpecialPasswordReset.php
@@ -50,7 +50,7 @@ class SpecialPasswordReset extends FormSpecialPage {
                $error = $this->canChangePassword( $user );
                if ( is_string( $error ) ) {
                        throw new ErrorPageError( 'internalerror', $error );
-               } else if ( !$error ) {
+               } elseif ( !$error ) {
                        throw new ErrorPageError( 'internalerror', 'resetpass_forbidden' );
                }
 
@@ -280,7 +280,7 @@ class SpecialPasswordReset extends FormSpecialPage {
 
                        $this->getOutput()->addHTML( Html::rawElement( 'pre', array(), $this->email->escaped() ) );
                }
-               
+
                $this->getOutput()->addWikiMsg( 'passwordreset-emailsent' );
                $this->getOutput()->returnToMain();
        }

diff --git a/languages/classes/LanguageSr.php b/languages/classes/LanguageSr.php
index 2a083df..28651b3 100644 (file)
--- a/languages/classes/LanguageSr.php
+++ b/languages/classes/LanguageSr.php
@@ -191,7 +191,7 @@ class SrConverter extends LanguageConverter {
 
                if( $variant == 'sr-ec' ) {
                        return (boolean) ($numCyrillic > $numLatin);
-               } else if( $variant == 'sr-el' ) {
+               } elseif( $variant == 'sr-el' ) {
                        return (boolean) ($numLatin > $numCyrillic);
                } else {
                        return false;

diff --git a/tests/phpunit/includes/GlobalFunctions/wfExpandUrlTest.php b/tests/phpunit/includes/GlobalFunctions/wfExpandUrlTest.php
index 6c165e7..192689f 100644 (file)
--- a/tests/phpunit/includes/GlobalFunctions/wfExpandUrlTest.php
+++ b/tests/phpunit/includes/GlobalFunctions/wfExpandUrlTest.php
@@ -12,16 +12,16 @@ class wfExpandUrl extends MediaWikiTestCase {
                $oldCanServer = $wgCanonicalServer;
                $wgServer = $server;
                $wgCanonicalServer = $canServer;
-               
+
                // Fake $_SERVER['HTTPS'] if needed
                if ( $httpsMode ) {
                        $_SERVER['HTTPS'] = 'on';
                } else {
                        unset( $_SERVER['HTTPS'] );
                }
-               
+
                $this->assertEquals( $fullUrl, wfExpandUrl( $shortUrl, $defaultProto ), $message );
-               
+
                // Restore $wgServer and $wgCanonicalServer
                $wgServer = $oldServer;
                $wgCanonicalServer = $oldCanServer;
@@ -36,7 +36,7 @@ class wfExpandUrl extends MediaWikiTestCase {
                $modes = array( 'http', 'https' );
                $servers = array( 'http' => 'http://example.com', 'https' => 'https://example.com', 'protocol-relative' => '//example.com' );
                $defaultProtos = array( 'http' => PROTO_HTTP, 'https' => PROTO_HTTPS, 'protocol-relative' => PROTO_RELATIVE, 'current' => PROTO_CURRENT, 'canonical' => PROTO_CANONICAL );
-               
+
                $retval = array();
                foreach ( $modes as $mode ) {
                        $httpsMode = $mode == 'https';
@@ -48,14 +48,14 @@ class wfExpandUrl extends MediaWikiTestCase {
                                                $retval[] = array( 'https://example.com', 'https://example.com', $defaultProto, $server, $canServer, $httpsMode, "Testing fully qualified https URLs (no need to expand) (defaultProto: $protoDesc , wgServer: $server, wgCanonicalServer: $canServer, current request protocol: $mode )" );
                                                # Would be nice to support this, see fixme on wfExpandUrl()
                                                $retval[] = array( "wiki/FooBar", 'wiki/FooBar', $defaultProto, $server, $canServer, $httpsMode, "Test non-expandable relative URLs (defaultProto: $protoDesc , wgServer: $server, wgCanonicalServer: $canServer, current request protocol: $mode )" );
-                                               
+
                                                // Determine expected protocol
                                                $p = $protoDesc . ':'; // default case
                                                if ( $protoDesc == 'protocol-relative' ) {
                                                        $p = '';
-                                               } else if ( $protoDesc == 'current' ) {
+                                               } elseif ( $protoDesc == 'current' ) {
                                                        $p = "$mode:";
-                                               } else if ( $protoDesc == 'canonical' ) {
+                                               } elseif ( $protoDesc == 'canonical' ) {
                                                        $p = "$canServerMode:";
                                                } else {
                                                        $p = $protoDesc . ':';
@@ -63,12 +63,12 @@ class wfExpandUrl extends MediaWikiTestCase {
                                                // Determine expected server name
                                                if ( $protoDesc == 'canonical' ) {
                                                        $srv = $canServer;
-                                               } else if ( $serverDesc == 'protocol-relative' ) {
+                                               } elseif ( $serverDesc == 'protocol-relative' ) {
                                                        $srv = $p . $server;
                                                } else {
                                                        $srv = $server;
                                                }
-                                               
+
                                                $retval[] = array( "$p//wikipedia.org", '//wikipedia.org', $defaultProto, $server, $canServer, $httpsMode, "Test protocol-relative URL (defaultProto: $protoDesc, wgServer: $server, wgCanonicalServer: $canServer, current request protocol: $mode )" );
                                                $retval[] = array( "$srv/wiki/FooBar", '/wiki/FooBar', $defaultProto, $server, $canServer, $httpsMode, "Testing expanding URL beginning with / (defaultProto: $protoDesc , wgServer: $server, wgCanonicalServer: $canServer, current request protocol: $mode )" );
                                        }