From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sat, 15 Oct 2016 14:16:34 +0000 (+0200)
Subject: RFC: Deprecate png2wbmp() and jpegwbmp()
X-Git-Tag: php-7.2.0alpha1~933^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1490446ce0e7b428f2ed05f00966baca1238c486;p=php

RFC: Deprecate png2wbmp() and jpegwbmp()

See <https://wiki.php.net/rfc/deprecate-png-jpeg-2wbmp>.
---

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index a1486c005b..6aff593a9e 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -4085,6 +4085,8 @@ 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 d0496cc82b..9cb1d14d7e 100644
--- a/ext/gd/tests/jpeg2wbmp_error1.phpt
+++ b/ext/gd/tests/jpeg2wbmp_error1.phpt
@@ -32,8 +32,12 @@ jpeg2wbmp($file, $file2, 20, 120, 9);
 jpeg2wbmp($file, $file2, 20, 120, -1);
 ?>
 --EXPECTF--
+Deprecated: jpeg2wbmp(): This function 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
+
 Warning: jpeg2wbmp(): Invalid threshold value '-1' in %s on line %d
 --CLEAN--
 <?php
diff --git a/ext/gd/tests/jpeg2wbmp_error2-mb.phpt b/ext/gd/tests/jpeg2wbmp_error2-mb.phpt
index a1c91b1397..db17bbb6c6 100644
--- a/ext/gd/tests/jpeg2wbmp_error2-mb.phpt
+++ b/ext/gd/tests/jpeg2wbmp_error2-mb.phpt
@@ -20,10 +20,16 @@ jpeg2wbmp(null, $file, 20, 120, 8);
 jpeg2wbmp(false, $file, 20, 120, 8);
 ?>
 --EXPECTF--
+Deprecated: jpeg2wbmp(): This function 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
+
 Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d
 
+Deprecated: jpeg2wbmp(): This function is deprecated in %s on line %d
+
 Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d
 --CLEAN--
 <?php
diff --git a/ext/gd/tests/jpeg2wbmp_error2.phpt b/ext/gd/tests/jpeg2wbmp_error2.phpt
index 692dcb842d..ffac9cd1df 100644
--- a/ext/gd/tests/jpeg2wbmp_error2.phpt
+++ b/ext/gd/tests/jpeg2wbmp_error2.phpt
@@ -20,10 +20,16 @@ jpeg2wbmp(null, $file, 20, 120, 8);
 jpeg2wbmp(false, $file, 20, 120, 8);
 ?>
 --EXPECTF--
+Deprecated: jpeg2wbmp(): This function 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
+
 Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d
 
+Deprecated: jpeg2wbmp(): This function is deprecated in %s on line %d
+
 Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d
 --CLEAN--
 <?php
diff --git a/ext/gd/tests/jpeg2wbmp_error3.phpt b/ext/gd/tests/jpeg2wbmp_error3.phpt
index df436c8cc3..8e36b04072 100644
--- a/ext/gd/tests/jpeg2wbmp_error3.phpt
+++ b/ext/gd/tests/jpeg2wbmp_error3.phpt
@@ -32,10 +32,16 @@ jpeg2wbmp($file, null, 20, 120, 8);
 jpeg2wbmp($file, false, 20, 120, 8);
 ?>
 --EXPECTF--
+Deprecated: jpeg2wbmp(): This function 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
+
 Warning: jpeg2wbmp(): Unable to open '' for writing in %s on line %d
 
+Deprecated: jpeg2wbmp(): This function is deprecated in %s on line %d
+
 Warning: jpeg2wbmp(): Unable to open '' for writing in %s on line %d
 --CLEAN--
 <?php
diff --git a/ext/gd/tests/png2wbmp_error1-mb.phpt b/ext/gd/tests/png2wbmp_error1-mb.phpt
index a19cf5e017..00d526cbe6 100644
--- a/ext/gd/tests/png2wbmp_error1-mb.phpt
+++ b/ext/gd/tests/png2wbmp_error1-mb.phpt
@@ -32,8 +32,12 @@ png2wbmp($file, $file2, 20, 120, 9);
 png2wbmp($file, $file2, 20, 120, -1);
 ?>
 --EXPECTF--
+Deprecated: png2wbmp(): This function 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
+
 Warning: png2wbmp(): Invalid threshold value '-1' in %s on line %d
 --CLEAN--
 <?php
diff --git a/ext/gd/tests/png2wbmp_error1.phpt b/ext/gd/tests/png2wbmp_error1.phpt
index 1e9d717d94..0a4ade70e9 100644
--- a/ext/gd/tests/png2wbmp_error1.phpt
+++ b/ext/gd/tests/png2wbmp_error1.phpt
@@ -32,8 +32,12 @@ png2wbmp($file, $file2, 20, 120, 9);
 png2wbmp($file, $file2, 20, 120, -1);
 ?>
 --EXPECTF--
+Deprecated: png2wbmp(): This function 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
+
 Warning: png2wbmp(): Invalid threshold value '-1' in %s on line %d
 --CLEAN--
 <?php
diff --git a/ext/gd/tests/png2wbmp_error2.phpt b/ext/gd/tests/png2wbmp_error2.phpt
index ba8e43e7f0..19ab01860e 100644
--- a/ext/gd/tests/png2wbmp_error2.phpt
+++ b/ext/gd/tests/png2wbmp_error2.phpt
@@ -20,10 +20,16 @@ png2wbmp(null, $file, 20, 120, 8);
 png2wbmp(false, $file, 20, 120, 8);
 ?>
 --EXPECTF--
+Deprecated: png2wbmp(): This function 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
+
 Warning: png2wbmp(): Unable to open '' for reading in %s on line %d
 
+Deprecated: png2wbmp(): This function is deprecated in %s on line %d
+
 Warning: png2wbmp(): Unable to open '' for reading in %s on line %d
 --CLEAN--
 <?php
diff --git a/ext/gd/tests/png2wbmp_error3.phpt b/ext/gd/tests/png2wbmp_error3.phpt
index 1e33f59b18..063e023d26 100644
--- a/ext/gd/tests/png2wbmp_error3.phpt
+++ b/ext/gd/tests/png2wbmp_error3.phpt
@@ -32,10 +32,16 @@ png2wbmp($file, null, 20, 120, 8);
 png2wbmp($file, false, 20, 120, 8);
 ?>
 --EXPECTF--
+Deprecated: png2wbmp(): This function 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
+
 Warning: png2wbmp(): Unable to open '' for writing in %s on line %d
 
+Deprecated: png2wbmp(): This function is deprecated in %s on line %d
+
 Warning: png2wbmp(): Unable to open '' for writing in %s on line %d
 --CLEAN--
 <?php