Remove param argument from php_verror (#22865)

NattyNarwhal · web-flow · commit 0a12b3e82681 · 2026-07-24T01:56:34.000-03:00
* Remove param argument from php_verror

Now that docref has been knocked out and error_include_args exists,
remove this argument. Callers will be updated accordingly.

* Remove param from exif

* Remove param from snmp (no changes for tests needed)

* Remove param from gd (no changes for tests needed)

* Remove param from openssl

* Document param change to php_verror
diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS
@@ -114,6 +114,7 @@ PHP 8.6 INTERNALS UPGRADE NOTES
     longer is a pointer, but a directly embedded HashTable struct.
   . Extended php_stream_filter_ops with seek method.
   . zend_argument_error_variadic() now takes a new 'function' parameter.
+  . The param argument in the php_verror() function has been removed.
 
 - Added:
   . New zend_class_entry.ce_flags2 and zend_function.fn_flags2 fields were
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
@@ -2036,11 +2036,11 @@ static void exif_error_docref(const char *docref EXIFERR_DC, image_info_type *Im
 		char *buf;
 
 		spprintf(&buf, 0, "%s(%ld): %s", _file, _line, format);
-		php_verror(docref, ImageInfo && ImageInfo->FileName ? ImageInfo->FileName:"", type, buf, args);
+		php_verror(docref, type, buf, args);
 		efree(buf);
 	}
 #else
-	php_verror(docref, ImageInfo && ImageInfo->FileName ? ImageInfo->FileName:"", type, format, args);
+	php_verror(docref, type, format, args);
 #endif
 	va_end(args);
 }
diff --git a/ext/exif/tests/bug48378.phpt b/ext/exif/tests/bug48378.phpt
@@ -10,8 +10,8 @@ __DIR__ . "/bug48378.jpg",
 );
 ?>
 --EXPECTF--
-Warning: exif_read_data(%s): Invalid IFD start in %s48378.php on line %d
+Warning: exif_read_data(): Invalid IFD start in %s48378.php on line %d
 
-Warning: exif_read_data(%s): Error reading from file: got=x08B4(=2228) != itemlen-2=x1FFE(=8190) in %s48378.php on line %d
+Warning: exif_read_data(): Error reading from file: got=x08B4(=2228) != itemlen-2=x1FFE(=8190) in %s48378.php on line %d
 
-Warning: exif_read_data(%s): Invalid JPEG file in %s48378.php on line %d
+Warning: exif_read_data(): Invalid JPEG file in %s48378.php on line %d
diff --git a/ext/exif/tests/bug54002.phpt b/ext/exif/tests/bug54002.phpt
@@ -11,6 +11,6 @@ exif_read_data(__DIR__ . '/bug54002_2.jpg');
 
 ?>
 --EXPECTF--
-Warning: exif_read_data(bug54002_1.jpg): Process tag(x0205=UndefinedTag): Illegal byte_count in %sbug54002.php on line %d
+Warning: exif_read_data(): Process tag(x0205=UndefinedTag): Illegal byte_count in %sbug54002.php on line %d
 
-Warning: exif_read_data(bug54002_2.jpg): Process tag(x0205=UndefinedTag): Illegal byte_count in %sbug54002.php on line %d
+Warning: exif_read_data(): Process tag(x0205=UndefinedTag): Illegal byte_count in %sbug54002.php on line %d
diff --git a/ext/exif/tests/bug60150.phpt b/ext/exif/tests/bug60150.phpt
@@ -11,9 +11,9 @@ $infile = __DIR__.'/bug60150.jpg';
 var_dump(exif_read_data($infile));
 ?>
 --EXPECTF--
-Warning: exif_read_data(bug60150.jpg): Process tag(x9003=DateTimeOriginal): Illegal pointer offset(%s) in %s on line %d
+Warning: exif_read_data(): Process tag(x9003=DateTimeOriginal): Illegal pointer offset(%s) in %s on line %d
 
-Warning: exif_read_data(bug60150.jpg): Error reading from file: got=x%x(=%d) != itemlen-%d=x%x(=%d) in %s on line %d
+Warning: exif_read_data(): Error reading from file: got=x%x(=%d) != itemlen-%d=x%x(=%d) in %s on line %d
 
-Warning: exif_read_data(bug60150.jpg): Invalid JPEG file in %s on line %d
+Warning: exif_read_data(): Invalid JPEG file in %s on line %d
 bool(false)
