php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.4'

Browse Source 
* PHP-7.4:
  Avoid some @count() suppressions in run-tests.php
This commit is contained in:
Nikita Popov
2020-01-21 18:50:14 +01:00
parent 06e193ba8d 59b3ab827a
commit 85ea04b747
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
run-tests.php
View File

@@ -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];