Merge "resourceloader: remove redundant mw.loader type-checks"

diff --git a/languages/messages/MessagesGom_deva.php b/languages/messages/MessagesGom_deva.php
index fc65e58..1cf80ce 100644 (file)
--- a/languages/messages/MessagesGom_deva.php
+++ b/languages/messages/MessagesGom_deva.php
@@ -7,16 +7,17 @@
  * @file
  *
  * @author Darshan kandolkar
+ * @author The Discoverer
  */
 
 $fallback = 'hi';
 
 $namespaceNames = [
-       NS_MEDIA            => 'मिडिया',
+       NS_MEDIA            => 'माधà¥\8dयम',
        NS_SPECIAL          => 'विशेश',
        NS_TALK             => 'चर्चा',
-       NS_USER             => 'à¤\89पà¥\87à¤\97à¤\95रà¥\8dतà¥\8b',
-       NS_USER_TALK        => 'à¤\89पà¥\87à¤\97à¤\95रà¥\8dतà¥\8b_चर्चा',
+       NS_USER             => 'वापरपà¥\80',
+       NS_USER_TALK        => 'वापरपà¥\80_चर्चा',
        NS_PROJECT_TALK     => '$1_चर्चा',
        NS_FILE             => 'फायल',
        NS_FILE_TALK        => 'फायल_चर्चा',
@@ -24,8 +25,18 @@ $namespaceNames = [
        NS_MEDIAWIKI_TALK   => 'मिडियाविकी_चर्चा',
        NS_TEMPLATE         => 'प्रारूप',
        NS_TEMPLATE_TALK    => 'प्रारूप_चर्चा',
-       NS_HELP             => 'मजत',
-       NS_HELP_TALK        => 'मजत_चर्चा',
-       NS_CATEGORY         => 'श्रेणी',
-       NS_CATEGORY_TALK    => 'श्रेणी_चर्चा',
+       NS_HELP             => 'आदार',
+       NS_HELP_TALK        => 'आदार_चर्चा',
+       NS_CATEGORY         => 'वर्ग',
+       NS_CATEGORY_TALK    => 'वर्ग_चर्चा',
+];
+
+$namespaceAliases = [
+       'मजत' => NS_HELP,
+       'मजत_चर्चा' => NS_HELP_TALK,
+       'श्रेणी' => NS_CATEGORY,
+       'श्रेणी_चर्चा' => NS_CATEGORY_TALK,
+       'मिडिया' => NS_MEDIA,
+       'उपेगकर्तो' => NS_USER,
+       'उपेगकर्तो चर्चा' => NS_USER_TALK
 ];

diff --git a/resources/src/mediawiki.special/mediawiki.special.search.styles.css b/resources/src/mediawiki.special/mediawiki.special.search.styles.css
index ae3c01b..e7a5865 100644 (file)
--- a/resources/src/mediawiki.special/mediawiki.special.search.styles.css
+++ b/resources/src/mediawiki.special/mediawiki.special.search.styles.css
@@ -18,16 +18,18 @@
        margin: 1em 0 1em .4em;
 }
 /* needs extra specificity to override `.mw-body p` selector */
