archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'pull-request/2164'

Browse source
This commit is contained in:
Christoph M. Becker 2016-11-13 23:17:25 +01:00
commit 189bbb586c
10 changed files with 53 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
UPGRADING
View file

@ -46,6 +46,10 @@ PHP 7.2 UPGRADE NOTES
4. Deprecated Functionality 4. Deprecated Functionality
======================================== ========================================
- GD:
. png2wbmp() and jpeg2wbmp() have been deprecated, and will be removed as of
PHP 8.0.0.
======================================== ========================================
5. Changed Functions 5. Changed Functions
======================================== ========================================

4
ext/gd/gd.c
View file

@ -972,10 +972,10 @@ const zend_function_entry gd_functions[] = {
PHP_FE(imagetypes, arginfo_imagetypes) PHP_FE(imagetypes, arginfo_imagetypes)
#if defined(HAVE_GD_JPG) #if defined(HAVE_GD_JPG)
PHP_FE(jpeg2wbmp, arginfo_jpeg2wbmp) PHP_DEP_FE(jpeg2wbmp, arginfo_jpeg2wbmp)
#endif #endif
#if defined(HAVE_GD_PNG) #if defined(HAVE_GD_PNG)
PHP_FE(png2wbmp, arginfo_png2wbmp) PHP_DEP_FE(png2wbmp, arginfo_png2wbmp)
#endif #endif
PHP_FE(image2wbmp, arginfo_image2wbmp) PHP_FE(image2wbmp, arginfo_image2wbmp)
PHP_FE(imagelayereffect, arginfo_imagelayereffect) PHP_FE(imagelayereffect, arginfo_imagelayereffect)

4
ext/gd/tests/jpeg2wbmp_error1.phpt
View file

@ -32,8 +32,12 @@ jpeg2wbmp($file, $file2, 20, 120, 9);
jpeg2wbmp($file, $file2, 20, 120, -1); jpeg2wbmp($file, $file2, 20, 120, -1);
?> ?>
--EXPECTF-- --EXPECTF--
Deprecated: Function jpeg2wbmp() is deprecated in %s on line %d
Warning: jpeg2wbmp(): Invalid threshold value '9' in %s on line %d Warning: jpeg2wbmp(): Invalid threshold value '9' 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 Warning: jpeg2wbmp(): Invalid threshold value '-1' in %s on line %d
--CLEAN-- --CLEAN--
<?php <?php

8
ext/gd/tests/jpeg2wbmp_error2-mb.phpt
View file

@ -20,10 +20,16 @@ jpeg2wbmp(null, $file, 20, 120, 8);
jpeg2wbmp(false, $file, 20, 120, 8); jpeg2wbmp(false, $file, 20, 120, 8);
?> ?>
--EXPECTF-- --EXPECTF--
Warning: jpeg2wbmp(): Unable to open '' for reading 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 Warning: jpeg2wbmp(): Unable to open '' for reading 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: Function jpeg2wbmp() is deprecated in %s on line %d
Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d
--CLEAN-- --CLEAN--
<?php <?php

8
ext/gd/tests/jpeg2wbmp_error2.phpt
View file

@ -20,10 +20,16 @@ jpeg2wbmp(null, $file, 20, 120, 8);
jpeg2wbmp(false, $file, 20, 120, 8); jpeg2wbmp(false, $file, 20, 120, 8);
?> ?>
--EXPECTF-- --EXPECTF--
Warning: jpeg2wbmp(): Unable to open '' for reading 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 Warning: jpeg2wbmp(): Unable to open '' for reading 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: Function jpeg2wbmp() is deprecated in %s on line %d
Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d
--CLEAN-- --CLEAN--
<?php <?php

8
ext/gd/tests/jpeg2wbmp_error3.phpt
View file

@ -32,10 +32,16 @@ jpeg2wbmp($file, null, 20, 120, 8);
jpeg2wbmp($file, false, 20, 120, 8); jpeg2wbmp($file, false, 20, 120, 8);
?> ?>
--EXPECTF-- --EXPECTF--
Warning: jpeg2wbmp(): Unable to open '' for writing 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 Warning: jpeg2wbmp(): Unable to open '' for writing 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: Function jpeg2wbmp() is deprecated in %s on line %d
Warning: jpeg2wbmp(): Unable to open '' for writing in %s on line %d Warning: jpeg2wbmp(): Unable to open '' for writing in %s on line %d
--CLEAN-- --CLEAN--
<?php <?php

4
ext/gd/tests/png2wbmp_error1-mb.phpt
View file

@ -32,8 +32,12 @@ png2wbmp($file, $file2, 20, 120, 9);
png2wbmp($file, $file2, 20, 120, -1); png2wbmp($file, $file2, 20, 120, -1);
?> ?>
--EXPECTF-- --EXPECTF--
Deprecated: Function png2wbmp() is deprecated in %s on line %d
Warning: png2wbmp(): Invalid threshold value '9' in %s on line %d Warning: png2wbmp(): Invalid threshold value '9' 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 Warning: png2wbmp(): Invalid threshold value '-1' in %s on line %d
--CLEAN-- --CLEAN--
<?php <?php

4
ext/gd/tests/png2wbmp_error1.phpt
View file

@ -32,8 +32,12 @@ png2wbmp($file, $file2, 20, 120, 9);
png2wbmp($file, $file2, 20, 120, -1); png2wbmp($file, $file2, 20, 120, -1);
?> ?>
--EXPECTF-- --EXPECTF--
Deprecated: Function png2wbmp() is deprecated in %s on line %d
Warning: png2wbmp(): Invalid threshold value '9' in %s on line %d Warning: png2wbmp(): Invalid threshold value '9' 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 Warning: png2wbmp(): Invalid threshold value '-1' in %s on line %d
--CLEAN-- --CLEAN--
<?php <?php

8
ext/gd/tests/png2wbmp_error2.phpt
View file

@ -20,10 +20,16 @@ png2wbmp(null, $file, 20, 120, 8);
png2wbmp(false, $file, 20, 120, 8); png2wbmp(false, $file, 20, 120, 8);
?> ?>
--EXPECTF-- --EXPECTF--
Warning: png2wbmp(): Unable to open '' for reading 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 Warning: png2wbmp(): Unable to open '' for reading 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: Function png2wbmp() is deprecated in %s on line %d
Warning: png2wbmp(): Unable to open '' for reading in %s on line %d Warning: png2wbmp(): Unable to open '' for reading in %s on line %d
--CLEAN-- --CLEAN--
<?php <?php

8
ext/gd/tests/png2wbmp_error3.phpt
View file

@ -32,10 +32,16 @@ png2wbmp($file, null, 20, 120, 8);
png2wbmp($file, false, 20, 120, 8); png2wbmp($file, false, 20, 120, 8);
?> ?>
--EXPECTF-- --EXPECTF--
Warning: png2wbmp(): Unable to open '' for writing 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 Warning: png2wbmp(): Unable to open '' for writing 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: Function png2wbmp() is deprecated in %s on line %d
Warning: png2wbmp(): Unable to open '' for writing in %s on line %d Warning: png2wbmp(): Unable to open '' for writing in %s on line %d
--CLEAN-- --CLEAN--
<?php <?php