Skip to content

Commit 90800b6

Browse files
haszihaszi
and
haszi
authored
Change PHP_ZTS and PHP_DEBUG to bool to match their ZEND equivalents (#13079)
Co-authored-by: haszi <haszika80@gmail.com>
1 parent 6f3888f commit 90800b6

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Core:
66
. Added zend_call_stack_get implementation for NetBSD, DragonFlyBSD,
77
Solaris and Haiku. (David Carlier)
88
. Enabled ifunc checks on FreeBSD from the 12.x releases. (Freaky)
9+
. Changed the type of PHP_DEBUG and PHP_ZTS constants to bool. (haszi)
910

1011
Date:
1112
. Added DateTime[Immutable]::createFromTimestamp. (Marc Bennewitz)

UPGRADING

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ PHP 8.4 UPGRADE NOTES
1919
1. Backward Incompatible Changes
2020
========================================
2121

22+
- Core:
23+
. The type of PHP_DEBUG and PHP_ZTS constants changed to bool.
24+
2225
- DOM:
2326
. New methods and constants were added to some DOM classes. If you inherit
2427
from these and you happen to have a method or property with the same name,

ext/zip/tests/bug72660.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bug #72660 (NULL Pointer dereference in zend_virtual_cwd)
44
zip
55
--SKIPIF--
66
<?php
7-
if(PHP_ZTS == 0) { die('skip ZTS required'); }
7+
if(!PHP_ZTS) { die('skip ZTS required'); }
88
?>
99
--FILE--
1010
<?php

main/main.stub.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
*/
3636
const PHP_VERSION_ID = UNKNOWN;
3737
/**
38-
* @var int
38+
* @var bool
3939
* @cvalue PHP_ZTS
4040
*/
4141
const PHP_ZTS = UNKNOWN;
4242
/**
43-
* @var int
43+
* @var bool
4444
* @cvalue PHP_DEBUG
4545
*/
4646
const PHP_DEBUG = UNKNOWN;

main/main_arginfo.h

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)