-.mw-body p.mw-search-nonefound {
+.mw-body .mw-search-nonefound {
        margin: 0;
 }
-.mw-search-interwiki-header {
+.mw-search-interwiki-header,
+.searchdidyoumean em,
+.searchmatch {
        font-weight: bold;
 }
 .mw-search-nonefound + .mw-search-interwiki-header {
        margin-top: 0;
 }
-div.searchresult {
+.searchresult {
        font-size: 95%;
        width: 38em;
 }
@@ -55,32 +57,32 @@ div.searchresult {
        margin-top: 1em;
        border: 1px solid #c0c0c0;
 }
-.mw-search-profile-tabs div.search-types {
+.search-types {
        float: left;
        padding-left: 0.25em;
 }
-.mw-search-profile-tabs div.search-types ul {
+.search-types ul {
        margin: 0;
        padding: 0;
        list-style: none;
 }
-.mw-search-profile-tabs div.search-types ul li {
+.search-types li {
        float: left;
        margin: 0;
        padding: 0;
 }
-.mw-search-profile-tabs div.search-types ul li a {
+.search-types a {
        display: block;
        padding: 0.5em;
 }
-.mw-search-profile-tabs div.search-types ul li.current a {
+.search-types .current a {
        color: #333;
        cursor: default;
 }
-.mw-search-profile-tabs div.search-types ul li.current a:hover {
+.search-types .current a:hover {
        text-decoration: none;
 }
-#mw-search-top-table div.results-info {
+.results-info {
        float: right;
        padding: 0.5em;
        padding-right: 0.75em;
@@ -91,55 +93,55 @@ div.searchresult {
        float: left;
        width: 100%;
 }
-fieldset#mw-searchoptions {
+#mw-searchoptions {
        margin: 0;
        padding: 0.5em 0.75em 0.75em 0.75em;
-       border: none;
        background-color: #f9f9f9;
        border: 1px solid #c0c0c0;
        border-top-width: 0;
 }
-fieldset#mw-searchoptions legend {
+#mw-searchoptions legend {
        display: none;
 }
-fieldset#mw-searchoptions h4 {
+#mw-searchoptions h4 {
        padding: 0;
        margin: 0;
        float: left;
 }
-fieldset#mw-searchoptions table {
+#mw-searchoptions table {
        float: left;
        margin-right: 3em;
        border-collapse: collapse;
 }
-fieldset#mw-searchoptions table td {
+#mw-searchoptions table td {
        padding: 0 1em 0 0;
        white-space: nowrap;
 }
-fieldset#mw-searchoptions div.divider {
+#mw-searchoptions .divider {
        clear: both;
        border-bottom: 1px solid #ddd;
        padding-top: 0.5em;
        margin-bottom: 0.5em;
 }
-td#mw-search-menu {
+#mw-search-menu {
        padding-left: 6em;
        font-size: 85%;
 }
-div#mw-search-interwiki {
+#mw-search-interwiki {
        float: right;
        width: 18em;
        border: 1px solid #aaa;
        margin-top: 2ex;
 }
-div#mw-search-interwiki li {
+.searchalttitle,
+#mw-search-interwiki li {
        font-size: 95%;
 }
 .mw-search-interwiki-more {
        float: right;
        font-size: 90%;
 }
-div#mw-search-interwiki-caption {
+#mw-search-interwiki-caption {
        text-align: center;
        font-weight: bold;
        font-size: 95%;
@@ -151,18 +153,9 @@ div#mw-search-interwiki-caption {
        background-color: #ececec;
        border-top: 1px solid #bbb;
 }
