Change 'undefined constant' from E_NOTICE to E_WARNING and mention deprecation

Implements RFC "Deprecate and Remove Bareword (Unquoted) Strings"
[https://wiki.php.net/rfc/deprecate-bareword-strings]

diff --git a/NEWS b/NEWS
index 5e14ea2892d046626f65b70aafc8547b496b77a3..17837368cbb6884b6b4d872ba39faa8a1f77f16f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,8 @@ PHP                                                                        NEWS
     php.exe). (Michele Locati)
   . Implemented "Convert numeric keys in object/array casts" RFC, fixes
     bugs #53838, #61655, #66173, #70925, #72254, etc. (Andrea)
+  . Implemented "Deprecate and Remove Bareword (Unquoted) Strings" RFC.
+    (Rowan Collins)
   . Raised minimum supported Windows versions to Windows 7/Server 2008 R2.
     (Anatol)
   . Implemented minor optimization in array_keys/array_values(). (Sara)

diff --git a/UPGRADING b/UPGRADING
index 03d8d68186dbfa628d9dc655069f39a7b11fb829..f6b54d423353c3b55007435cef0694f830235d17 100644 (file)
--- a/UPGRADING
+++ b/UPGRADING
@@ -35,6 +35,9 @@ PHP 7.2 UPGRADE NOTES
     /^(0|(-?[1-9][0-9]*))$/ where PHP_INT_MIN <= n <= PHP_INT_MAX) to integer
     keys. This fixes the behaviour of previous versions, where numeric string
     property names would become inaccessible string keys.
