Mark functions as PHP_DEP_FE instead of manually emitting the notice

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 6aff593a9e18fbbb80063fae8cf07e28e5b2e1c3..8b1ba566a59a186e85efffe2d634436c38bbf66a 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -958,10 +958,10 @@ const zend_function_entry gd_functions[] = {
        PHP_FE(imagetypes,                                                              arginfo_imagetypes)
 
 #if defined(HAVE_GD_JPG)
-       PHP_FE(jpeg2wbmp,                                                               arginfo_jpeg2wbmp)
+       PHP_DEP_FE(jpeg2wbmp,                                                   arginfo_jpeg2wbmp)
 #endif
 #if defined(HAVE_GD_PNG)
-       PHP_FE(png2wbmp,                                                                arginfo_png2wbmp)
+       PHP_DEP_FE(png2wbmp,                                                    arginfo_png2wbmp)
 #endif
        PHP_FE(image2wbmp,                                                              arginfo_image2wbmp)
        PHP_FE(imagelayereffect,                                                arginfo_imagelayereffect)
@@ -4085,8 +4085,6 @@ static void _php_image_convert(INTERNAL_FUNCTION_PARAMETERS, int image_type )
     zend_long ignore_warning;
 #endif
 
-       php_error_docref(NULL, E_DEPRECATED, "This function is deprecated");
-
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "pplll", &f_org, &f_org_len, &f_dest, &f_dest_len, &height, &width, &threshold) == FAILURE) {
                return;
        }

diff --git a/ext/gd/tests/jpeg2wbmp_error1.phpt b/ext/gd/tests/jpeg2wbmp_error1.phpt
index 9cb1d14d7e3161d40d972dacf2a4cb7eddc32955..2368e7549f065eaefbedda77dc13a2c6b2328e18 100644 (file)
--- a/ext/gd/tests/jpeg2wbmp_error1.phpt
+++ b/ext/gd/tests/jpeg2wbmp_error1.phpt
@@ -32,11 +32,11 @@ jpeg2wbmp($file, $file2, 20, 120, 9);
 jpeg2wbmp($file, $file2, 20, 120, -1);
 ?>
 --EXPECTF--
-Deprecated: jpeg2wbmp(): This function is deprecated in %s on line %d
+Deprecated: Function jpeg2wbmp() is deprecated in %s on line %d
 
 Warning: jpeg2wbmp(): Invalid threshold value '9' in %s on line %d
 
-Deprecated: jpeg2wbmp(): This function is deprecated in %s on line %d
+Deprecated: Function jpeg2wbmp() is deprecated in %s on line %d
 
 Warning: jpeg2wbmp(): Invalid threshold value '-1' in %s on line %d
 --CLEAN--

diff --git a/ext/gd/tests/jpeg2wbmp_error2-mb.phpt b/ext/gd/tests/jpeg2wbmp_error2-mb.phpt
index db17bbb6c6b0845984b87156b31cfd45e7e042ed..b414cb35aaee06a34dbd42e51fca384dc9eaac79 100644 (file)
--- a/ext/gd/tests/jpeg2wbmp_error2-mb.phpt
+++ b/ext/gd/tests/jpeg2wbmp_error2-mb.phpt
@@ -20,15 +20,15 @@ jpeg2wbmp(null, $file, 20, 120, 8);
 jpeg2wbmp(false, $file, 20, 120, 8);
 ?>
 --EXPECTF--
-Deprecated: jpeg2wbmp(): This function is deprecated in %s on line %d
+Deprecated: Function jpeg2wbmp() is deprecated in %s on line %d
 
 Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d
 
-Deprecated: jpeg2wbmp(): This function is deprecated in %s on line %d
+Deprecated: Function jpeg2wbmp() is deprecated in %s on line %d
 
 Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d
 
-Deprecated: jpeg2wbmp(): This function is deprecated in %s on line %d
+Deprecated: Function jpeg2wbmp() is deprecated in %s on line %d
 
 Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d
 --CLEAN--

