summaryrefslogtreecommitdiff
path: root/ext/standard/tests/file
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-10-08 12:18:59 +0200
committerNikita Popov <nikita.ppv@gmail.com>2019-10-08 12:32:57 +0200
commit2fdd142f9941a05bdcffb0d6c11662ec333e6e09 (patch)
tree4d703e6db04432ca7f1dfa5cb7cdf5a6211af0c5 /ext/standard/tests/file
parentd6fdc17f7fea5a4c4bfaf801f44d8b0a531428da (diff)
downloadphp-git-2fdd142f9941a05bdcffb0d6c11662ec333e6e09.tar.gz
Check for exception after applying stream filters
This makes the stream opening actually fail, and avoids assertion failures when we tokenize with EG(exception) set. Also avoid throwing an additional warning after an exception has already been thrown.
Diffstat (limited to 'ext/standard/tests/file')
-rw-r--r--ext/standard/tests/file/bug38450_2.phpt2
-rw-r--r--ext/standard/tests/file/bug38450_3.phpt2
2 files changed, 0 insertions, 4 deletions
diff --git a/ext/standard/tests/file/bug38450_2.phpt b/ext/standard/tests/file/bug38450_2.phpt
index 774de66bfe..33a13da0db 100644
--- a/ext/standard/tests/file/bug38450_2.phpt
+++ b/ext/standard/tests/file/bug38450_2.phpt
@@ -102,8 +102,6 @@ var_dump($myvar);
echo "Done\n";
?>
--EXPECTF--
-Warning: fopen(var://myvar): failed to open stream: "VariableStream::stream_open" call failed in %s on line %d
-
Fatal error: Uncaught Exception: constructor in %s:%d
Stack trace:
#0 [internal function]: VariableStream->__construct()
diff --git a/ext/standard/tests/file/bug38450_3.phpt b/ext/standard/tests/file/bug38450_3.phpt
index 0bcaeb2a89..8a5c696587 100644
--- a/ext/standard/tests/file/bug38450_3.phpt
+++ b/ext/standard/tests/file/bug38450_3.phpt
@@ -102,8 +102,6 @@ var_dump($myvar);
echo "Done\n";
?>
--EXPECTF--
-Warning: fopen(var://myvar): failed to open stream: "VariableStream::stream_open" call failed in %sbug38450_3.php on line %d
-
Fatal error: Uncaught ArgumentCountError: Too few arguments to function VariableStream::__construct(), 0 passed and exactly 1 expected in %sbug38450_3.php:7
Stack trace:
#0 [internal function]: VariableStream->__construct()