+  . Unqualified references to undefined constants now generate a Warning instead
+    of a notice. They will generate an Error in a future version of PHP.
+    (https://wiki.php.net/rfc/deprecate-bareword-strings)
   . Minimum supported Windows versions are Windows 7/Server 2008 R2.
 
 - BCMath:

diff --git a/Zend/tests/bug37811.phpt b/Zend/tests/bug37811.phpt
index f224f9b31130e442d06a49cb1f0314d305be401e..299018363de0a71814d438fc123e54f907556b17 100644 (file)
--- a/Zend/tests/bug37811.phpt
+++ b/Zend/tests/bug37811.phpt
@@ -23,6 +23,6 @@ string(3) "Foo"
 
 Warning: Constants may only evaluate to scalar values or arrays in %sbug37811.php on line %d
 
-Notice: Use of undefined constant Baz - assumed 'Baz' in %sbug37811.php on line %d
+Warning: Use of undefined constant Baz - assumed 'Baz' (this will throw an Error in a future version of PHP) in %sbug37811.php on line %d
 string(3) "Baz"
 ===DONE===

diff --git a/Zend/tests/bug43344_1.phpt b/Zend/tests/bug43344_1.phpt
index 59129d75cf1592cfe5e13814cac96e376d1f82ac..4635240699b95591cea1dff4a7bd038e96985266 100644 (file)
--- a/Zend/tests/bug43344_1.phpt
+++ b/Zend/tests/bug43344_1.phpt
@@ -19,14 +19,14 @@ echo f2()."\n";
 echo f3()."\n";
 ?>
 --EXPECTF--
-Notice: Use of undefined constant bar - assumed 'bar' in %sbug43344_1.php on line 13
+Warning: Use of undefined constant bar - assumed 'bar' (this will throw an Error in a future version of PHP) in %sbug43344_1.php on line 13
 bar
 
-Notice: Use of undefined constant bar - assumed 'bar' in %sbug43344_1.php on line 3
+Warning: Use of undefined constant bar - assumed 'bar' (this will throw an Error in a future version of PHP) in %sbug43344_1.php on line 3
 bar
 
-Notice: Use of undefined constant bar - assumed 'bar' in %sbug43344_1.php on line 6
+Warning: Use of undefined constant bar - assumed 'bar' (this will throw an Error in a future version of PHP) in %sbug43344_1.php on line 6
 bar
 
-Notice: Use of undefined constant bar - assumed 'bar' in %sbug43344_1.php on line 9
+Warning: Use of undefined constant bar - assumed 'bar' (this will throw an Error in a future version of PHP) in %sbug43344_1.php on line 9
 bar

diff --git a/Zend/tests/bug47572.phpt b/Zend/tests/bug47572.phpt
index 695cc3a7f9b348cacb044e8276c6f5af4b20886c..67bb3ec111ce8522dcd080f7dcd9a3ded2241fa2 100644 (file)
--- a/Zend/tests/bug47572.phpt
+++ b/Zend/tests/bug47572.phpt
@@ -14,4 +14,4 @@ $foo = new Foo();
 
 ?>
 --EXPECTF--
-Notice: Use of undefined constant FOO - assumed 'FOO' in %s on line %d
+Warning: Use of undefined constant FOO - assumed 'FOO' (this will throw an Error in a future version of PHP) in %s on line %d

diff --git a/Zend/tests/bug69755.phpt b/Zend/tests/bug69755.phpt
index 67c0ed338384911d3cab25975bfe9984890e1a2c..08432808e295522500e93e61e402d6c75c617760 100644 (file)
--- a/Zend/tests/bug69755.phpt
+++ b/Zend/tests/bug69755.phpt
@@ -5,4 +5,4 @@ Bug #69755: segfault in ZEND_CONCAT_SPEC_TMPVAR_CONST_HANDLER
 c . 10;
 ?>
 --EXPECTF--
-Notice: Use of undefined constant c - assumed 'c' in %sbug69755.php on line 2
+Warning: Use of undefined constant c - assumed 'c' (this will throw an Error in a future version of PHP) in %sbug69755.php on line 2

diff --git a/Zend/tests/bug69788.phpt b/Zend/tests/bug69788.phpt
index 63dd42d4511102c559fcc6f2e58ba1e8bd88340f..326328ccfa2a2fcedd37df4b41094c2cadc70e27 100644 (file)
--- a/Zend/tests/bug69788.phpt
+++ b/Zend/tests/bug69788.phpt
@@ -5,4 +5,4 @@ Bug #69788: Malformed script causes Uncaught Error in php-cgi, valgrind SIGILL
 --EXPECTF--
 Notice: Array to string conversion in %s on line %d
 
-Notice: Use of undefined constant t - assumed 't' in %s on line %d
+Warning: Use of undefined constant t - assumed 't' (this will throw an Error in a future version of PHP) in %s on line %d

diff --git a/Zend/tests/bug72944.phpt b/Zend/tests/bug72944.phpt
index 541730a22a7af7eee68e24d54bda91d4ef9b3d19..5f494beb40dc9c40ceae0af427425781c2408252 100644 (file)
--- a/Zend/tests/bug72944.phpt
+++ b/Zend/tests/bug72944.phpt
@@ -6,7 +6,7 @@ Bug #72944 (Null pointer deref in zval_delref_p).
 echo "OK\n";
 ?>
 --EXPECTF--
-Notice: Use of undefined constant e - assumed 'e' in %sbug72944.php on line 2
+Warning: Use of undefined constant e - assumed 'e' (this will throw an Error in a future version of PHP) in %sbug72944.php on line 2
 
 Notice: Undefined variable: A in %sbug72944.php on line 2
 OK

diff --git a/Zend/tests/bug73163.phpt b/Zend/tests/bug73163.phpt
index 448d7f5959785ddfe71f7730144f9d51a56e36dc..5c0560458d40f4f1b77dbb5c1fb31dfe8a959e39 100644 (file)
--- a/Zend/tests/bug73163.phpt
+++ b/Zend/tests/bug73163.phpt
@@ -14,7 +14,7 @@ doSomething();
 
 ?>
 --EXPECTF--
-Fatal error: Uncaught Exception: Use of undefined constant UNDEFINED - assumed 'UNDEFINED' in %s:%d
+Fatal error: Uncaught Exception: Use of undefined constant UNDEFINED - assumed 'UNDEFINED' (this will throw an Error in a future version of PHP) in %s:%d
 Stack trace:
 #0 %s(%d): {closure}(%s)
 #1 %s(%d): doSomething()

diff --git a/Zend/tests/constants_002.phpt b/Zend/tests/constants_002.phpt
index d590bf44b996b745514d52fa5081eb48a6c94e4f..832da1564df751f5b56cd7049142c8da6dda828a 100644 (file)
--- a/Zend/tests/constants_002.phpt
+++ b/Zend/tests/constants_002.phpt
@@ -13,6 +13,6 @@ var_dump(foo);
 --EXPECTF--
 Warning: Constants may only evaluate to scalar values or arrays in %s on line %d
 
-Notice: Use of undefined constant foo - assumed 'foo' in %s on line %d
+Warning: Use of undefined constant foo - assumed 'foo' (this will throw an Error in a future version of PHP) in %s on line %d
 string(%d) "foo"
 resource(%d) of type (stream)

diff --git a/Zend/tests/constants_005.phpt b/Zend/tests/constants_005.phpt
index d2a205b78440ab415a21ebd5487feef1dcf6db0d..b5a3a6bd38c0507e30f0b390b136d97ac0f01d03 100644 (file)
--- a/Zend/tests/constants_005.phpt
+++ b/Zend/tests/constants_005.phpt
@@ -7,6 +7,6 @@ define("ZEND_THREAD_safe", 123);
 var_dump(ZEND_THREAD_safe);
 ?>
 --EXPECTF--
-Notice: Use of undefined constant ZEND_THREAD_safe - assumed 'ZEND_THREAD_safe' in %s on line %d
+Warning: Use of undefined constant ZEND_THREAD_safe - assumed 'ZEND_THREAD_safe' (this will throw an Error in a future version of PHP) in %s on line %d
 string(16) "ZEND_THREAD_safe"
 int(123)

diff --git a/Zend/tests/ns_041.phpt b/Zend/tests/ns_041.phpt
index 0632fc98151b6585d05713f9c59a3deb0e52d875..cf5c3929b5651bdd3f09bfab36eafb9dedcb3552 100644 (file)
--- a/Zend/tests/ns_041.phpt
+++ b/Zend/tests/ns_041.phpt
@@ -18,5 +18,5 @@ ok
 ok
 ok
 
-Notice: Use of undefined constant BAR - assumed 'BAR' in %sns_041.php on line 9
+Warning: Use of undefined constant BAR - assumed 'BAR' (this will throw an Error in a future version of PHP) in %sns_041.php on line 9
 BAR

diff --git a/Zend/tests/ns_076.phpt b/Zend/tests/ns_076.phpt
index 1468654d55ad0b09ae1e32122e4c4e097cd84873..ea97e924b1b243fc8234415c4b845a001a4cd32c 100644 (file)
--- a/Zend/tests/ns_076.phpt
+++ b/Zend/tests/ns_076.phpt
@@ -11,11 +11,11 @@ echo "\n";
 var_dump($a);
 echo \unknown;
 --EXPECTF--
-Notice: Use of undefined constant unknown - assumed 'unknown' in %sns_076.php on line %d
+Warning: Use of undefined constant unknown - assumed 'unknown' (this will throw an Error in a future version of PHP) in %sns_076.php on line %d
 
-Notice: Use of undefined constant unknown - assumed 'unknown' in %sns_076.php on line %d
+Warning: Use of undefined constant unknown - assumed 'unknown' (this will throw an Error in a future version of PHP) in %sns_076.php on line %d
 
-Notice: Use of undefined constant unknown - assumed 'unknown' in %sns_076.php on line %d
+Warning: Use of undefined constant unknown - assumed 'unknown' (this will throw an Error in a future version of PHP) in %sns_076.php on line %d
 unknown
 array(1) {
   ["unknown"]=>

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 07eb7a8ef34d3f02966ba74f3270562e036127bf..7a36d23e20c6d3e2f23688e37a9cdf1f76ceee3a 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -611,7 +611,7 @@ ZEND_API int zval_update_constant_ex(zval *p, zend_class_entry *scope) /* {{{ */
                                                actual_len -= (actual - Z_STRVAL_P(p));
                                        }
 
-                                       zend_error(E_NOTICE, "Use of undefined constant %s - assumed '%s'", actual, actual);
+                                       zend_error(E_WARNING, "Use of undefined constant %s - assumed '%s' (this will throw an Error in a future version of PHP)", actual, actual);
                                        if (EG(exception)) {
                                                RESET_CONSTANT_VISITED(p);
                                                return FAILURE;

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 99daaf763a977b54af37fbd3aee21f47e67e9120..48c8139da8003889ec7cc79a005e1f8d35e31c6b 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -4908,7 +4908,7 @@ ZEND_VM_HANDLER(99, ZEND_FETCH_CONSTANT, UNUSED, CONST, CONST_FETCH)
                                                actual, Z_STRLEN_P(EX_CONSTANT(opline->op2)) - (actual - Z_STRVAL_P(EX_CONSTANT(opline->op2))));
                        }
                        /* non-qualified constant - allow text substitution */