-span.searchalttitle {
-       font-size: 95%;
-}
-div.searchdidyoumean {
+.searchdidyoumean {
        font-size: 127%;
        margin-top: 0.8em;
        /* Note that this color won't affect the link, as desired. */
        color: #c00;
 }
-div.searchdidyoumean em {
-       font-weight: bold;
-}
-.searchmatch {
-       font-weight: bold;
-}

diff --git a/tests/phpunit/includes/api/ApiLoginTest.php b/tests/phpunit/includes/api/ApiLoginTest.php
index 2f8ffcc..155a9dd 100644 (file)
--- a/tests/phpunit/includes/api/ApiLoginTest.php
+++ b/tests/phpunit/includes/api/ApiLoginTest.php
@@ -19,7 +19,7 @@ class ApiLoginTest extends ApiTestCase {
                        'wsTokenSecrets' => [ 'login' => 'foobar' ],
                ];
                $data = $this->doApiRequest( [ 'action' => 'login',
-                       'lgname' => '', 'lgpassword' => self::$users['sysop']->password,
+                       'lgname' => '', 'lgpassword' => self::$users['sysop']->getPassword(),
                        'lgtoken' => (string)( new MediaWiki\Session\Token( 'foobar', '' ) )
                ], $session );
                $this->assertEquals( $wgDisableAuthManager ? 'NoName' : 'Failed', $data[0]['login']['result'] );
@@ -29,6 +29,7 @@ class ApiLoginTest extends ApiTestCase {
                global $wgServer, $wgDisableAuthManager;
 
                $user = self::$users['sysop'];
+               $userName = $user->getUser()->getName();
                $user->getUser()->logout();
 
                if ( !isset( $wgServer ) ) {
@@ -36,7 +37,7 @@ class ApiLoginTest extends ApiTestCase {
                }
                $ret = $this->doApiRequest( [
                        "action" => "login",
-                       "lgname" => $user->username,
+                       "lgname" => $userName,
                        "lgpassword" => "bad",
                ] );
 
@@ -52,7 +53,7 @@ class ApiLoginTest extends ApiTestCase {
                        [
                                "action" => "login",
                                "lgtoken" => $token,
-                               "lgname" => $user->username,
+                               "lgname" => $userName,
                                "lgpassword" => "badnowayinhell",
                        ],
                        $ret[2]
@@ -74,12 +75,14 @@ class ApiLoginTest extends ApiTestCase {
                }
 
                $user = self::$users['sysop'];
+               $userName = $user->getUser()->getName();
+               $password = $user->getPassword();
                $user->getUser()->logout();
 
                $ret = $this->doApiRequest( [
                                "action" => "login",
-                               "lgname" => $user->username,
-                               "lgpassword" => $user->password,
+                               "lgname" => $userName,
+                               "lgpassword" => $password,
                        ]
                );
 
@@ -95,8 +98,8 @@ class ApiLoginTest extends ApiTestCase {
                        [
                                "action" => "login",
                                "lgtoken" => $token,
-                               "lgname" => $user->username,
-                               "lgpassword" => $user->password,
+                               "lgname" => $userName,
+                               "lgpassword" => $password,
                        ],
                        $ret[2]
                );
@@ -122,12 +125,14 @@ class ApiLoginTest extends ApiTestCase {
                        $this->markTestIncomplete( 'This test needs $wgServer to be set in LocalSettings.php' );
                }
                $user = self::$users['sysop'];
+               $userName = $user->getUser()->getName();
+               $password = $user->getPassword();
 
                $req = MWHttpRequest::factory( self::$apiUrl . "?action=login&format=xml",
                        [ "method" => "POST",
                                "postData" => [
-                                       "lgname" => $user->username,
-                                       "lgpassword" => $user->password
+                                       "lgname" => $userName,
+                                       "lgpassword" => $password
                                ]
                        ],
                        __METHOD__
@@ -146,8 +151,8 @@ class ApiLoginTest extends ApiTestCase {
 
                $req->setData( [
                        "lgtoken" => $token,
-                       "lgname" => $user->username,
-                       "lgpassword" => $user->password ] );
+                       "lgname" => $userName,
+                       "lgpassword" => $password ] );
                $req->execute();
 
                $cj = $req->getCookieJar();
@@ -162,11 +167,14 @@ class ApiLoginTest extends ApiTestCase {
        }
 
        public function testRunLogin() {
-               $sysopUser = self::$users['sysop'];
+               $user = self::$users['sysop'];
+               $userName = $user->getUser()->getName();
+               $password = $user->getPassword();
+
                $data = $this->doApiRequest( [
                        'action' => 'login',
-                       'lgname' => $sysopUser->username,
-                       'lgpassword' => $sysopUser->password ] );
+                       'lgname' => $userName,
+                       'lgpassword' => $password ] );
 
                $this->assertArrayHasKey( "login", $data[0] );
                $this->assertArrayHasKey( "result", $data[0]['login'] );
@@ -176,8 +184,8 @@ class ApiLoginTest extends ApiTestCase {
                $data = $this->doApiRequest( [
                        'action' => 'login',
                        "lgtoken" => $token,
-                       "lgname" => $sysopUser->username,
-                       "lgpassword" => $sysopUser->password ], $data[2] );
+                       "lgname" => $userName,
+                       "lgpassword" => $password ], $data[2] );
 
                $this->assertArrayHasKey( "login", $data[0] );
                $this->assertArrayHasKey( "result", $data[0]['login'] );
@@ -244,7 +252,7 @@ class ApiLoginTest extends ApiTestCase {
                        __METHOD__
                );
 
-               $lgName = $user->username . BotPassword::getSeparator() . 'foo';
+               $lgName = $user->getUser()->getName() . BotPassword::getSeparator() . 'foo';
 
                $ret = $this->doApiRequest( [
                        'action' => 'login',

diff --git a/tests/phpunit/includes/api/ApiTestCase.php b/tests/phpunit/includes/api/ApiTestCase.php
index e90b46f..31f3daa 100644 (file)
--- a/tests/phpunit/includes/api/ApiTestCase.php
+++ b/tests/phpunit/includes/api/ApiTestCase.php
@@ -158,8 +158,8 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
 
                $data = $this->doApiRequest( [
                        'action' => 'login',
-                       'lgname' => $testUser->username,
-                       'lgpassword' => $testUser->password ] );
+                       'lgname' => $testUser->getUser()->getName(),
+                       'lgpassword' => $testUser->getPassword() ] );
 
                $token = $data[0]['login']['token'];
 
@@ -167,8 +167,8 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
                        [
                                'action' => 'login',
                                'lgtoken' => $token,
-                               'lgname' => $testUser->username,
-                               'lgpassword' => $testUser->password,
+                               'lgname' => $testUser->getUser()->getName(),
+                               'lgpassword' => $testUser->getPassword(),
                        ],
                        $data[2]
                );

diff --git a/tests/phpunit/includes/api/ApiUploadTest.php b/tests/phpunit/includes/api/ApiUploadTest.php
index 873917e..de2b56b 100644 (file)
--- a/tests/phpunit/includes/api/ApiUploadTest.php
+++ b/tests/phpunit/includes/api/ApiUploadTest.php
@@ -27,11 +27,13 @@ class ApiUploadTest extends ApiTestCaseUpload {
         */
        public function testLogin() {
                $user = self::$users['uploader'];
+               $userName = $user->getUser()->getName();
+               $password = $user->getPassword();
 
                $params = [
                        'action' => 'login',
-                       'lgname' => $user->username,
-                       'lgpassword' => $user->password
+                       'lgname' => $userName,
+                       'lgpassword' => $password
                ];
                list( $result, , $session ) = $this->doApiRequest( $params );
                $this->assertArrayHasKey( "login", $result );
@@ -42,8 +44,8 @@ class ApiUploadTest extends ApiTestCaseUpload {
                $params = [
                        'action' => 'login',
                        'lgtoken' => $token,
-                       'lgname' => $user->username,
-                       'lgpassword' => $user->password
+                       'lgname' => $userName,
+                       'lgpassword' => $password
                ];
                list( $result, , $session ) = $this->doApiRequest( $params, $session );
                $this->assertArrayHasKey( "login", $result );

diff --git a/tests/phpunit/includes/user/BotPasswordTest.php b/tests/phpunit/includes/user/BotPasswordTest.php
index 1ef5082..cfd5f78 100644 (file)
--- a/tests/phpunit/includes/user/BotPasswordTest.php
+++ b/tests/phpunit/includes/user/BotPasswordTest.php
@@ -290,7 +290,7 @@ class BotPasswordTest extends MediaWikiTestCase {
 
                // Wrong password
                $status = BotPassword::login(
-                       "{$this->testUserName}@BotPassword", $this->testUser->password, new FauxRequest );
+                       "{$this->testUserName}@BotPassword", $this->testUser->getPassword(), new FauxRequest );
                $this->assertEquals( Status::newFatal( 'wrongpassword' ), $status );
 
                // Success!