Commit 40edd58

committed

Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3: standard: Take `zend.assertions` into account for dynamic calls to `assert()` (php#18521)

2 parents 84f82d0 + 8d2682f commit 40edd58Copy full SHA for 40edd58

File tree

+30

-1

lines changed

+30

-1

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,8 @@ PHP NEWS`
`37`	`37`	`- Standard:`
`38`	`38`	`. Fixed bug GH-17403 (Potential deadlock when putenv fails). (nielsdos)`
`39`	`39`	`. Fixed bug GH-18400 (http_build_query type error is inaccurate). (nielsdos)`
	`40`	`+ . Fixed bug GH-18509 (Dynamic calls to assert() ignore zend.assertions).`
	`41`	`+ (timwolla)`
`40`	`42`
`41`	`43`	`- Windows:`
`42`	`44`	`. Fix leak+crash with sapi_windows_set_ctrl_handler(). (nielsdos)`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,11 @@ PHP_FUNCTION(assert)`
`178`	`178`	`zend_string *description_str = NULL;`
`179`	`179`	`zend_object *description_obj = NULL;`
`180`	`180`
`181`		`- if (!ASSERTG(active)) {`
	`181`	`+ /* EG(assertions) <= 0 is only reachable by dynamic calls to assert(),`
	`182`	`+ * since calls known at compile time will skip the entire call when`
	`183`	`+ * assertions are disabled.`
	`184`	`+ */`
	`185`	`+ if (!ASSERTG(active) \|\| EG(assertions) <= 0) {`
`182`	`186`	`RETURN_TRUE;`
`183`	`187`	`}`
`184`	`188`

Lines changed: 23 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,23 @@`
	`1`	`+--TEST--`
	`2`	`+GH-18509: Dynamic calls to assert() ignore zend.assertions`
	`3`	`+--INI--`
	`4`	`+zend.assertions=0`
	`5`	`+--FILE--`
	`6`	`+<?php`
	`7`	`+`
	`8`	`+$c = "assert";`
	`9`	`+`
	`10`	`+$c(false);`
	`11`	`+`
	`12`	`+var_dump(array_map(assert(...), [true, true, false]));`
	`13`	`+`
	`14`	`+?>`
	`15`	`+--EXPECT--`
	`16`	`+array(3) {`
	`17`	`+ [0]=>`
	`18`	`+ bool(true)`
	`19`	`+ [1]=>`
	`20`	`+ bool(true)`
	`21`	`+ [2]=>`
	`22`	`+ bool(true)`
	`23`	`+}`

Comments

(0)