convert all ereg*() calls to preg_match(), so that we become future-proof (ereg is scheduled for removal in PHP 6)

1 files changed, 14 insertions, 17 deletions

diff --git a/run-tests.php b/run-tests.php
index 7cd7f52a7c..b9296b22cb 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -518,7 +518,7 @@ HELP;
 		if ($html_output) {
 			fclose($html_file);
 		}
-		if (getenv('REPORT_EXIT_STATUS') == 1 and ereg('FAILED( |$)', implode(' ', $test_results))) {
+		if (getenv('REPORT_EXIT_STATUS') == 1 and preg_match('/FAILED(?: |$)/', implode(' ', $test_results))) {
 			exit(1);
 		}
 		exit(0);
@@ -968,7 +968,7 @@ TEST $file
 		$bork_info = "empty test [$file]";
 		$borked = true;
 	}
-	if (!ereg('^--TEST--',$line,$r)) {
+	if (strncmp('--TEST--', $line, 8)) {
 		$bork_info = "tests must start with --TEST-- [$file]";
 		$borked = true;
 	}
@@ -993,7 +993,7 @@ TEST $file
 		}
 
 		// End of actual test?
-		if ($secfile && preg_match('/^===DONE===/', $line, $r)) {
+		if ($secfile && preg_match('/^===DONE===$/', $line)) {
 			$secdone = true;
 		}
 	}
@@ -1177,10 +1177,9 @@ TEST $file
 			if (!$cfg['keep']['skip']) {
 				@unlink($test_skipif);
 			}
-			if (!strncasecmp('skip', trim($output), 4)) {
-				$reason = (eregi("^skip[[:space:]]*(.+)\$", trim($output))) ? eregi_replace("^skip[[:space:]]*(.+)\$", "\\1", trim($output)) : FALSE;
-				if ($reason) {
-					show_result("SKIP", $tested, $tested_file, "reason: $reason", $temp_filenames);
+			if (!strncasecmp('skip', ltrim($output), 4)) {
+				if (preg_match('/^\s*skip\s*(.+)\s*/i', $output, $m)) {
+					show_result("SKIP", $tested, $tested_file, "reason: $m[1]", $temp_filenames);
 				} else {
 					show_result("SKIP", $tested, $tested_file, '', $temp_filenames);
 				}
@@ -1192,17 +1191,15 @@ TEST $file
 				}
 				return 'SKIPPED';
 			}
-			if (!strncasecmp('info', trim($output), 4)) {
-				$reason = (ereg("^info[[:space:]]*(.+)\$", trim($output))) ? ereg_replace("^info[[:space:]]*(.+)\$", "\\1", trim($output)) : FALSE;
-				if ($reason) {
-					$info = " (info: $reason)";
+			if (!strncasecmp('info', ltrim($output), 4)) {
+				if (preg_match('/^\s*info\s*(.+)\s*/i', $output, $m)) {
+					$info = " (info: $m[1])";
 				}
 			}
-			if (!strncasecmp('warn', trim($output), 4)) {
-				$reason = (ereg("^warn[[:space:]]*(.+)\$", trim($output))) ? ereg_replace("^warn[[:space:]]*(.+)\$", "\\1", trim($output)) : FALSE;
-				if ($reason) {
+			if (!strncasecmp('warn', ltrim($output), 4)) {
+				if (preg_match('/^\s*warn\s*(.+)\s*/i', $output, $m)) {
 					$warn = true; /* only if there is a reason */
-					$info = " (warn: $reason)";
+					$info = " (warn: $m[1])";
 				}
 			}
 		}
@@ -1304,8 +1301,8 @@ TEST $file
 
 		$request = '';
 		foreach ($raw_lines as $line) {
-			if (empty($env['CONTENT_TYPE']) && eregi('^(Content-Type:)(.*)', $line, $res)) {
-				$env['CONTENT_TYPE'] = trim(str_replace("\r", '', $res[2]));
+			if (empty($env['CONTENT_TYPE']) && preg_match('/^Content-Type:(.*)/i', $line, $res)) {
+				$env['CONTENT_TYPE'] = trim(str_replace("\r", '', $res[1]));
 				continue;
 			}
 			$request .= $line . "\n";