Merge branch refs/heads/1.12.x into 2.0.x

phpstan · Sep 19, 2024 · e8027e7 · e8027e7
2 parents 8968dad + cb8f910
commit e8027e7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/conf/config.neon b/conf/config.neon
@@ -256,6 +256,7 @@ parameters:
 		- OPENSSL_VERSION_NUMBER
 		- ZEND_DEBUG_BUILD
 		- ZEND_THREAD_SAFE
+		- E_ALL # different on PHP 8.4
 	customRulesetUsed: null
 	editorUrl: null
 	editorUrlTitle: null

diff --git a/tests/PHPStan/Analyser/nsrt/predefined-constants.php b/tests/PHPStan/Analyser/nsrt/predefined-constants.php
@@ -45,7 +45,7 @@
 assertType('4096', E_RECOVERABLE_ERROR);
 assertType('8192', E_DEPRECATED);
 assertType('16384', E_USER_DEPRECATED);
-assertType('32767', E_ALL);
+assertType('int', E_ALL);
 assertType('2048', E_STRICT);
 assertType('int<1, max>', __COMPILER_HALT_OFFSET__);
 assertType('true', true);