diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-21 18:50:14 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-21 18:50:14 +0100 |
| commit | 85ea04b747a58d32cd75894f8bc96b7878005cd1 (patch) | |
| tree | 54ce11c3a43254c77f0d0953fdafeaf458bae614 /run-tests.php | |
| parent | 06e193ba8d5f561a34ad208d8b85b3a9827f3fcf (diff) | |
| parent | 59b3ab827abf01ece5a06b9dfdac1f445436d283 (diff) | |
| download | php-git-85ea04b747a58d32cd75894f8bc96b7878005cd1.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Avoid some @count() suppressions in run-tests.php
Diffstat (limited to 'run-tests.php')
| -rwxr-xr-x | run-tests.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/run-tests.php b/run-tests.php index 21677fa2da..ca1fae1f0d 100755 --- a/run-tests.php +++ b/run-tests.php @@ -1860,7 +1860,7 @@ TEST $file } else { - if (!isset($section_text['PHPDBG']) && @count($section_text['FILE']) + @count($section_text['FILEEOF']) + @count($section_text['FILE_EXTERNAL']) != 1) { + if (!isset($section_text['PHPDBG']) && isset($section_text['FILE']) + isset($section_text['FILEEOF']) + isset($section_text['FILE_EXTERNAL']) != 1) { $bork_info = "missing section --FILE--"; } @@ -1885,7 +1885,7 @@ TEST $file } } - if ((@count($section_text['EXPECT']) + @count($section_text['EXPECTF']) + @count($section_text['EXPECTREGEX'])) != 1) { + if ((isset($section_text['EXPECT']) + isset($section_text['EXPECTF']) + isset($section_text['EXPECTREGEX'])) != 1) { $bork_info = "missing section --EXPECT--, --EXPECTF-- or --EXPECTREGEX--"; } } @@ -2216,7 +2216,7 @@ TEST $file $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); @@ -2250,7 +2250,7 @@ TEST $file } } - if (is_array($org_file) || @count($section_text['REDIRECTTEST']) == 1) { + if (is_array($org_file) || isset($section_text['REDIRECTTEST'])) { if (is_array($org_file)) { $file = $org_file[0]; |