-                       zend_error(E_NOTICE, "Use of undefined constant %s - assumed '%s'",
+                       zend_error(E_WARNING, "Use of undefined constant %s - assumed '%s' (this will throw an Error in a future version of PHP)",
                                        Z_STRVAL_P(EX_VAR(opline->result.var)), Z_STRVAL_P(EX_VAR(opline->result.var)));
                        ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
                } else {

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 63175b0d57b88a9a3221109f1cfd14f4ded0b2f5..75d7bd8dcb33e21bf27b8128c68a1f3ee9d71790 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -28065,7 +28065,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CONSTANT_SPEC_UNUSED_CON
                                                actual, Z_STRLEN_P(EX_CONSTANT(opline->op2)) - (actual - Z_STRVAL_P(EX_CONSTANT(opline->op2))));
                        }
                        /* non-qualified constant - allow text substitution */
-                       zend_error(E_NOTICE, "Use of undefined constant %s - assumed '%s'",
+                       zend_error(E_WARNING, "Use of undefined constant %s - assumed '%s' (this will throw an Error in a future version of PHP)",
                                        Z_STRVAL_P(EX_VAR(opline->result.var)), Z_STRVAL_P(EX_VAR(opline->result.var)));
                        ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
                } else {

diff --git a/ext/opcache/tests/bug66251.phpt b/ext/opcache/tests/bug66251.phpt
index 23a5165234dc54ccd7715e858bcfa93928fe99e8..daa5a89bb2ad3d8e8777854ade6bdf5243544a27 100644 (file)
--- a/ext/opcache/tests/bug66251.phpt
+++ b/ext/opcache/tests/bug66251.phpt
@@ -13,5 +13,5 @@ const A="hello";
 function getA() {return A;}
 ?>
 --EXPECTF--
-Notice: Use of undefined constant A - assumed 'A' in %sbug66251.php on line 4
+Warning: Use of undefined constant A - assumed 'A' (this will throw an Error in a future version of PHP) in %sbug66251.php on line 4
 A=A

diff --git a/ext/opcache/tests/bug71843.phpt b/ext/opcache/tests/bug71843.phpt
index 73301a6e96ee3ba2168aca289497f1ec6c4a6aa6..924fb873fed979a9415eaea0cdb0b74ac6f82541 100644 (file)
--- a/ext/opcache/tests/bug71843.phpt
+++ b/ext/opcache/tests/bug71843.phpt
@@ -13,13 +13,13 @@ opcache.optimization_level=0xFFFFBFFF
 ?>
 okey
 --EXPECTF--
-Notice: Use of undefined constant E - assumed 'E' in %sbug71843.php on line %d
+Warning: Use of undefined constant E - assumed 'E' (this will throw an Error in a future version of PHP) in %sbug71843.php on line %d
 
 Warning: A non-numeric value encountered in %s on line %d
 
-Notice: Use of undefined constant R - assumed 'R' in %sbug71843.php on line %d
+Warning: Use of undefined constant R - assumed 'R' (this will throw an Error in a future version of PHP) in %sbug71843.php on line %d
 
 Warning: A non-numeric value encountered in %s on line %d
 
-Notice: Use of undefined constant See - assumed 'See' in %sbug71843.php on line %d
+Warning: Use of undefined constant See - assumed 'See' (this will throw an Error in a future version of PHP) in %sbug71843.php on line %d
 okey

diff --git a/ext/standard/tests/array/array_diff_ukey_variation10.phpt b/ext/standard/tests/array/array_diff_ukey_variation10.phpt
index 0d93928d8642f9fd5f4430620759be37739b49f3..58a040b0a7638d1f66a90b4378eac96c825585f2 100644 (file)
--- a/ext/standard/tests/array/array_diff_ukey_variation10.phpt
+++ b/ext/standard/tests/array/array_diff_ukey_variation10.phpt
@@ -33,7 +33,7 @@ NULL
 Warning: array_diff_ukey() expects parameter 3 to be a valid callback, function 'unknown_function' not found or invalid function name in %s on line %d
 NULL
 
-Notice: Use of undefined constant unknown_function - assumed 'unknown_function' in %s on line %d
+Warning: Use of undefined constant unknown_function - assumed 'unknown_function' (this will throw an Error in a future version of PHP) in %s on line %d
 
 Warning: array_diff_ukey() expects parameter 3 to be a valid callback, function 'unknown_function' not found or invalid function name in %s on line %d
 NULL

diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation9.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation9.phpt
index 64f58a6d1ec9bb01ec85623b89c95a9f9bae46b8..fc7c526ed1284f84b4e43ac988dfb95b20b2b1fa 100644 (file)
--- a/ext/standard/tests/array/array_intersect_uassoc_variation9.phpt
+++ b/ext/standard/tests/array/array_intersect_uassoc_variation9.phpt
@@ -32,7 +32,7 @@ NULL
 Warning: array_intersect_uassoc() expects parameter 3 to be a valid callback, function 'unknown_function' not found or invalid function name in %s on line %d
 NULL
 
-Notice: Use of undefined constant unknown_function - assumed 'unknown_function' in %s on line %d
+Warning: Use of undefined constant unknown_function - assumed 'unknown_function' (this will throw an Error in a future version of PHP) in %s on line %d
 
 Warning: array_intersect_uassoc() expects parameter 3 to be a valid callback, function 'unknown_function' not found or invalid function name in %s on line %d
 NULL

diff --git a/ext/standard/tests/array/array_intersect_ukey_variation8.phpt b/ext/standard/tests/array/array_intersect_ukey_variation8.phpt
index 3d580e1e020b112ec40330b23322b1e4533b27c5..89286f8986b0677d657c0b373730a64759c22e6d 100644 (file)
--- a/ext/standard/tests/array/array_intersect_ukey_variation8.phpt
+++ b/ext/standard/tests/array/array_intersect_ukey_variation8.phpt
@@ -32,7 +32,7 @@ NULL
 Warning: array_intersect_ukey() expects parameter 3 to be a valid callback, function 'unknown_function' not found or invalid function name in %s on line %d
 NULL
 
-Notice: Use of undefined constant unknown_function - assumed 'unknown_function' in %s on line %d
+Warning: Use of undefined constant unknown_function - assumed 'unknown_function' (this will throw an Error in a future version of PHP) in %s on line %d
 
 Warning: array_intersect_ukey() expects parameter 3 to be a valid callback, function 'unknown_function' not found or invalid function name in %s on line %d
 NULL

diff --git a/ext/standard/tests/array/count_recursive.phpt b/ext/standard/tests/array/count_recursive.phpt
index 5c75a0bc686c572cf4982990ec516c304ab590a3..b903d8b1892360305fd11fbd7eaf1e1bc2360509 100644 (file)
--- a/ext/standard/tests/array/count_recursive.phpt
+++ b/ext/standard/tests/array/count_recursive.phpt
@@ -239,7 +239,7 @@ NULL
 Warning: count() expects at most 2 parameters, 3 given in %s on line %d
 NULL
 
-Notice: Use of undefined constant ABCD - assumed 'ABCD' in %s on line %d
+Warning: Use of undefined constant ABCD - assumed 'ABCD' (this will throw an Error in a future version of PHP) in %s on line %d
 
 Warning: count() expects parameter 2 to be integer, %s given in %s on line %d
 NULL

diff --git a/ext/standard/tests/assert/assert_error.phpt b/ext/standard/tests/assert/assert_error.phpt
index bdd47ec8840f2f49845ee5e32a1b7aeef184a008..5e2519ab37d2158c1f4e0041d7ad4cab43340c31 100644 (file)
--- a/ext/standard/tests/assert/assert_error.phpt
+++ b/ext/standard/tests/assert/assert_error.phpt
@@ -23,7 +23,7 @@ var_dump($r2=assert($sa));
 --EXPECTF--
 Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d
 
-Notice: Use of undefined constant threemeninaboat - assumed 'threemeninaboat' in %s(9) : assert code on line 1
+Warning: Use of undefined constant threemeninaboat - assumed 'threemeninaboat' (this will throw an Error in a future version of PHP) in %s(9) : assert code on line 1
 bool(true)
 int(0)
 

diff --git a/ext/standard/tests/file/fscanf_error.phpt b/ext/standard/tests/file/fscanf_error.phpt
index f93d1b2a57095e72b6dca0cc51411b497972f8a6..1a80d193486a7f332075e38eaa30bbdb54762c65 100644 (file)
--- a/ext/standard/tests/file/fscanf_error.phpt
+++ b/ext/standard/tests/file/fscanf_error.phpt
@@ -78,7 +78,7 @@ int(-1)
 
 Notice: Undefined variable: undefined_var in %s on line %d
 
-Notice: Use of undefined constant undefined_constant - assumed 'undefined_constant' in %s on line %d
+Warning: Use of undefined constant undefined_constant - assumed 'undefined_constant' (this will throw an Error in a future version of PHP) in %s on line %d
 array(0) {
 }
 array(0) {

diff --git a/ext/standard/tests/strings/lcfirst.phpt b/ext/standard/tests/strings/lcfirst.phpt
index 5424c5018d81b507e17b0619e39138e93040efbf..9451ea80a3c766520343df85ace3bcac20472db9 100644 (file)
Binary files a/ext/standard/tests/strings/lcfirst.phpt and b/ext/standard/tests/strings/lcfirst.phpt differ

diff --git a/ext/standard/tests/strings/ucfirst.phpt b/ext/standard/tests/strings/ucfirst.phpt
index 143c4bd426cc2e82431e9ddcf71b7daea8132153..572d26ebd1b48f846efb119a693d8e44795248aa 100644 (file)
Binary files a/ext/standard/tests/strings/ucfirst.phpt and b/ext/standard/tests/strings/ucfirst.phpt differ

diff --git a/sapi/cli/tests/php_cli_server_014.phpt b/sapi/cli/tests/php_cli_server_014.phpt
index 7c50a5e30a3d0547b3b15d660b0a268526b609b6..f308ffb2261507b98c19ffa7698c4e394072a195 100644 (file)
--- a/sapi/cli/tests/php_cli_server_014.phpt
+++ b/sapi/cli/tests/php_cli_server_014.phpt
@@ -7,7 +7,7 @@ include "skipif.inc";
 --FILE--
 <?php
 include "php_cli_server.inc";
-php_cli_server_start('echo done, "\n";', null);
+php_cli_server_start('echo "done\n";', null);
 
 list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS);
 $port = intval($port)?:80;

diff --git a/tests/classes/constants_basic_001.phpt b/tests/classes/constants_basic_001.phpt
index 9536b2a38fcd27d93ab58dfe08e90234f622a0ba..37120579f6a4f3cee5c42b82a0e9f8c2fbb4cffd 100644 (file)
--- a/tests/classes/constants_basic_001.phpt
+++ b/tests/classes/constants_basic_001.phpt
@@ -63,7 +63,7 @@ Notice: Undefined variable: undef in %s on line 5
 
 Attempt to access various kinds of class constants:
 
-Notice: Use of undefined constant UNDEFINED - assumed 'UNDEFINED' in %s on line %d
+Warning: Use of undefined constant UNDEFINED - assumed 'UNDEFINED' (this will throw an Error in a future version of PHP) in %s on line %d
 string(9) "UNDEFINED"
 int(1)
 float(1.5)

diff --git a/tests/classes/constants_scope_001.phpt b/tests/classes/constants_scope_001.phpt
index c2585b2212ee3df48c231edbe0c19b6b59dbbf2d..650bcc222817666c0a321848967ad20f55b6ee6a 100644 (file)
--- a/tests/classes/constants_scope_001.phpt
+++ b/tests/classes/constants_scope_001.phpt
@@ -29,7 +29,7 @@ ErrorCodesDerived::print_fatal_error_codes();
 ?>
 --EXPECTF--
 
-Notice: Use of undefined constant FATAL - assumed 'FATAL' in %sconstants_scope_001.php on line %d
+Warning: Use of undefined constant FATAL - assumed 'FATAL' (this will throw an Error in a future version of PHP) in %sconstants_scope_001.php on line %d
 FATAL = FATAL
 self::FATAL = Fatal error
 self::FATAL = Worst error