diff --git a/ext/exif/tests/bug62523_3.phpt b/ext/exif/tests/bug62523_3.phpt
@@ -11,6 +11,6 @@ Done
 --EXPECTF--
 Test
 
-Warning: exif_read_data(bug62523_3.jpg): File not supported in %sbug62523_3.php on line %d
+Warning: exif_read_data(): File not supported in %sbug62523_3.php on line %d
 bool(false)
 Done
diff --git a/ext/exif/tests/bug68113-mb.phpt b/ext/exif/tests/bug68113-mb.phpt
@@ -8,8 +8,8 @@ var_dump(exif_thumbnail(__DIR__."/bug68113私はガラスを食べられます.j
 ?>
 Done
 --EXPECTF--
-Warning: exif_thumbnail(bug68113私はガラスを食べられます.jpg): File structure corrupted in %s%ebug68113-mb.php on line 2
+Warning: exif_thumbnail(): File structure corrupted in %s%ebug68113-mb.php on line 2
 
-Warning: exif_thumbnail(bug68113私はガラスを食べられます.jpg): Invalid JPEG file in %s%ebug68113-mb.php on line 2
+Warning: exif_thumbnail(): Invalid JPEG file in %s%ebug68113-mb.php on line 2
 bool(false)
 Done
diff --git a/ext/exif/tests/bug68113.phpt b/ext/exif/tests/bug68113.phpt
@@ -8,8 +8,8 @@ var_dump(exif_thumbnail(__DIR__."/bug68113.jpg"));
 ?>
 Done
 --EXPECTF--
-Warning: exif_thumbnail(bug68113.jpg): File structure corrupted in %s%ebug68113.php on line 2
+Warning: exif_thumbnail(): File structure corrupted in %s%ebug68113.php on line 2
 
-Warning: exif_thumbnail(bug68113.jpg): Invalid JPEG file in %s%ebug68113.php on line 2
+Warning: exif_thumbnail(): Invalid JPEG file in %s%ebug68113.php on line 2
 bool(false)
 Done
diff --git a/ext/exif/tests/bug72094.phpt b/ext/exif/tests/bug72094.phpt
@@ -11,49 +11,49 @@ print_r(exif_read_data(__DIR__ . '/bug72094_4.jpg'));
 ?>
 DONE
 --EXPECTF--
-Warning: exif_read_data(bug72094_1.jpg): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %s%ebug72094.php on line %d
+Warning: exif_read_data(): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %s%ebug72094.php on line %d
 
-Warning: exif_read_data(bug72094_1.jpg): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %s%ebug72094.php on line %d
+Warning: exif_read_data(): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %s%ebug72094.php on line %d
 
-Warning: exif_read_data(bug72094_1.jpg): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %s%ebug72094.php on line %d
+Warning: exif_read_data(): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %s%ebug72094.php on line %d
 
-Warning: exif_read_data(bug72094_1.jpg): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %s%ebug72094.php on line %d
+Warning: exif_read_data(): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %s%ebug72094.php on line %d
 
-Warning: exif_read_data(bug72094_1.jpg): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %s%ebug72094.php on line %d
+Warning: exif_read_data(): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %s%ebug72094.php on line %d
 
-Warning: exif_read_data(bug72094_1.jpg): Process tag(x8298=Copyright): Illegal format code 0x3030, suppose BYTE in %s%ebug72094.php on line %d
+Warning: exif_read_data(): Process tag(x8298=Copyright): Illegal format code 0x3030, suppose BYTE in %s%ebug72094.php on line %d
 
-Warning: exif_read_data(bug72094_1.jpg): Illegal IFD offset in %sbug72094.php on line %d
+Warning: exif_read_data(): Illegal IFD offset in %sbug72094.php on line %d
 
-Warning: exif_read_data(bug72094_1.jpg): File structure corrupted in %s%ebug72094.php on line %d
+Warning: exif_read_data(): File structure corrupted in %s%ebug72094.php on line %d
 
-Warning: exif_read_data(bug72094_1.jpg): Invalid JPEG file in %s%ebug72094.php on line %d
+Warning: exif_read_data(): Invalid JPEG file in %s%ebug72094.php on line %d
 
-Warning: exif_read_data(bug72094_2.jpg): Illegal IFD size in %s%ebug72094.php on line %d
+Warning: exif_read_data(): Illegal IFD size in %s%ebug72094.php on line %d
 
-Warning: exif_read_data(bug72094_2.jpg): File structure corrupted in %s%ebug72094.php on line %d
+Warning: exif_read_data(): File structure corrupted in %s%ebug72094.php on line %d
 
-Warning: exif_read_data(bug72094_2.jpg): Invalid JPEG file in %s%ebug72094.php on line %d
+Warning: exif_read_data(): Invalid JPEG file in %s%ebug72094.php on line %d
 
-Warning: exif_read_data(bug72094_3.jpg): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %s%ebug72094.php on line %d
+Warning: exif_read_data(): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %s%ebug72094.php on line %d
 
-Warning: exif_read_data(bug72094_3.jpg): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %s%ebug72094.php on line %d
+Warning: exif_read_data(): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %s%ebug72094.php on line %d
 
-Warning: exif_read_data(bug72094_3.jpg): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %s%ebug72094.php on line %d
+Warning: exif_read_data(): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %s%ebug72094.php on line %d
 
-Warning: exif_read_data(bug72094_3.jpg): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %s%ebug72094.php on line %d
+Warning: exif_read_data(): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %s%ebug72094.php on line %d
 
-Warning: exif_read_data(bug72094_3.jpg): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %s%ebug72094.php on line %d
+Warning: exif_read_data(): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %s%ebug72094.php on line %d
 
-Warning: exif_read_data(bug72094_3.jpg): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %s%ebug72094.php on line %d
+Warning: exif_read_data(): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %s%ebug72094.php on line %d
 
-Warning: exif_read_data(bug72094_3.jpg): File structure corrupted in %s%ebug72094.php on line %d
+Warning: exif_read_data(): File structure corrupted in %s%ebug72094.php on line %d
 
-Warning: exif_read_data(bug72094_3.jpg): Invalid JPEG file in %s%ebug72094.php on line %d
+Warning: exif_read_data(): Invalid JPEG file in %s%ebug72094.php on line %d
 
-Warning: exif_read_data(bug72094_4.jpg): Invalid TIFF start (1) in %s%ebug72094.php on line %d
+Warning: exif_read_data(): Invalid TIFF start (1) in %s%ebug72094.php on line %d
 
-Warning: exif_read_data(bug72094_4.jpg): File structure corrupted in %s%ebug72094.php on line %d
+Warning: exif_read_data(): File structure corrupted in %s%ebug72094.php on line %d
 
-Warning: exif_read_data(bug72094_4.jpg): Invalid JPEG file in %s%ebug72094.php on line %d
+Warning: exif_read_data(): Invalid JPEG file in %s%ebug72094.php on line %d
 DONE
diff --git a/ext/exif/tests/bug72603.phpt b/ext/exif/tests/bug72603.phpt
@@ -7,5 +7,5 @@ exif
 var_dump(count(exif_read_data(__DIR__ . "/bug72603.jpg")));
 ?>
 --EXPECTF--
-Warning: exif_read_data(bug72603.jpg): %s in %s%ebug72603.php on line %d
+Warning: exif_read_data(): %s in %s%ebug72603.php on line %d
 int(%d)
diff --git a/ext/exif/tests/bug72618.phpt b/ext/exif/tests/bug72618.phpt
@@ -7,5 +7,5 @@ exif
 var_dump(count(exif_read_data(__DIR__ . "/bug72618.jpg")));
 ?>
 --EXPECTF--
-Warning: exif_read_data(bug72618.jpg): %s in %s%ebug72618.php on line %d
+Warning: exif_read_data(): %s in %s%ebug72618.php on line %d
 int(%d)
diff --git a/ext/exif/tests/bug72627.phpt b/ext/exif/tests/bug72627.phpt
@@ -8,11 +8,11 @@ exif
     var_dump($exif);
 ?>
 --EXPECTF--
-Warning: exif_read_data(%s): Thumbnail goes IFD boundary or end of file reached in %sbug72627.php on line %d
+Warning: exif_read_data(): Thumbnail goes IFD boundary or end of file reached in %sbug72627.php on line %d
 
-Warning: exif_read_data(%s): Error in TIFF: filesize(x04E2) less than start of IFD dir(x829A0004) in %sbug72627.php on line %d
+Warning: exif_read_data(): Error in TIFF: filesize(x04E2) less than start of IFD dir(x829A0004) in %sbug72627.php on line %d
 
-Warning: exif_read_data(%s): Thumbnail goes IFD boundary or end of file reached in %sbug72627.php on line %d
+Warning: exif_read_data(): Thumbnail goes IFD boundary or end of file reached in %sbug72627.php on line %d
 array(11) {
   ["FileName"]=>
   string(13) "bug72627.tiff"
diff --git a/ext/exif/tests/bug73737.phpt b/ext/exif/tests/bug73737.phpt
@@ -8,7 +8,7 @@ exif
     var_dump($exif);
 ?>
 --EXPECTF--
-Warning: exif_thumbnail(bug73737.tiff): Process tag(x0100=ImageWidth): Cannot be empty in %s on line %d
+Warning: exif_thumbnail(): Process tag(x0100=ImageWidth): Cannot be empty in %s on line %d
 
-Warning: exif_thumbnail(bug73737.tiff): Error in TIFF: filesize(x0030) less than start of IFD dir(x10102) in %s line %d
+Warning: exif_thumbnail(): Error in TIFF: filesize(x0030) less than start of IFD dir(x10102) in %s line %d
 bool(false)
diff --git a/ext/exif/tests/bug76423.phpt b/ext/exif/tests/bug76423.phpt
@@ -7,8 +7,8 @@ exif
 exif_read_data(__DIR__ . '/bug76423.jpg', 0, true, true);
 ?>
 --EXPECTF--
-Warning: exif_read_data(%s.jpg): Thumbnail goes IFD boundary or end of file reached in %s on line %d
+Warning: exif_read_data(): Thumbnail goes IFD boundary or end of file reached in %s on line %d
 
-Warning: exif_read_data(%s.jpg): File structure corrupted in %s on line %d
+Warning: exif_read_data(): File structure corrupted in %s on line %d
 
-Warning: exif_read_data(%s.jpg): Invalid JPEG file in %s on line %d
+Warning: exif_read_data(): Invalid JPEG file in %s on line %d
diff --git a/ext/exif/tests/bug76557.phpt b/ext/exif/tests/bug76557.phpt
@@ -8,25 +8,25 @@ var_dump(exif_read_data(__DIR__ . "/bug76557.jpg"));
 ?>
 DONE
 --EXPECTF--
-Warning: exif_read_data(bug76557.jpg): Process tag(x010F=Make): Illegal format code 0x3030, suppose BYTE in %sbug76557.php on line %d
+Warning: exif_read_data(): Process tag(x010F=Make): Illegal format code 0x3030, suppose BYTE in %sbug76557.php on line %d
 
-Warning: exif_read_data(bug76557.jpg): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %sbug76557.php on line %d
+Warning: exif_read_data(): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %sbug76557.php on line %d
 
-Warning: exif_read_data(bug76557.jpg): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %sbug76557.php on line %d
+Warning: exif_read_data(): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %sbug76557.php on line %d
 
-Warning: exif_read_data(bug76557.jpg): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %sbug76557.php on line %d
+Warning: exif_read_data(): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %sbug76557.php on line %d
 
-Warning: exif_read_data(bug76557.jpg): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %sbug76557.php on line %d
+Warning: exif_read_data(): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %sbug76557.php on line %d
 
-Warning: exif_read_data(bug76557.jpg): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %sbug76557.php on line %d
+Warning: exif_read_data(): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %sbug76557.php on line %d
 
-Warning: exif_read_data(bug76557.jpg): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %sbug76557.php on line %d
+Warning: exif_read_data(): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %sbug76557.php on line %d
 
-Warning: exif_read_data(bug76557.jpg): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %sbug76557.php on line %d
+Warning: exif_read_data(): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %sbug76557.php on line %d
 
-Warning: exif_read_data(bug76557.jpg): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %sbug76557.php on line %d
+Warning: exif_read_data(): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %sbug76557.php on line %d
 
-Warning: exif_read_data(bug76557.jpg): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %sbug76557.php on line %d
+Warning: exif_read_data(): Process tag(x3030=UndefinedTag): Illegal format code 0x3030, suppose BYTE in %sbug76557.php on line %d
 
 Warning: exif_read_data(): Further exif parsing errors have been suppressed in %s on line %d
 bool(false)
diff --git a/ext/exif/tests/bug77563.phpt b/ext/exif/tests/bug77563.phpt
@@ -8,11 +8,11 @@ $s = exif_thumbnail(__DIR__."/bug77563.jpg");
 ?>
 DONE
 --EXPECTF--
-Warning: exif_thumbnail(bug77563.jpg): IFD data too short: 0x0009 offset 0x0008 in %s%ebug77563.php on line %d
+Warning: exif_thumbnail(): IFD data too short: 0x0009 offset 0x0008 in %s%ebug77563.php on line %d
 
-Warning: exif_thumbnail(bug77563.jpg): Illegal IFD offset in %s%ebug77563.php on line %d
+Warning: exif_thumbnail(): Illegal IFD offset in %s%ebug77563.php on line %d
 
-Warning: exif_thumbnail(bug77563.jpg): File structure corrupted in %s%ebug77563.php on line %d
+Warning: exif_thumbnail(): File structure corrupted in %s%ebug77563.php on line %d
 
-Warning: exif_thumbnail(bug77563.jpg): Invalid JPEG file in %s%ebug77563.php on line %d
+Warning: exif_thumbnail(): Invalid JPEG file in %s%ebug77563.php on line %d
 DONE
diff --git a/ext/exif/tests/bug77564/bug77564.phpt b/ext/exif/tests/bug77564/bug77564.phpt
@@ -9,10 +9,10 @@ var_dump(exif_read_data(__DIR__ . '/bug77564.jpg'));
 DONE
 --EXPECTF--
 
-Warning: exif_read_data(bug77564.jpg): Illegal IFD offset in %sbug77564.php on line %d
+Warning: exif_read_data(): Illegal IFD offset in %sbug77564.php on line %d
 
-Warning: exif_read_data(bug77564.jpg): File structure corrupted in %sbug77564.php on line %d
+Warning: exif_read_data(): File structure corrupted in %sbug77564.php on line %d
 
-Warning: exif_read_data(bug77564.jpg): Invalid JPEG file in %sbug77564.php on line %d
+Warning: exif_read_data(): Invalid JPEG file in %sbug77564.php on line %d
 bool(false)
 DONE
diff --git a/ext/exif/tests/heic_box_overflow.phpt b/ext/exif/tests/heic_box_overflow.phpt
@@ -23,5 +23,5 @@ var_dump(exif_read_data(__DIR__."/heic_box_overflow"));
 @unlink(__DIR__."/heic_box_overflow");
 ?>
 --EXPECTF--
-Warning: exif_read_data(heic_box_overflow): Invalid HEIF file in %s on line %d
+Warning: exif_read_data(): Invalid HEIF file in %s on line %d
 bool(false)
diff --git a/ext/exif/tests/heic_iloc_underflow.phpt b/ext/exif/tests/heic_iloc_underflow.phpt
@@ -15,5 +15,5 @@ var_dump(exif_read_data(__DIR__."/heic_iloc_underflow.heic"));
 @unlink(__DIR__."/heic_iloc_underflow.heic");
 ?>
 --EXPECTF--
-Warning: exif_read_data(heic_iloc_underflow.heic): Invalid HEIF file in %s on line %d
+Warning: exif_read_data(): Invalid HEIF file in %s on line %d
 bool(false)
diff --git a/ext/exif/tests/oss_fuzz_442954659/oss_fuzz_442954659.phpt b/ext/exif/tests/oss_fuzz_442954659/oss_fuzz_442954659.phpt
@@ -7,4 +7,4 @@ exif
 exif_read_data(__DIR__."/input");
 ?>
 --EXPECTF--
-Warning: exif_read_data(%s): Invalid HEIF file in %s on line %d
+Warning: exif_read_data(): Invalid HEIF file in %s on line %d
diff --git a/ext/exif/tests/oss_fuzz_444479893/oss_fuzz_444479893.phpt b/ext/exif/tests/oss_fuzz_444479893/oss_fuzz_444479893.phpt
@@ -7,4 +7,4 @@ exif
 exif_read_data(__DIR__."/input");
 ?>
 --EXPECTF--
-Warning: exif_read_data(%s): Invalid HEIF file in %s on line %d
+Warning: exif_read_data(): Invalid HEIF file in %s on line %d
diff --git a/ext/exif/tests/tag_with_illegal_zero_components.phpt b/ext/exif/tests/tag_with_illegal_zero_components.phpt
@@ -9,9 +9,9 @@ var_dump(exif_read_data(__DIR__ . '/tag_with_illegal_zero_components.jpeg'));
 
 ?>
 --EXPECTF--
-Warning: exif_read_data(tag_with_illegal_zero_components.jpeg): Process tag(x0202=JPEGInterchangeFormatLength): Cannot be empty in %s on line %d
+Warning: exif_read_data(): Process tag(x0202=JPEGInterchangeFormatLength): Cannot be empty in %s on line %d
 
-Warning: exif_read_data(tag_with_illegal_zero_components.jpeg): File structure corrupted in %s on line %d
+Warning: exif_read_data(): File structure corrupted in %s on line %d
 
-Warning: exif_read_data(tag_with_illegal_zero_components.jpeg): Invalid JPEG file in %s on line %d
+Warning: exif_read_data(): Invalid JPEG file in %s on line %d
 bool(false)
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
@@ -322,7 +322,7 @@ void php_gd_error_method(int type, const char *format, va_list args)
 		default:
 			type = E_ERROR;
 	}
-	php_verror(NULL, "", type, format, args);
+	php_verror(NULL, type, format, args);
 }
 /* }}} */
 
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
@@ -635,15 +635,13 @@ void php_openssl_errors_restore_mark(void) {
 static void php_openssl_check_path_error(uint32_t arg_num, int type, const char *format, ...)
 {
 	va_list va;
-	const char *arg_name;
 
 	va_start(va, format);
 
 	if (type == E_ERROR) {
 		zend_argument_error_variadic(zend_ce_value_error, zend_active_function(), arg_num, format, va);
 	} else {
-		arg_name = get_active_function_arg_name(arg_num);
-		php_verror(NULL, arg_name, type, format, va);
+		php_verror(NULL, type, format, va);
 	}
 	va_end(va);
 }
diff --git a/ext/openssl/tests/openssl_csr_export_to_file_leak.phpt b/ext/openssl/tests/openssl_csr_export_to_file_leak.phpt
@@ -10,5 +10,5 @@ var_dump(openssl_csr_export_to_file($path, str_repeat("a", 10000)));
 
 ?>
 --EXPECTF--
-Warning: openssl_csr_export_to_file(output_filename): must be a valid file path %s
+Warning: openssl_csr_export_to_file(): must be a valid file path %s
 bool(false)
diff --git a/ext/openssl/tests/openssl_pkey_export_to_file_leak.phpt b/ext/openssl/tests/openssl_pkey_export_to_file_leak.phpt
@@ -11,5 +11,5 @@ var_dump(openssl_pkey_export_to_file($key, str_repeat("a", 10000), passphrase: "
 
 ?>
 --EXPECTF--
-Warning: openssl_pkey_export_to_file(output_filename): must be a valid file path %s
+Warning: openssl_pkey_export_to_file(): must be a valid file path %s
 bool(false)
diff --git a/ext/openssl/tests/openssl_x509_export_to_file_leak.phpt b/ext/openssl/tests/openssl_x509_export_to_file_leak.phpt
@@ -10,5 +10,5 @@ var_dump(openssl_x509_export_to_file($path, str_repeat("a", 10000)));
 
 ?>
 --EXPECTF--
-Warning: openssl_x509_export_to_file(output_filename): must be a valid file path %s
+Warning: openssl_x509_export_to_file(): must be a valid file path %s
 bool(false)
diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c
@@ -218,7 +218,7 @@ static void php_snmp_error(zval *object, int type, const char *format, ...)
 		zend_throw_exception_ex(php_snmp_exception_ce, type, "%s", snmp_object->snmp_errstr);
 	} else {
 		va_start(args, format);
-		php_verror(NULL, "", E_WARNING, format, args);
+		php_verror(NULL, E_WARNING, format, args);
 		va_end(args);
 	}
 }
diff --git a/main/main.c b/main/main.c
diff --git a/main/php.h b/main/php.h

Original file line number	Diff line number	Diff line change
`@@ -2036,11 +2036,11 @@ static void exif_error_docref(const char docref EXIFERR_DC, image_info_type Im`
`2036`	`2036`	`char *buf;`
`2037`	`2037`
`2038`	`2038`	`spprintf(&buf, 0, "%s(%ld): %s", _file, _line, format);`
`2039`		`- php_verror(docref, ImageInfo && ImageInfo->FileName ? ImageInfo->FileName:"", type, buf, args);`
	`2039`	`+ php_verror(docref, type, buf, args);`
`2040`	`2040`	`efree(buf);`
`2041`	`2041`	`}`
`2042`	`2042`	`#else`
`2043`		`- php_verror(docref, ImageInfo && ImageInfo->FileName ? ImageInfo->FileName:"", type, format, args);`
	`2043`	`+ php_verror(docref, type, format, args);`
`2044`	`2044`	`#endif`
`2045`	`2045`	`va_end(args);`
`2046`	`2046`	`}`