From c8900f30af1c45c07092284f1552e1010a02e82f Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Wed, 7 Jan 2015 10:41:51 -0800 Subject: [PATCH] Move includes/normal to includes/libs/normal Change-Id: Ib530ad9dbe1d3a33dc53ef8b9620f61d4e1a2d62 --- autoload.php | 2 +- includes/Defines.php | 2 +- includes/Setup.php | 2 +- includes/{ => libs}/normal/.gitignore | 0 includes/{ => libs}/normal/Makefile | 0 includes/{ => libs}/normal/README | 0 includes/{ => libs}/normal/RandomTest.php | 0 includes/{ => libs}/normal/Utf8Test.php | 0 includes/{ => libs}/normal/UtfNormal.php | 0 includes/{ => libs}/normal/UtfNormalBench.php | 0 includes/{ => libs}/normal/UtfNormalData.inc | 0 includes/{ => libs}/normal/UtfNormalDataK.inc | 0 includes/{ => libs}/normal/UtfNormalDefines.php | 0 includes/{ => libs}/normal/UtfNormalGenerate.php | 0 includes/{ => libs}/normal/UtfNormalMemStress.php | 0 includes/{ => libs}/normal/UtfNormalTest.php | 0 includes/{ => libs}/normal/UtfNormalTest2.php | 0 includes/{ => libs}/normal/UtfNormalUtil.php | 0 maintenance/language/generateNormalizerDataAr.php | 2 +- maintenance/language/generateNormalizerDataMl.php | 2 +- tests/phpunit/includes/{ => libs}/normal/CleanUpTest.php | 2 +- 21 files changed, 6 insertions(+), 6 deletions(-) rename includes/{ => libs}/normal/.gitignore (100%) rename includes/{ => libs}/normal/Makefile (100%) rename includes/{ => libs}/normal/README (100%) rename includes/{ => libs}/normal/RandomTest.php (100%) rename includes/{ => libs}/normal/Utf8Test.php (100%) rename includes/{ => libs}/normal/UtfNormal.php (100%) rename includes/{ => libs}/normal/UtfNormalBench.php (100%) rename includes/{ => libs}/normal/UtfNormalData.inc (100%) rename includes/{ => libs}/normal/UtfNormalDataK.inc (100%) rename includes/{ => libs}/normal/UtfNormalDefines.php (100%) rename includes/{ => libs}/normal/UtfNormalGenerate.php (100%) rename includes/{ => libs}/normal/UtfNormalMemStress.php (100%) rename includes/{ => libs}/normal/UtfNormalTest.php (100%) rename includes/{ => libs}/normal/UtfNormalTest2.php (100%) rename includes/{ => libs}/normal/UtfNormalUtil.php (100%) rename tests/phpunit/includes/{ => libs}/normal/CleanUpTest.php (99%) diff --git a/autoload.php b/autoload.php index 11b5266458..2015f5941b 100644 --- a/autoload.php +++ b/autoload.php @@ -1268,7 +1268,7 @@ $wgAutoloadLocalClasses = array( 'UserloginTemplate' => __DIR__ . '/includes/templates/Userlogin.php', 'UserrightsPage' => __DIR__ . '/includes/specials/SpecialUserrights.php', 'UsersPager' => __DIR__ . '/includes/specials/SpecialListusers.php', - 'UtfNormal' => __DIR__ . '/includes/normal/UtfNormal.php', + 'UtfNormal' => __DIR__ . '/includes/libs/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 d63d5ca395..8456c5dd6a 100644 --- a/includes/Defines.php +++ b/includes/Defines.php @@ -203,7 +203,7 @@ define( 'LIST_OR', 4 ); /** * Unicode and normalisation related */ -require_once __DIR__ . '/normal/UtfNormalDefines.php'; +require_once __DIR__ . '/libs/normal/UtfNormalDefines.php'; /**@{ * Hook support constants diff --git a/includes/Setup.php b/includes/Setup.php index ed0aabe8e7..6939f9561c 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -479,7 +479,7 @@ if ( !class_exists( 'AutoLoader' ) ) { MWExceptionHandler::installHandler(); -require_once "$IP/includes/normal/UtfNormalUtil.php"; +require_once "$IP/includes/libs/normal/UtfNormalUtil.php"; $ps_default2 = Profiler::instance()->scopedProfileIn( $fname . '-defaults2' ); diff --git a/includes/normal/.gitignore b/includes/libs/normal/.gitignore similarity index 100% rename from includes/normal/.gitignore rename to includes/libs/normal/.gitignore diff --git a/includes/normal/Makefile b/includes/libs/normal/Makefile similarity index 100% rename from includes/normal/Makefile rename to includes/libs/normal/Makefile diff --git a/includes/normal/README b/includes/libs/normal/README similarity index 100% rename from includes/normal/README rename to includes/libs/normal/README diff --git a/includes/normal/RandomTest.php b/includes/libs/normal/RandomTest.php similarity index 100% rename from includes/normal/RandomTest.php rename to includes/libs/normal/RandomTest.php diff --git a/includes/normal/Utf8Test.php b/includes/libs/normal/Utf8Test.php similarity index 100% rename from includes/normal/Utf8Test.php rename to includes/libs/normal/Utf8Test.php diff --git a/includes/normal/UtfNormal.php b/includes/libs/normal/UtfNormal.php similarity index 100% rename from includes/normal/UtfNormal.php rename to includes/libs/normal/UtfNormal.php diff --git a/includes/normal/UtfNormalBench.php b/includes/libs/normal/UtfNormalBench.php similarity index 100% rename from includes/normal/UtfNormalBench.php rename to includes/libs/normal/UtfNormalBench.php diff --git a/includes/normal/UtfNormalData.inc b/includes/libs/normal/UtfNormalData.inc similarity index 100% rename from includes/normal/UtfNormalData.inc rename to includes/libs/normal/UtfNormalData.inc diff --git a/includes/normal/UtfNormalDataK.inc b/includes/libs/normal/UtfNormalDataK.inc similarity index 100% rename from includes/normal/UtfNormalDataK.inc rename to includes/libs/normal/UtfNormalDataK.inc diff --git a/includes/normal/UtfNormalDefines.php b/includes/libs/normal/UtfNormalDefines.php similarity index 100% rename from includes/normal/UtfNormalDefines.php rename to includes/libs/normal/UtfNormalDefines.php diff --git a/includes/normal/UtfNormalGenerate.php b/includes/libs/normal/UtfNormalGenerate.php similarity index 100% rename from includes/normal/UtfNormalGenerate.php rename to includes/libs/normal/UtfNormalGenerate.php diff --git a/includes/normal/UtfNormalMemStress.php b/includes/libs/normal/UtfNormalMemStress.php similarity index 100% rename from includes/normal/UtfNormalMemStress.php rename to includes/libs/normal/UtfNormalMemStress.php diff --git a/includes/normal/UtfNormalTest.php b/includes/libs/normal/UtfNormalTest.php similarity index 100% rename from includes/normal/UtfNormalTest.php rename to includes/libs/normal/UtfNormalTest.php diff --git a/includes/normal/UtfNormalTest2.php b/includes/libs/normal/UtfNormalTest2.php similarity index 100% rename from includes/normal/UtfNormalTest2.php rename to includes/libs/normal/UtfNormalTest2.php diff --git a/includes/normal/UtfNormalUtil.php b/includes/libs/normal/UtfNormalUtil.php similarity index 100% rename from includes/normal/UtfNormalUtil.php rename to includes/libs/normal/UtfNormalUtil.php diff --git a/maintenance/language/generateNormalizerDataAr.php b/maintenance/language/generateNormalizerDataAr.php index ece0450fd5..29e4d2a55a 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/normal. + * For NFC see includes/libs/normal. * * @ingroup MaintenanceLanguage */ diff --git a/maintenance/language/generateNormalizerDataMl.php b/maintenance/language/generateNormalizerDataMl.php index c7237cfed7..8ed3c32fbd 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/normal. + * For NFC see includes/libs/normal. * * @ingroup MaintenanceLanguage */ diff --git a/tests/phpunit/includes/normal/CleanUpTest.php b/tests/phpunit/includes/libs/normal/CleanUpTest.php similarity index 99% rename from tests/phpunit/includes/normal/CleanUpTest.php rename to tests/phpunit/includes/libs/normal/CleanUpTest.php index af83767e57..909b0fe876 100644 --- a/tests/phpunit/includes/normal/CleanUpTest.php +++ b/tests/phpunit/includes/libs/normal/CleanUpTest.php @@ -39,7 +39,7 @@ * to use data providers (bug 46561). * @codeCoverageIgnore */ -class CleanUpTest extends MediaWikiTestCase { +class CleanUpTest extends PHPUnit_Framework_TestCase { public function testAscii() { $text = 'This is plain ASCII text.'; $this->assertEquals( $text, UtfNormal::cleanUp( $text ) ); -- 2.20.1