Remove weird count usage from run-tests

Author: Girgias

run-tests.php

@@ -1851,27 +1851,34 @@ function run_test($php, $file, $env)
 	// the redirect section allows a set of tests to be reused outside of
 	// a given test dir
 	if ($bork_info === null) {
-		if (isset($section_text['REDIRECTTEST'])) {
+		if (array_key_exists('REDIRECTTEST', $section_text)) {
 
 			if ($IN_REDIRECT) {
 				$bork_info = "Can't redirect a test from within a redirected test";
 			}
 
 		} else {
 
-			if (!isset($section_text['PHPDBG']) && @count($section_text['FILE']) + @count($section_text['FILEEOF']) + @count($section_text['FILE_EXTERNAL']) != 1) {
+			if (
+			    array_key_exists('PHPDBG', $section_text)
+			    && (
+			        array_key_exists('FILE', $section_text)
+			        xor array_key_exists('FILEEOF', $section_text)
+			        xor array_key_exists('FILE_EXTERNAL', $section_text)
+			    ) === false
+			) {
 				$bork_info = "missing section --FILE--";
 			}
 
-			if (isset($section_text['FILEEOF'])) {
+			if (array_key_exists('FILEEOF', $section_text)) {
 				$section_text['FILE'] = preg_replace("/[\r\n]+$/", '', $section_text['FILEEOF']);
 				unset($section_text['FILEEOF']);
 			}
 
 			foreach (array('FILE', 'EXPECT', 'EXPECTF', 'EXPECTREGEX') as $prefix) {
 				$key = $prefix . '_EXTERNAL';
 
-				if (isset($section_text[$key])) {
+				if (array_key_exists($key, $section_text)) {
 					// don't allow tests to retrieve files from anywhere but this subdirectory
 					$section_text[$key] = dirname($file) . '/' . trim(str_replace('..', '', $section_text[$key]));
 
@@ -1884,7 +1891,13 @@ function run_test($php, $file, $env)
 				}
 			}
 
-			if ((@count($section_text['EXPECT']) + @count($section_text['EXPECTF']) + @count($section_text['EXPECTREGEX'])) != 1) {
+			if (
+			    (
+			        array_key_exists('EXPECT', $section_text)
+			        xor array_key_exists('EXPECTF', $section_text)
+			        xor array_key_exists('EXPECTREGEX', $section_text)
+			    ) === false
+			) {
 				$bork_info = "missing section --EXPECT--, --EXPECTF-- or --EXPECTREGEX--";
 			}
 		}
@@ -1908,7 +1921,7 @@ function run_test($php, $file, $env)
 		return 'BORKED';
 	}
 
-	if (isset($section_text['CAPTURE_STDIO'])) {
+	if (array_key_exists('CAPTURE_STDIO', $section_text)) {
 		$captureStdIn = stripos($section_text['CAPTURE_STDIO'], 'STDIN') !== false;
 		$captureStdOut = stripos($section_text['CAPTURE_STDIO'], 'STDOUT') !== false;
 		$captureStdErr = stripos($section_text['CAPTURE_STDIO'], 'STDERR') !== false;
@@ -2213,7 +2226,7 @@ function run_test($php, $file, $env)
 					$test_files[] = array($f, $file);
 				}
 			}
-			$test_cnt += @count($test_files) - 1;
+			$test_cnt += count($test_files) - 1;
 			$test_idx--;
 
 			show_redirect_start($IN_REDIRECT['TESTS'], $tested, $tested_file);
@@ -2247,7 +2260,7 @@ function run_test($php, $file, $env)
 		}
 	}
 
-	if (is_array($org_file) || @count($section_text['REDIRECTTEST']) == 1) {
+	if (is_array($org_file) || array_key_exists('REDIRECTTEST', $section_text)) {
 
 		if (is_array($org_file)) {
 			$file = $org_file[0];