Merge "It should not be possible for a RequestContext's WikiPage and Title to be...

[lhc/web/wiklou.git] / includes / normal / RandomTest.php

diff --git a/includes/normal/RandomTest.php b/includes/normal/RandomTest.php
index eb13757..23471e9 100644 (file)
--- a/includes/normal/RandomTest.php
+++ b/includes/normal/RandomTest.php
@@ -1,29 +1,29 @@
 <?php
-# Copyright (C) 2004 Brion Vibber <brion@pobox.com>
-# http://www.mediawiki.org/
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-# http://www.gnu.org/copyleft/gpl.html
-
 /**
  * Test feeds random 16-byte strings to both the pure PHP and ICU-based
  * UtfNormal::cleanUp() code paths, and checks to see if there's a
  * difference. Will run forever until it finds one or you kill it.
  *
+ * Copyright (C) 2004 Brion Vibber <brion@pobox.com>
+ * http://www.mediawiki.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
  * @ingroup UtfNormal
- * @access private
  */
 
 if( php_sapi_name() != 'cli' ) {
@@ -54,11 +54,7 @@ function donorm( $str ) {
 
        # UnicodeString constructor fails if the string ends with a head byte.
        # Add a junk char at the end, we'll strip it off
-       return rtrim( utf8_normalize( $str . "\x01", UNORM_NFC ), "\x01" );
-}
-
-function wfMsg($x) {
-       return $x;
+       return rtrim( utf8_normalize( $str . "\x01", UtfNormal::UNORM_NFC ), "\x01" );
 }
 
 function showDiffs( $a, $b ) {