diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-10-06 11:22:24 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-10-06 11:22:24 +0200 |
| commit | e25b23ed0c3670bee4edb1d5e1360303c8ee483f (patch) | |
| tree | 9c3fac8d5163dd14f87fcafbc3dda67a7d0c6c85 | |
| parent | 788d217e09a506fd08c0362c17df4c092b83d17c (diff) | |
| parent | 0a6ddc77224f86cef4f08c662bd96ede11616c8e (diff) | |
| download | php-git-e25b23ed0c3670bee4edb1d5e1360303c8ee483f.tar.gz | |
Merge branch 'PHP-7.3'
| -rw-r--r-- | Zend/tests/008.phpt | 6 | ||||
| -rw-r--r-- | Zend/tests/bug37811.phpt | 2 | ||||
| -rw-r--r-- | Zend/tests/constant_arrays.phpt | 2 | ||||
| -rw-r--r-- | Zend/tests/constants_002.phpt | 2 | ||||
| -rw-r--r-- | Zend/zend_builtin_functions.c | 4 |
5 files changed, 9 insertions, 7 deletions
diff --git a/Zend/tests/008.phpt b/Zend/tests/008.phpt index 297856ec23..a3a3e02fcc 100644 --- a/Zend/tests/008.phpt +++ b/Zend/tests/008.phpt @@ -14,7 +14,8 @@ var_dump(define("[[[", 2)); var_dump(define("test const", 3)); var_dump(define("test const", 3)); var_dump(define("test", array(1))); -var_dump(define("test1", new stdclass)); +var_dump(define("test1", fopen(__FILE__, 'r'))); +var_dump(define("test2", new stdclass)); var_dump(constant(" ")); var_dump(constant("[[[")); @@ -42,8 +43,9 @@ bool(true) Notice: Constant test const already defined in %s on line %d bool(false) bool(true) +bool(true) -Warning: Constants may only evaluate to scalar values or arrays in %s on line %d +Warning: Constants may only evaluate to scalar values, arrays or resources in %s on line %d bool(false) int(1) int(2) diff --git a/Zend/tests/bug37811.phpt b/Zend/tests/bug37811.phpt index 299018363d..96645d0354 100644 --- a/Zend/tests/bug37811.phpt +++ b/Zend/tests/bug37811.phpt @@ -21,7 +21,7 @@ var_dump(Baz); --EXPECTF-- string(3) "Foo" -Warning: Constants may only evaluate to scalar values or arrays in %sbug37811.php on line %d +Warning: Constants may only evaluate to scalar values, arrays or resources 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" diff --git a/Zend/tests/constant_arrays.phpt b/Zend/tests/constant_arrays.phpt index 46a0f9252e..9e099e33fc 100644 --- a/Zend/tests/constant_arrays.phpt +++ b/Zend/tests/constant_arrays.phpt @@ -94,7 +94,7 @@ array(1) { int(7) } -Warning: Constants may only evaluate to scalar values or arrays in %s on line %d +Warning: Constants may only evaluate to scalar values, arrays or resources in %s on line %d bool(false) Warning: Constants cannot be recursive arrays in %s on line %d diff --git a/Zend/tests/constants_002.phpt b/Zend/tests/constants_002.phpt index 832da1564d..b0cf1db61f 100644 --- a/Zend/tests/constants_002.phpt +++ b/Zend/tests/constants_002.phpt @@ -11,7 +11,7 @@ var_dump(foo); ?> --EXPECTF-- -Warning: Constants may only evaluate to scalar values or arrays in %s on line %d +Warning: Constants may only evaluate to scalar values, arrays or resources 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" diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index f68388cd20..364d478ab7 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -794,7 +794,7 @@ static int validate_constant_array(HashTable *ht) /* {{{ */ } } } else if (Z_TYPE_P(val) != IS_STRING && Z_TYPE_P(val) != IS_RESOURCE) { - zend_error(E_WARNING, "Constants may only evaluate to scalar values or arrays"); + zend_error(E_WARNING, "Constants may only evaluate to scalar values, arrays or resources"); ret = 0; break; } @@ -895,7 +895,7 @@ repeat: } /* no break */ default: - zend_error(E_WARNING, "Constants may only evaluate to scalar values or arrays"); + zend_error(E_WARNING, "Constants may only evaluate to scalar values, arrays or resources"); zval_ptr_dtor(&val_free); RETURN_FALSE; } |