Skip to content

Commit 6487506

Browse files
committed
sapi/cli: Remove bool type coercions in tests
1 parent c134fd1 commit 6487506

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

sapi/cli/tests/bug61977.phpt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ HEADER;
2929
if (fwrite($fp, $header)) {
3030
while (!feof($fp)) {
3131
$text = fgets($fp);
32+
if ($text === false) {
33+
break;
34+
}
3235
if (strncasecmp("Content-type:", $text, 13) == 0) {
3336
echo "foo.{$mimetype} => ", $text;
3437
}

sapi/cli/tests/upload_2G.phpt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,14 @@ if (!file_exists('/proc/meminfo')) {
1717
}
1818

1919
$free_ram = 0;
20+
$enough_free_ram = false;
2021
if ($f = fopen("/proc/meminfo","r")) {
2122
while (!feof($f)) {
22-
if (preg_match('/MemFree[^\d]*(\d+)/i', fgets($f), $m)) {
23+
$line = fgets($f);
24+
if ($line === false) {
25+
break;
26+
}
27+
if (preg_match('/MemFree[^\d]*(\d+)/i', $line, $m)) {
2328
$free_ram = max($free_ram, $m[1]/1024/1024);
2429
if ($free_ram > 3) {
2530
$enough_free_ram = true;
@@ -28,7 +33,7 @@ if ($f = fopen("/proc/meminfo","r")) {
2833
}
2934
}
3035

31-
if (empty($enough_free_ram)) {
36+
if (!$enough_free_ram) {
3237
die(sprintf("skip need +3G free RAM, but only %01.2f available", $free_ram));
3338
}
3439

0 commit comments

Comments
 (0)