MediaWiki 1.16.0

[autoinstallsdev/mediawiki.git] / includes / normal / RandomTest.php

diff --git a/includes/normal/RandomTest.php b/includes/normal/RandomTest.php
index e85ec420eadbba1a27617f8ebb247fb4df2a7cd6..eb1375744e66f87f0d6f5c04c53aa30888227653 100644 (file)
--- a/includes/normal/RandomTest.php
+++ b/includes/normal/RandomTest.php
@@ -1,28 +1,28 @@
 <?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 
+# 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.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 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.
- * 
- * @package UtfNormal
+ *
+ * @ingroup UtfNormal
  * @access private
  */
 
@@ -32,7 +32,7 @@ if( php_sapi_name() != 'cli' ) {
 
 /** */
 require_once( 'UtfNormal.php' );
-require_once( '../DifferenceEngine.php' );
+require_once( '../diff/DifferenceEngine.php' );
 
 dl('php_utfnormal.so' );
 
@@ -51,7 +51,7 @@ function donorm( $str ) {
        $str = preg_replace( '/[\x00-\x08\x0b\x0c\x0e-\x1f]/', UTF8_REPLACEMENT, $str );
        $str = str_replace( UTF8_FFFE, UTF8_REPLACEMENT, $str );
        $str = str_replace( UTF8_FFFF, UTF8_REPLACEMENT, $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" );
@@ -64,11 +64,12 @@ function wfMsg($x) {
 function showDiffs( $a, $b ) {
        $ota = explode( "\n", str_replace( "\r\n", "\n", $a ) );
        $nta = explode( "\n", str_replace( "\r\n", "\n", $b ) );
-       
-       $diffs =& new Diff( $ota, $nta );
-       $formatter =& new TableDiffFormatter();
+
+       $diffs = new Diff( $ota, $nta );
+       $formatter = new TableDiffFormatter();
        $funky = $formatter->format( $diffs );
-       preg_match_all( '/<span class="diffchange">(.*?)<\/span>/', $funky, $matches );
+       $matches = array();
+       preg_match_all( '/<(?:ins|del) class="diffchange">(.*?)<\/(?:ins|del)>/', $funky, $matches );
        foreach( $matches[1] as $bit ) {
                $hex = bin2hex( $bit );
                echo "\t$hex\n";
@@ -80,7 +81,7 @@ $n = 0;
 while( true ) {
        $n++;
        echo "$n\n";
-       
+
        $str = randomString( $size, true);
        $clean = UtfNormal::cleanUp( $str );
        $norm = donorm( $str );
@@ -97,11 +98,9 @@ while( true ) {
                showDiffs( $clean, $norm );
                die();
        }
-       
-       
+
+
        $str = '';
        $clean = '';
        $norm = '';
 }
-
-?>
\ No newline at end of file