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 /Zend/zend_builtin_functions.c | |
| parent | 788d217e09a506fd08c0362c17df4c092b83d17c (diff) | |
| parent | 0a6ddc77224f86cef4f08c662bd96ede11616c8e (diff) | |
| download | php-git-e25b23ed0c3670bee4edb1d5e1360303c8ee483f.tar.gz | |
Merge branch 'PHP-7.3'
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |