Skip to content

Commit e8027e7

Browse files
authored
Merge branch refs/heads/1.12.x into 2.0.x
2 parents 8968dad + cb8f910 commit e8027e7

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

conf/config.neon

+1
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ parameters:
256256
- OPENSSL_VERSION_NUMBER
257257
- ZEND_DEBUG_BUILD
258258
- ZEND_THREAD_SAFE
259+
- E_ALL # different on PHP 8.4
259260
customRulesetUsed: null
260261
editorUrl: null
261262
editorUrlTitle: null

tests/PHPStan/Analyser/nsrt/predefined-constants.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
assertType('4096', E_RECOVERABLE_ERROR);
4646
assertType('8192', E_DEPRECATED);
4747
assertType('16384', E_USER_DEPRECATED);
48-
assertType('32767', E_ALL);
48+
assertType('int', E_ALL);
4949
assertType('2048', E_STRICT);
5050
assertType('int<1, max>', __COMPILER_HALT_OFFSET__);
5151
assertType('true', true);

0 commit comments

Comments
 (0)