MediaWiki 1.17.0

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

diff --git a/includes/normal/UtfNormalTest.php b/includes/normal/UtfNormalTest.php
index 90c2ea15df37aa46404abd93bb46b5e989825861..f78775ceeb0890eb17beead88d3004cb413cf000 100644 (file)
--- a/includes/normal/UtfNormalTest.php
+++ b/includes/normal/UtfNormalTest.php
@@ -1,29 +1,30 @@
 <?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.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-# http://www.gnu.org/copyleft/gpl.html
-
 /**
  * Implements the conformance test at:
  * http://www.unicode.org/Public/UNIDATA/NormalizationTest.txt
- * @package UtfNormal
+ *
+ * Copyright © 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
  */
 
-/** */
 $verbose = true;
 #define( 'PRETTY_UTF8', true );
 
@@ -32,7 +33,7 @@ if( defined( 'PRETTY_UTF8' ) ) {
                return preg_replace( '/([\x00-\xff])/e',
                        'sprintf("%02X", ord("$1"))',
                        $string );
-       }       
+       }
 } else {
        /**
         * @ignore
@@ -41,7 +42,7 @@ if( defined( 'PRETTY_UTF8' ) ) {
                return trim( preg_replace( '/(.)/use',
                        'sprintf("%04X ", utf8ToCodepoint("$1"))',
                        $string ) );
-       }       
+       }
 }
 
 if( isset( $_SERVER['argv'] ) && in_array( '--icu', $_SERVER['argv'] ) ) {
@@ -73,6 +74,7 @@ $testedChars = array();
 while( false !== ( $line = fgets( $in ) ) ) {
        list( $data, $comment ) = explode( '#', $line );
        if( $data === '' ) continue;
+       $matches = array();
        if( preg_match( '/@Part([\d])/', $data, $matches ) ) {
                if( $matches[1] > 0 ) {
                        $ok = reportResults( $total, $success, $failure ) && $ok;
@@ -80,13 +82,13 @@ while( false !== ( $line = fgets( $in ) ) ) {
                print "Part {$matches[1]}: $comment";
                continue;
        }
-       
+
        $columns = array_map( "hexSequenceToUtf8", explode( ";", $data ) );
        array_unshift( $columns, '' );
-       
+
        $testedChars[$columns[1]] = true;
        $total++;
-       if( testNormals( $normalizer, $columns, $comment ) ) {
+       if( testNormals( $normalizer, $columns, $comment, $verbose ) ) {
                $success++;
        } else {
                $failure++;
@@ -118,7 +120,7 @@ while( false !== ($line = fgets( $in ) ) ) {
        }
        if( empty( $testedChars[$char] ) ) {
                $total++;
-               if( testInvariant( $normalizer, $char, $desc ) ) {
+               if( testInvariant( $normalizer, $char, $desc, $verbose ) ) {
                        $success++;
                } else {
                        $failure++;
@@ -141,8 +143,8 @@ if( $ok ) {
 ## ------
 
 function reportResults( &$total, &$success, &$failure ) {
-       $percSucc = IntVal( $success * 100 / $total );
-       $percFail = IntVal( $failure * 100 / $total );
+       $percSucc = intval( $success * 100 / $total );
+       $percFail = intval( $failure * 100 / $total );
        print "\n";
        print "$success tests successful ($percSucc%)\n";
        print "$failure tests failed ($percFail%)\n\n";
@@ -153,17 +155,16 @@ function reportResults( &$total, &$success, &$failure ) {
        return $ok;
 }
 
-function testNormals( &$u, $c, $comment, $reportFailure = false ) {
+function testNormals( &$u, $c, $comment, $verbose, $reportFailure = false ) {
        $result = testNFC( $u, $c, $comment, $reportFailure );
        $result = testNFD( $u, $c, $comment, $reportFailure ) && $result;
        $result = testNFKC( $u, $c, $comment, $reportFailure ) && $result;
        $result = testNFKD( $u, $c, $comment, $reportFailure ) && $result;
        $result = testCleanUp( $u, $c, $comment, $reportFailure ) && $result;
-       
-       global $verbose;
+
        if( $verbose && !$result && !$reportFailure ) {
                print $comment;
-               testNormals( $u, $c, $comment, true );
+               testNormals( $u, $c, $comment, $verbose, true );
        }
        return $result;
 }
@@ -231,19 +232,16 @@ function testNFKD( &$u, $c, $comment, $verbose ) {
        return $result;
 }
 
-function testInvariant( &$u, $char, $desc, $reportFailure = false ) {
+function testInvariant( &$u, $char, $desc, $verbose, $reportFailure = false ) {
        $result = verbosify( $char, $u->toNFC( $char ), 1, 'NFC', $reportFailure );
        $result = verbosify( $char, $u->toNFD( $char ), 1, 'NFD', $reportFailure ) && $result;
        $result = verbosify( $char, $u->toNFKC( $char ), 1, 'NFKC', $reportFailure ) && $result;
        $result = verbosify( $char, $u->toNFKD( $char ), 1, 'NFKD', $reportFailure ) && $result;
-       $c = $char;
        $result = verbosify( $char, $u->cleanUp( $char ), 1, 'cleanUp', $reportFailure ) && $result;
-       global $verbose;
+
        if( $verbose && !$result && !$reportFailure ) {
                print $desc;
-               testInvariant( $u, $char, $desc, true );
+               testInvariant( $u, $char, $desc, $verbose, true );
        }
        return $result;
 }
-
-?>