Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/281266
Change subject: Make 4 methods private in IcuCollation
......................................................................
Make 4 methods private in IcuCollation
These have no usages in core or extensions.
These were not previously explictly marked as
public.
Change-Id: I9a42260238eadc115d4eb1c8d5c2e331f5700ad0
---
M RELEASE-NOTES-1.27
M includes/collation/IcuCollation.php
2 files changed, 10 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/66/281266/1
diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index 0aebf38..ea31187 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -403,6 +403,10 @@
* Title::newFromRedirectArray() was removed (deprecated in 1.21).
* UserMailer::send() no longer accepts $replyto as the 5th argument and
$contentType
as the 6th. These must be passed in the options array now.
+* IcuCollation::getSortKeyByLetterIndex was made private.
+* IcuCollation::getFirstLetterCount was made private.
+* IcuCollation::getFirstLetterData was made private.
+* IcuCollation::getLetterByIndex was made private.
== Compatibility ==
diff --git a/includes/collation/IcuCollation.php
b/includes/collation/IcuCollation.php
index 0aa1406..12b26ca 100644
--- a/includes/collation/IcuCollation.php
+++ b/includes/collation/IcuCollation.php
@@ -232,10 +232,7 @@
return $this->getLetterByIndex( $min );
}
- /**
- * @since 1.16.3
- */
- public function getFirstLetterData() {
+ private function getFirstLetterData() {
if ( $this->firstLetterData !== null ) {
return $this->firstLetterData;
}
@@ -386,30 +383,21 @@
return $data;
}
- /**
- * @since 1.16.3
- */
- public function getLetterByIndex( $index ) {
+ private function getLetterByIndex( $index ) {
if ( $this->firstLetterData === null ) {
$this->getFirstLetterData();
}
return $this->firstLetterData['chars'][$index];
}
- /**
- * @since 1.16.3
- */
- public function getSortKeyByLetterIndex( $index ) {
+ private function getSortKeyByLetterIndex( $index ) {
if ( $this->firstLetterData === null ) {
$this->getFirstLetterData();
}
return $this->firstLetterData['keys'][$index];
}
- /**
- * @since 1.16.3
- */
- public function getFirstLetterCount() {
+ private function getFirstLetterCount() {
if ( $this->firstLetterData === null ) {
$this->getFirstLetterData();
}
@@ -440,7 +428,7 @@
* @since 1.21
* @return string|bool
*/
- static function getICUVersion() {
+ public static function getICUVersion() {
return defined( 'INTL_ICU_VERSION' ) ? INTL_ICU_VERSION : false;
}
@@ -451,7 +439,7 @@
* @since 1.21
* @return string|bool
*/
- static function getUnicodeVersionForICU() {
+ public static function getUnicodeVersionForICU() {
$icuVersion = IcuCollation::getICUVersion();
if ( !$icuVersion ) {
return false;
--
To view, visit https://gerrit.wikimedia.org/r/281266
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a42260238eadc115d4eb1c8d5c2e331f5700ad0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