diff --git a/ext/gd/tests/jpeg2wbmp_error2.phpt b/ext/gd/tests/jpeg2wbmp_error2.phpt
index ffac9cd1df9b98d9e657486fb0fcb05a0450a990..22e2301d9932eb808f14e66960edc3cf53674609 100644 (file)
--- a/ext/gd/tests/jpeg2wbmp_error2.phpt
+++ b/ext/gd/tests/jpeg2wbmp_error2.phpt
@@ -20,15 +20,15 @@ jpeg2wbmp(null, $file, 20, 120, 8);
 jpeg2wbmp(false, $file, 20, 120, 8);
 ?>
 --EXPECTF--
-Deprecated: jpeg2wbmp(): This function is deprecated in %s on line %d
+Deprecated: Function jpeg2wbmp() is deprecated in %s on line %d
 
 Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d
 
-Deprecated: jpeg2wbmp(): This function is deprecated in %s on line %d
+Deprecated: Function jpeg2wbmp() is deprecated in %s on line %d
 
 Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d
 
-Deprecated: jpeg2wbmp(): This function is deprecated in %s on line %d
+Deprecated: Function jpeg2wbmp() is deprecated in %s on line %d
 
 Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d
 --CLEAN--

diff --git a/ext/gd/tests/jpeg2wbmp_error3.phpt b/ext/gd/tests/jpeg2wbmp_error3.phpt
index 8e36b0407272181f7d2854fa463aae911a5234d4..e15c94765f2cce5ed2813881f70904ae59966b57 100644 (file)
--- a/ext/gd/tests/jpeg2wbmp_error3.phpt
+++ b/ext/gd/tests/jpeg2wbmp_error3.phpt
@@ -32,15 +32,15 @@ jpeg2wbmp($file, null, 20, 120, 8);
 jpeg2wbmp($file, false, 20, 120, 8);
 ?>
 --EXPECTF--
-Deprecated: jpeg2wbmp(): This function is deprecated in %s on line %d
+Deprecated: Function jpeg2wbmp() is deprecated in %s on line %d
 
 Warning: jpeg2wbmp(): Unable to open '' for writing in %s on line %d
 
-Deprecated: jpeg2wbmp(): This function is deprecated in %s on line %d
+Deprecated: Function jpeg2wbmp() is deprecated in %s on line %d
 
 Warning: jpeg2wbmp(): Unable to open '' for writing in %s on line %d
 
-Deprecated: jpeg2wbmp(): This function is deprecated in %s on line %d
+Deprecated: Function jpeg2wbmp() is deprecated in %s on line %d
 
 Warning: jpeg2wbmp(): Unable to open '' for writing in %s on line %d
 --CLEAN--

diff --git a/ext/gd/tests/png2wbmp_error1-mb.phpt b/ext/gd/tests/png2wbmp_error1-mb.phpt
index 00d526cbe6813dfb32f3b8d95c1d74e49e59a4f6..a16e1a67c66a6f302ef6a85edac822f24acd31b6 100644 (file)
--- a/ext/gd/tests/png2wbmp_error1-mb.phpt
+++ b/ext/gd/tests/png2wbmp_error1-mb.phpt
@@ -32,11 +32,11 @@ png2wbmp($file, $file2, 20, 120, 9);
 png2wbmp($file, $file2, 20, 120, -1);
 ?>
 --EXPECTF--
-Deprecated: png2wbmp(): This function is deprecated in %s on line %d
+Deprecated: Function png2wbmp() is deprecated in %s on line %d
 
 Warning: png2wbmp(): Invalid threshold value '9' in %s on line %d
 
-Deprecated: png2wbmp(): This function is deprecated in %s on line %d
+Deprecated: Function png2wbmp() is deprecated in %s on line %d
 
 Warning: png2wbmp(): Invalid threshold value '-1' in %s on line %d
 --CLEAN--

