Merge branch 'PHP-7.4' into master

* PHP-7.4:
  Fix #76735: Incorrect message in fopen on invalid mode

Author: cmb69

ext/bz2/tests/002.phpt

@@ -90,10 +90,10 @@ bool(false)
 resource(%d) of type (stream)
 resource(%d) of type (stream)
 
-Warning: fopen(bz_open_002.txt): Failed to open stream: Bad file %s in %s on line %d
+Warning: fopen(bz_open_002.txt): Failed to open stream: `br' is not a valid mode for fopen in %s on line %d
 bzopen(): Argument #1 ($file) must be of type string or file-resource, bool given
 
-Warning: fopen(bz_open_002.txt): Failed to open stream: Bad file %s in %s on line %d
+Warning: fopen(bz_open_002.txt): Failed to open stream: `br' is not a valid mode for fopen %s in %s on line %d
 bzopen(): Argument #1 ($file) must be of type string or file-resource, bool given
 
 Warning: bzopen(): cannot write to a stream opened in read only mode in %s on line %d

ext/standard/tests/file/bug76735.phpt

@@ -0,0 +1,8 @@
+--TEST--
+Bug #76735 (Incorrect message in fopen on invalid mode)
+--FILE--
+<?php
+fopen(__FILE__, 'Q');
+?>
+--EXPECTF--
+Warning: fopen(%s): Failed to open stream: `Q' is not a valid mode for fopen in %s on line %d

main/streams/plain_wrapper.c

@@ -1051,9 +1051,7 @@ PHPAPI php_stream *_php_stream_fopen(const char *filename, const char *mode, zen
 	char *persistent_id = NULL;
 
 	if (FAILURE == php_stream_parse_fopen_modes(mode, &open_flags)) {
-		if (options & REPORT_ERRORS) {
-			zend_value_error("\"%s\" is not a valid mode for fopen", mode);
-		}
+		php_stream_wrapper_log_error(&php_plain_files_wrapper, options, "`%s' is not a valid mode for fopen", mode);
 		return NULL;
 	}