From 8338476b8e0c57132a5b150f42ed47da95f370b9 Mon Sep 17 00:00:00 2001 From: Ori Livneh Date: Sat, 27 Jun 2015 12:54:40 -0700 Subject: [PATCH] Create a subdirectory for compatibility stubs Instead of littering includes/ with stub back-compat aliases, house such classes in includes/compat/. Change-Id: I4c1b83e35c8d6c18777a4a3e17d81023915cfb7f --- autoload.php | 8 ++++---- includes/Defines.php | 2 +- includes/Setup.php | 2 +- includes/{ => compat}/CdbCompat.php | 0 includes/{libs => compat}/normal/.gitignore | 0 includes/{libs => compat}/normal/UtfNormal.php | 0 includes/{libs => compat}/normal/UtfNormalDefines.php | 0 includes/{libs => compat}/normal/UtfNormalUtil.php | 0 maintenance/language/generateNormalizerDataAr.php | 2 +- maintenance/language/generateNormalizerDataMl.php | 2 +- 10 files changed, 8 insertions(+), 8 deletions(-) rename includes/{ => compat}/CdbCompat.php (100%) rename includes/{libs => compat}/normal/.gitignore (100%) rename includes/{libs => compat}/normal/UtfNormal.php (100%) rename includes/{libs => compat}/normal/UtfNormalDefines.php (100%) rename includes/{libs => compat}/normal/UtfNormalUtil.php (100%) diff --git a/autoload.php b/autoload.php index 917b022ea5..dcd8727264 100644 --- a/autoload.php +++ b/autoload.php @@ -202,9 +202,9 @@ $wgAutoloadLocalClasses = array( 'CategoryPage' => __DIR__ . '/includes/page/CategoryPage.php', 'CategoryPager' => __DIR__ . '/includes/specials/SpecialCategories.php', 'CategoryViewer' => __DIR__ . '/includes/CategoryViewer.php', - 'CdbException' => __DIR__ . '/includes/CdbCompat.php', - 'CdbReader' => __DIR__ . '/includes/CdbCompat.php', - 'CdbWriter' => __DIR__ . '/includes/CdbCompat.php', + 'CdbException' => __DIR__ . '/includes/compat/CdbCompat.php', + 'CdbReader' => __DIR__ . '/includes/compat/CdbCompat.php', + 'CdbWriter' => __DIR__ . '/includes/compat/CdbCompat.php', 'CgzCopyTransaction' => __DIR__ . '/maintenance/storage/recompressTracked.php', 'ChangePassword' => __DIR__ . '/maintenance/changePassword.php', 'ChangeTags' => __DIR__ . '/includes/changetags/ChangeTags.php', @@ -1307,7 +1307,7 @@ $wgAutoloadLocalClasses = array( 'UserloginTemplate' => __DIR__ . '/includes/templates/Userlogin.php', 'UserrightsPage' => __DIR__ . '/includes/specials/SpecialUserrights.php', 'UsersPager' => __DIR__ . '/includes/specials/SpecialListusers.php', - 'UtfNormal' => __DIR__ . '/includes/libs/normal/UtfNormal.php', + 'UtfNormal' => __DIR__ . '/includes/compat/normal/UtfNormal.php', 'UzConverter' => __DIR__ . '/languages/classes/LanguageUz.php', 'VFormHTMLForm' => __DIR__ . '/includes/htmlform/VFormHTMLForm.php', 'ValidateRegistrationFile' => __DIR__ . '/maintenance/validateRegistrationFile.php', diff --git a/includes/Defines.php b/includes/Defines.php index 262471eccc..d55bbcf819 100644 --- a/includes/Defines.php +++ b/includes/Defines.php @@ -198,7 +198,7 @@ define( 'LIST_OR', 4 ); /** * Unicode and normalisation related */ -require_once __DIR__ . '/libs/normal/UtfNormalDefines.php'; +require_once __DIR__ . '/compat/normal/UtfNormalDefines.php'; /**@{ * Hook support constants diff --git a/includes/Setup.php b/includes/Setup.php index 90fbf61a3e..0c1e99df8d 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -492,7 +492,7 @@ if ( !class_exists( 'AutoLoader' ) ) { MWExceptionHandler::installHandler(); -require_once "$IP/includes/libs/normal/UtfNormalUtil.php"; +require_once "$IP/includes/compat/normal/UtfNormalUtil.php"; $ps_default2 = Profiler::instance()->scopedProfileIn( $fname . '-defaults2' ); diff --git a/includes/CdbCompat.php b/includes/compat/CdbCompat.php similarity index 100% rename from includes/CdbCompat.php rename to includes/compat/CdbCompat.php diff --git a/includes/libs/normal/.gitignore b/includes/compat/normal/.gitignore similarity index 100% rename from includes/libs/normal/.gitignore rename to includes/compat/normal/.gitignore diff --git a/includes/libs/normal/UtfNormal.php b/includes/compat/normal/UtfNormal.php similarity index 100% rename from includes/libs/normal/UtfNormal.php rename to includes/compat/normal/UtfNormal.php diff --git a/includes/libs/normal/UtfNormalDefines.php b/includes/compat/normal/UtfNormalDefines.php similarity index 100% rename from includes/libs/normal/UtfNormalDefines.php rename to includes/compat/normal/UtfNormalDefines.php diff --git a/includes/libs/normal/UtfNormalUtil.php b/includes/compat/normal/UtfNormalUtil.php similarity index 100% rename from includes/libs/normal/UtfNormalUtil.php rename to includes/compat/normal/UtfNormalUtil.php diff --git a/maintenance/language/generateNormalizerDataAr.php b/maintenance/language/generateNormalizerDataAr.php index ac50d291e6..d029bf70b4 100644 --- a/maintenance/language/generateNormalizerDataAr.php +++ b/maintenance/language/generateNormalizerDataAr.php @@ -25,7 +25,7 @@ require_once __DIR__ . '/../Maintenance.php'; /** * Generates the normalizer data file for Arabic. - * For NFC see includes/libs/normal. + * For NFC see includes/compat/normal. * * @ingroup MaintenanceLanguage */ diff --git a/maintenance/language/generateNormalizerDataMl.php b/maintenance/language/generateNormalizerDataMl.php index 8580187d34..770a98c52d 100644 --- a/maintenance/language/generateNormalizerDataMl.php +++ b/maintenance/language/generateNormalizerDataMl.php @@ -25,7 +25,7 @@ require_once __DIR__ . '/../Maintenance.php'; /** * Generates the normalizer data file for Malayalam. - * For NFC see includes/libs/normal. + * For NFC see includes/compat/normal. * * @ingroup MaintenanceLanguage */ -- 2.20.1