jenkins-bot has submitted this change and it was merged.
Change subject: Move includes/normal to includes/libs/normal
......................................................................
Move includes/normal to includes/libs/normal
Change-Id: Ib530ad9dbe1d3a33dc53ef8b9620f61d4e1a2d62
---
M autoload.php
M includes/Defines.php
M includes/Setup.php
R includes/libs/normal/.gitignore
R includes/libs/normal/Makefile
R includes/libs/normal/README
R includes/libs/normal/RandomTest.php
R includes/libs/normal/Utf8Test.php
R includes/libs/normal/UtfNormal.php
R includes/libs/normal/UtfNormalBench.php
R includes/libs/normal/UtfNormalData.inc
R includes/libs/normal/UtfNormalDataK.inc
R includes/libs/normal/UtfNormalDefines.php
R includes/libs/normal/UtfNormalGenerate.php
R includes/libs/normal/UtfNormalMemStress.php
R includes/libs/normal/UtfNormalTest.php
R includes/libs/normal/UtfNormalTest2.php
R includes/libs/normal/UtfNormalUtil.php
M maintenance/language/generateNormalizerDataAr.php
M maintenance/language/generateNormalizerDataMl.php
R tests/phpunit/includes/libs/normal/CleanUpTest.php
21 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/autoload.php b/autoload.php
index 11b5266..2015f59 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1268,7 +1268,7 @@
'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 d63d5ca..8456c5d 100644
--- a/includes/Defines.php
+++ b/includes/Defines.php
@@ -203,7 +203,7 @@
/**
* 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 ed0aabe..6939f95 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -479,7 +479,7 @@
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 ece0450..29e4d2a 100644
--- a/maintenance/language/generateNormalizerDataAr.php
+++ b/maintenance/language/generateNormalizerDataAr.php
@@ -25,7 +25,7 @@
/**
* 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 c7237cf..8ed3c32 100644
--- a/maintenance/language/generateNormalizerDataMl.php
+++ b/maintenance/language/generateNormalizerDataMl.php
@@ -25,7 +25,7 @@
/**
* 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 af83767..909b0fe 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 ) );
--
To view, visit https://gerrit.wikimedia.org/r/183290
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib530ad9dbe1d3a33dc53ef8b9620f61d4e1a2d62
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Parent5446 <tylerro...@gmail.com>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
