From: Nikita Popov Date: Tue, 10 Dec 2019 12:52:36 +0000 (+0100) Subject: Merge branch 'PHP-7.4' X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa18c115bebacd95d8507888e19eee8f36f5607c;p=php Merge branch 'PHP-7.4' * PHP-7.4: Fix release build failure --- fa18c115bebacd95d8507888e19eee8f36f5607c diff --cc ext/opcache/tests/preload_009.phpt index d0c762c801,1adbf5b006..0434bfb91c --- a/ext/opcache/tests/preload_009.phpt +++ b/ext/opcache/tests/preload_009.phpt @@@ -13,6 -13,6 +13,6 @@@ var_dump(trait_exists('T')) var_dump(class_exists('Foo')); ?> --EXPECTF-- -Warning: Use of undefined constant UNDEF - assumed 'UNDEF' (this will throw an Error in a future version of PHP) in Unknown on line 0 -bool(true) -bool(true) +Fatal error: Undefined constant 'UNDEF' in Unknown on line 0 + - Fatal error: Error generated while resolving initializers of class Foo during preloading in Unknown on line 0 ++Fatal error: Failed to resolve initializers of class Foo during preloading in Unknown on line 0 diff --cc ext/opcache/tests/preload_loadable_classes_2.phpt index 17100ff64f,fc3fb1dc40..de4b04f8ab --- a/ext/opcache/tests/preload_loadable_classes_2.phpt +++ b/ext/opcache/tests/preload_loadable_classes_2.phpt @@@ -10,6 -10,8 +10,6 @@@ opcache.preload={PWD}/preload_loadable_ --FILE-- Unreachable --EXPECTF-- -Warning: Use of undefined constant UNDEF - assumed 'UNDEF' (this will throw an Error in a future version of PHP) in Unknown on line 0 - -Fatal error: Class 'Foo' not found in Unknown on line 0 +Fatal error: Undefined constant 'UNDEF' in Unknown on line 0 - Fatal error: Error generated while resolving initializers of class Test during preloading in Unknown on line 0 + Fatal error: Failed to resolve initializers of class Test during preloading in Unknown on line 0