Merge remote-tracking branch 'php/master'

Conflicts:
	Zend/zend_exceptions.c

diff --cc Zend/zend_exceptions.c
index 9fda5d4289090d839a041427bf038943b6edb7a5,e632ce42d54cd9d694ca1d8b7ea7cbcba4fdaa90..6d5aa720facc6b2139d08d77844918cc2bc5990c
--- 1/Zend/zend_exceptions.c
--- 2/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@@ -665,9 -665,9 +665,9 @@@ ZEND_METHOD(exception, __toString
                _default_exception_get_entry(exception, "file", sizeof("file")-1, &file TSRMLS_CC);
                _default_exception_get_entry(exception, "line", sizeof("line")-1, &line TSRMLS_CC);
  
-               convert_to_string(&message);
-               convert_to_string(&file);
-               convert_to_int(&line);
+               convert_to_string_ex(&message);
+               convert_to_string_ex(&file);
 -              convert_to_long_ex(&line);
++              convert_to_int_ex(&line);
  
                fci.size = sizeof(fci);
                fci.function_table = &Z_OBJCE_P(exception)->function_table;
@@@ -894,9 -894,9 +894,9 @@@ ZEND_API void zend_exception_error(zend
                                file = zend_read_property(default_exception_ce, &zv, "file", sizeof("file")-1, 1 TSRMLS_CC);
                                line = zend_read_property(default_exception_ce, &zv, "line", sizeof("line")-1, 1 TSRMLS_CC);
  
-                               convert_to_string(file);
+                               convert_to_string_ex(file);
 -                              file = (Z_STRLEN_P(file) > 0) ? file : NULL;
 -                              line = (Z_TYPE_P(line) == IS_LONG) ? line : NULL;
 +                              file = (Z_STRSIZE_P(file) > 0) ? file : NULL;
 +                              line = (Z_TYPE_P(line) == IS_INT) ? line : NULL;
                        } else {
                                file = NULL;
                                line = NULL;
@@@ -908,11 -908,11 +908,11 @@@
                file = zend_read_property(default_exception_ce, &exception, "file", sizeof("file")-1, 1 TSRMLS_CC);
                line = zend_read_property(default_exception_ce, &exception, "line", sizeof("line")-1, 1 TSRMLS_CC);
  
-               convert_to_string(str);
-               convert_to_string(file);
-               convert_to_int(line);
+               convert_to_string_ex(str);
+               convert_to_string_ex(file);
 -              convert_to_long_ex(line);
++              convert_to_int_ex(line);
  
 -              zend_error_va(severity, (Z_STRLEN_P(file) > 0) ? Z_STRVAL_P(file) : NULL, Z_LVAL_P(line), "Uncaught %s\n  thrown", Z_STRVAL_P(str));
 +              zend_error_va(severity, (Z_STRSIZE_P(file) > 0) ? Z_STRVAL_P(file) : NULL, Z_IVAL_P(line), "Uncaught %s\n  thrown", Z_STRVAL_P(str));
        } else {
                zend_error(severity, "Uncaught exception '%s'", ce_exception->name->val);
        }

diff --cc ext/spl/php_spl.c
Simple merge

diff --cc ext/spl/spl_observer.c
Simple merge