mirror of
https://github.com/php/php-src.git
synced 2024-11-23 09:54:15 +08:00
Change PHP_ZTS and PHP_DEBUG to bool to match their ZEND equivalents (#13079)
Co-authored-by: haszi <haszika80@gmail.com>
This commit is contained in:
parent
6f3888fe9a
commit
90800b62bb
1
NEWS
1
NEWS
@ -6,6 +6,7 @@ Core:
|
||||
. Added zend_call_stack_get implementation for NetBSD, DragonFlyBSD,
|
||||
Solaris and Haiku. (David Carlier)
|
||||
. Enabled ifunc checks on FreeBSD from the 12.x releases. (Freaky)
|
||||
. Changed the type of PHP_DEBUG and PHP_ZTS constants to bool. (haszi)
|
||||
|
||||
Date:
|
||||
. Added DateTime[Immutable]::createFromTimestamp. (Marc Bennewitz)
|
||||
|
@ -19,6 +19,9 @@ PHP 8.4 UPGRADE NOTES
|
||||
1. Backward Incompatible Changes
|
||||
========================================
|
||||
|
||||
- Core:
|
||||
. The type of PHP_DEBUG and PHP_ZTS constants changed to bool.
|
||||
|
||||
- DOM:
|
||||
. New methods and constants were added to some DOM classes. If you inherit
|
||||
from these and you happen to have a method or property with the same name,
|
||||
|
@ -4,7 +4,7 @@ Bug #72660 (NULL Pointer dereference in zend_virtual_cwd)
|
||||
zip
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if(PHP_ZTS == 0) { die('skip ZTS required'); }
|
||||
if(!PHP_ZTS) { die('skip ZTS required'); }
|
||||
?>
|
||||
--FILE--
|
||||
<?php
|
||||
|
@ -35,12 +35,12 @@ const PHP_EXTRA_VERSION = UNKNOWN;
|
||||
*/
|
||||
const PHP_VERSION_ID = UNKNOWN;
|
||||
/**
|
||||
* @var int
|
||||
* @var bool
|
||||
* @cvalue PHP_ZTS
|
||||
*/
|
||||
const PHP_ZTS = UNKNOWN;
|
||||
/**
|
||||
* @var int
|
||||
* @var bool
|
||||
* @cvalue PHP_DEBUG
|
||||
*/
|
||||
const PHP_DEBUG = UNKNOWN;
|
||||
|
6
main/main_arginfo.h
generated
6
main/main_arginfo.h
generated
@ -1,5 +1,5 @@
|
||||
/* This is a generated file, edit the .stub.php file instead.
|
||||
* Stub hash: 6c0b61ad50611c52fd76dbbb25089817dc06eff4 */
|
||||
* Stub hash: 9447c185f3098fd2c7806e2f8adf4bf395bb18af */
|
||||
|
||||
|
||||
|
||||
@ -11,8 +11,8 @@ static void register_main_symbols(int module_number)
|
||||
REGISTER_LONG_CONSTANT("PHP_RELEASE_VERSION", PHP_RELEASE_VERSION, CONST_PERSISTENT);
|
||||
REGISTER_STRING_CONSTANT("PHP_EXTRA_VERSION", PHP_EXTRA_VERSION, CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("PHP_VERSION_ID", PHP_VERSION_ID, CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("PHP_ZTS", PHP_ZTS, CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("PHP_DEBUG", PHP_DEBUG, CONST_PERSISTENT);
|
||||
REGISTER_BOOL_CONSTANT("PHP_ZTS", PHP_ZTS, CONST_PERSISTENT);
|
||||
REGISTER_BOOL_CONSTANT("PHP_DEBUG", PHP_DEBUG, CONST_PERSISTENT);
|
||||
REGISTER_STRING_CONSTANT("PHP_OS", PHP_OS_STR, CONST_PERSISTENT);
|
||||
REGISTER_STRING_CONSTANT("PHP_OS_FAMILY", PHP_OS_FAMILY, CONST_PERSISTENT);
|
||||
REGISTER_STRING_CONSTANT("DEFAULT_INCLUDE_PATH", PHP_INCLUDE_PATH, CONST_PERSISTENT);
|
||||
|
Loading…
Reference in New Issue
Block a user