Merge remote-tracking branch 'upstream/master'

1 files changed, 5 insertions, 3 deletions

diff --git a/src/tests/broken_configuration/broken_conf_missing_script.phpt b/src/tests/broken_configuration/broken_conf_missing_script.phpt
index 97d3743..9deffc7 100644
--- a/src/tests/broken_configuration/broken_conf_missing_script.phpt
+++ b/src/tests/broken_configuration/broken_conf_missing_script.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Invalid configuration file for upload
+--SKIPIF--
+<?php if (PHP_VERSION_ID >= 80000) print "skip"; ?>
 --INI--
 file_uploads=1
 sp.configuration_file={PWD}/config/broken_conf_missing_script.ini
@@ -8,9 +10,9 @@ sp.configuration_file={PWD}/config/broken_conf_missing_script.ini
 echo 1;
 ?>
 --EXPECTF--
-PHP Fatal error:  [snuffleupagus][0.0.0.0][config] The `script` directive is mandatory in '.enable();' on line 1 in Unknown on line 0
+PHP Fatal error:  [snuffleupagus][0.0.0.0][config][log] The `script` directive is mandatory in '.enable();' on line 1 in Unknown on line 0
 
-Fatal error: [snuffleupagus][0.0.0.0][config] The `script` directive is mandatory in '.enable();' on line 1 in Unknown on line 0
+Fatal error: [snuffleupagus][0.0.0.0][config][log] The `script` directive is mandatory in '.enable();' on line 1 in Unknown on line 0
 
-Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0
+Fatal error: [snuffleupagus][0.0.0.0][config][log] Invalid configuration file in Unknown on line 0
 Could not startup.