diff --git a/ext/gd/tests/png2wbmp_error1.phpt b/ext/gd/tests/png2wbmp_error1.phpt
index 0a4ade70e9cf7bd1c9aab8b71686c38deaa6eef6..e3496a45c935d2f2fe637ca84ad50e229519710b 100644 (file)
--- a/ext/gd/tests/png2wbmp_error1.phpt
+++ b/ext/gd/tests/png2wbmp_error1.phpt
@@ -32,11 +32,11 @@ png2wbmp($file, $file2, 20, 120, 9);
 png2wbmp($file, $file2, 20, 120, -1);
 ?>
 --EXPECTF--
-Deprecated: png2wbmp(): This function is deprecated in %s on line %d
+Deprecated: Function png2wbmp() is deprecated in %s on line %d
 
 Warning: png2wbmp(): Invalid threshold value '9' in %s on line %d
 
-Deprecated: png2wbmp(): This function is deprecated in %s on line %d
+Deprecated: Function png2wbmp() is deprecated in %s on line %d
 
 Warning: png2wbmp(): Invalid threshold value '-1' in %s on line %d
 --CLEAN--

diff --git a/ext/gd/tests/png2wbmp_error2.phpt b/ext/gd/tests/png2wbmp_error2.phpt
index 19ab01860e00fc109df7dd32f386a16cab34b28f..71912b6198310e0ed6925563af1516a7fc6582ab 100644 (file)
--- a/ext/gd/tests/png2wbmp_error2.phpt
+++ b/ext/gd/tests/png2wbmp_error2.phpt
@@ -20,15 +20,15 @@ png2wbmp(null, $file, 20, 120, 8);
 png2wbmp(false, $file, 20, 120, 8);
 ?>
 --EXPECTF--
-Deprecated: png2wbmp(): This function is deprecated in %s on line %d
+Deprecated: Function png2wbmp() is deprecated in %s on line %d
 
 Warning: png2wbmp(): Unable to open '' for reading in %s on line %d
 
-Deprecated: png2wbmp(): This function is deprecated in %s on line %d
+Deprecated: Function png2wbmp() is deprecated in %s on line %d
 
 Warning: png2wbmp(): Unable to open '' for reading in %s on line %d
 
-Deprecated: png2wbmp(): This function is deprecated in %s on line %d
+Deprecated: Function png2wbmp() is deprecated in %s on line %d
 
 Warning: png2wbmp(): Unable to open '' for reading in %s on line %d
 --CLEAN--

diff --git a/ext/gd/tests/png2wbmp_error3.phpt b/ext/gd/tests/png2wbmp_error3.phpt
index 063e023d262266c0978bbc0dc3c311145fdc0b93..53ffb543197a25f503e3b606d2bce7d61d153672 100644 (file)
--- a/ext/gd/tests/png2wbmp_error3.phpt
+++ b/ext/gd/tests/png2wbmp_error3.phpt
@@ -32,15 +32,15 @@ png2wbmp($file, null, 20, 120, 8);
 png2wbmp($file, false, 20, 120, 8);
 ?>
 --EXPECTF--
-Deprecated: png2wbmp(): This function is deprecated in %s on line %d
+Deprecated: Function png2wbmp() is deprecated in %s on line %d
 
 Warning: png2wbmp(): Unable to open '' for writing in %s on line %d
 
-Deprecated: png2wbmp(): This function is deprecated in %s on line %d
+Deprecated: Function png2wbmp() is deprecated in %s on line %d
 
 Warning: png2wbmp(): Unable to open '' for writing in %s on line %d
 
-Deprecated: png2wbmp(): This function is deprecated in %s on line %d
+Deprecated: Function png2wbmp() is deprecated in %s on line %d
 
 Warning: png2wbmp(): Unable to open '' for writing in %s on line %d
 --CLEAN--