From: Platonides <platonides@users.mediawiki.org>
Date: Wed, 28 Jul 2010 12:07:53 +0000 (+0000)
Subject: From globals to parameters: $columns, $exceptions, $verbose
X-Git-Tag: 1.31.0-rc.0~35866
X-Git-Url: http://git.cyclocoop.org/%27.parametre_url%28%20%20%20generer_action_auteur%28%27charger_plugin%27%2C%20%27update_flux%27%29%2C%27update_flux%27%2C%20%27oui%27%29.%27?a=commitdiff_plain;h=aedae942f92d118bdaaffb6001cb5c5ed21c1478;p=lhc%2Fweb%2Fwiklou.git

From globals to parameters: $columns, $exceptions, $verbose
New line after the error messages.
---

diff --git a/includes/normal/Utf8Test.php b/includes/normal/Utf8Test.php
index 4c78b3db5a..4832730ea8 100644
--- a/includes/normal/Utf8Test.php
+++ b/includes/normal/Utf8Test.php
@@ -30,6 +30,7 @@ require_once 'UtfNormalUtil.php';
 require_once 'UtfNormal.php';
 mb_internal_encoding( "utf-8" );
 
+$verbose = false;
 #$verbose = true;
 if( php_sapi_name() != 'cli' ) {
 	die( "Run me from the command line please.\n" );
@@ -39,7 +40,7 @@ $in = fopen( "UTF-8-test.txt", "rt" );
 if( !$in ) {
 	print "Couldn't open UTF-8-test.txt -- can't run tests.\n";
 	print "If necessary, manually download this file. It can be obtained at\n";
-	print "http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-test.txt";
+	print "http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-test.txt\n";
 	exit(-1);
 }
 
@@ -55,7 +56,7 @@ while( false !== ( $line = fgets( $in ) ) ) {
 if( !$columns ) {
 	print "Something seems to be wrong; couldn't extract line length.\n";
 	print "Check that UTF-8-test.txt was downloaded correctly from\n";
-	print "http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-test.txt";
+	print "http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-test.txt\n";
 	exit(-1);
 }
 
@@ -102,10 +103,10 @@ while( false !== ( $line = fgets( $in ) ) ) {
 		if( in_array( $test, $longTests ) ) {
 			$line = fgets( $in );
 			for( $line = fgets( $in ); !preg_match( '/^\s+\|/', $line ); $line = fgets( $in ) ) {
-				testLine( $test, $line, $total, $success, $failed );
+				testLine( $test, $line, $total, $success, $failed, $columns, $exceptions, $verbose );
 			}
 		} else {
-			testLine( $test, $line, $total, $success, $failed );
+			testLine( $test, $line, $total, $success, $failed, $columns, $exceptions, $verbose );
 		}
 	}
 }
@@ -120,7 +121,7 @@ echo "UTF-8 DECODER TEST SUCCESS!\n";
 exit (0);
 
 
-function testLine( $test, $line, &$total, &$success, &$failed ) {
+function testLine( $test, $line, &$total, &$success, &$failed, $columns, $exceptions, $verbose ) {
 	$stripped = $line;
 	UtfNormal::quickisNFCVerify( $stripped );
 
@@ -130,10 +131,8 @@ function testLine( $test, $line, &$total, &$success, &$failed ) {
 		$len = strlen( substr( $stripped, 0, strpos( $stripped, '|' ) ) );
 	}
 
-	global $columns;
 	$ok = $same ^ ($test >= 3 );
 
-	global $exceptions;
 	$ok ^= in_array( $test, $exceptions );
 
 	$ok &= ($columns == $len);
@@ -144,7 +143,7 @@ function testLine( $test, $line, &$total, &$success, &$failed ) {
 	} else {
 		$failed++;
 	}
-	global $verbose;
+
 	if( $verbose || !$ok ) {
 		print str_replace( "\n", "$len\n", $stripped );
 	}