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

Deprecate imap NIL constant

Browse source 
Part of https://wiki.php.net/rfc/deprecations_php_8_1.
This commit is contained in:
Nikita Popov 2021-07-08 16:03:47 +02:00
parent f0b190c32d
commit 2bc23cc6e3
4 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
UPGRADING
View file

@ -350,6 +350,10 @@ PHP 8.1 UPGRADE NOTES
instead. instead.
RFC: https://wiki.php.net/rfc/deprecations_php_8_1 RFC: https://wiki.php.net/rfc/deprecations_php_8_1
- IMAP:
. The NIL constant has been deprecated. Use 0 instead.
RFC: https://wiki.php.net/rfc/deprecations_php_8_1
- Intl: - Intl:
. Calling IntlCalendar::roll() with bool argument is deprecated. Pass 1 and -1 . Calling IntlCalendar::roll() with bool argument is deprecated. Pass 1 and -1
instead of true and false respectively. instead of true and false respectively.

2
ext/imap/php_imap.c
View file

@ -491,7 +491,7 @@ PHP_MINIT_FUNCTION(imap)
imap_object_handlers.clone_obj = NULL; imap_object_handlers.clone_obj = NULL;
/* lets allow NIL */ /* lets allow NIL */
REGISTER_LONG_CONSTANT("NIL", NIL, CONST_PERSISTENT | CONST_CS); REGISTER_LONG_CONSTANT("NIL", NIL, CONST_PERSISTENT | CONST_CS | CONST_DEPRECATED);
/* plug in our gets */ /* plug in our gets */
mail_parameters(NIL, SET_GETS, (void *) NIL); mail_parameters(NIL, SET_GETS, (void *) NIL);

2
ext/imap/tests/imap_open_error.phpt
View file

@ -23,7 +23,7 @@ try {
} }
try { try {
imap_open('', '', '', NIL, -1); imap_open('', '', '', 0, -1);
} catch (\ValueError $e) { } catch (\ValueError $e) {
echo $e->getMessage() . \PHP_EOL; echo $e->getMessage() . \PHP_EOL;
} }

11
ext/imap/tests/nil_constant.phpt Normal file
View file

@ -0,0 +1,11 @@
--TEST--
NIL constant is deprecated
--EXTENSIONS--
imap
--FILE--
<?php
var_dump(NIL);
?>
--EXPECTF--
Deprecated: Constant NIL is deprecated in %s on line %d
int(0)