diff options
| author | Nikita Popov <nikic@php.net> | 2012-08-13 16:51:41 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2012-08-13 16:54:53 +0200 |
| commit | f4ce3646285fbdd3354ca86ae67857b6ee8f7e3a (patch) | |
| tree | ad8597fe53119f9eb1daac0df4e554d3c7861c21 /Zend/zend_execute.c | |
| parent | 268740d9848d435054ce73a8cfe36b2b732cd1f7 (diff) | |
| parent | 80d5ae3cea4c6fdd85789edfde0e2da721a0741b (diff) | |
| download | php-git-f4ce3646285fbdd3354ca86ae67857b6ee8f7e3a.tar.gz | |
Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport
This is just an intial merge. It does not yet make generators and finally
work together.
Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Zend/zend_vm_execute.skl
Zend/zend_vm_opcodes.h
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 0e40650fb5..149b91233c 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -555,11 +555,10 @@ static inline void make_real_object(zval **object_ptr TSRMLS_DC) || (Z_TYPE_PP(object_ptr) == IS_BOOL && Z_LVAL_PP(object_ptr) == 0) || (Z_TYPE_PP(object_ptr) == IS_STRING && Z_STRLEN_PP(object_ptr) == 0) ) { - zend_error(E_WARNING, "Creating default object from empty value"); - SEPARATE_ZVAL_IF_NOT_REF(object_ptr); zval_dtor(*object_ptr); object_init(*object_ptr); + zend_error(E_WARNING, "Creating default object from empty value"); } } @@ -1163,7 +1162,7 @@ convert_to_array: case IS_DOUBLE: case IS_NULL: case IS_BOOL: - zend_error(E_NOTICE, "String offset cast occured"); + zend_error(E_NOTICE, "String offset cast occurred"); break; default: zend_error(E_WARNING, "Illegal offset type"); @@ -1286,7 +1285,7 @@ static void zend_fetch_dimension_address_read(temp_variable *result, zval **cont case IS_NULL: case IS_BOOL: if (type != BP_VAR_IS) { - zend_error(E_NOTICE, "String offset cast occured"); + zend_error(E_NOTICE, "String offset cast occurred"); } break; default: |