jenkins-bot has submitted this change and it was merged.

Change subject: Prefer __DIR__ to $dir
......................................................................


Prefer __DIR__ to $dir

__DIR__ is the more common idiom these days, and there is absolutely no
advantage (in fact, there's a slight performance penalty) to storing it in a
variable. Use alternate syntax for declaring autoload classes to avoid
exceeding line length limits or having to break lines in unsightly ways.

Change-Id: I20211539ccc17937b141331c1875f219a92b1483
---
M UniversalLanguageSelector.php
1 file changed, 10 insertions(+), 9 deletions(-)

Approvals:
  Siebrand: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php
index 12cae2b..eb586b4 100644
--- a/UniversalLanguageSelector.php
+++ b/UniversalLanguageSelector.php
@@ -137,17 +137,18 @@
  */
 $wgULSNoWebfontsSelectors = array( '#p-lang li > a' );
 
-$dir = __DIR__;
-
 // Internationalization
-$wgExtensionMessagesFiles['UniversalLanguageSelector'] = 
"$dir/UniversalLanguageSelector.i18n.php";
+$wgExtensionMessagesFiles['UniversalLanguageSelector'] =
+       __DIR__ . '/UniversalLanguageSelector.i18n.php';
 
 // Register auto load for the page class
-$wgAutoloadClasses['UniversalLanguageSelectorHooks'] = 
"$dir/UniversalLanguageSelector.hooks.php";
-$wgAutoloadClasses['ResourceLoaderULSModule'] = 
"$dir/ResourceLoaderULSModule.php";
-$wgAutoloadClasses['ApiLanguageSearch'] = "$dir/api/ApiLanguageSearch.php";
-$wgAutoloadClasses['ApiULSLocalization'] = "$dir/api/ApiULSLocalization.php";
-$wgAutoloadClasses['LanguageNameSearch'] = "$dir/data/LanguageNameSearch.php";
+$wgAutoloadClasses += array(
+       'UniversalLanguageSelectorHooks' => __DIR__ . 
'/UniversalLanguageSelector.hooks.php',
+       'ResourceLoaderULSModule' => __DIR__ . '/ResourceLoaderULSModule.php',
+       'ApiLanguageSearch' => __DIR__ . '/api/ApiLanguageSearch.php',
+       'ApiULSLocalization' => __DIR__ . '/api/ApiULSLocalization.php',
+       'LanguageNameSearch' => __DIR__ . '/data/LanguageNameSearch.php',
+);
 
 $wgHooks['BeforePageDisplay'][] = 'UniversalLanguageSelectorHooks::addModules';
 $wgHooks['PersonalUrls'][] = 
'UniversalLanguageSelectorHooks::addPersonalBarTrigger';
@@ -196,4 +197,4 @@
        return true;
 };
 
-require "$dir/Resources.php";
+require __DIR__ . '/Resources.php';

-- 
To view, visit https://gerrit.wikimedia.org/r/89630
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I20211539ccc17937b141331c1875f219a92b1483
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Siebrand <siebr...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to