Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  use already exported symbol
  Revert "export symbol missing by phpdbg"

diff --cc Zend/zend_exceptions.c
Simple merge

diff --cc Zend/zend_string.c
Simple merge

diff --cc Zend/zend_string.h
index 1bc3c8630565e5c7a8aa09209a6032e6cfa568c4,722fc3ae468d712288e9864f8e65ea6c5ab36a99..8a1ac6f506d4eb97ac61fa17b07420708f95b153
--- 1/Zend/zend_string.h
--- 2/Zend/zend_string.h
+++ b/Zend/zend_string.h
@@@ -32,10 -32,7 +32,8 @@@ ZEND_API extern void (*zend_interned_st
  ZEND_API zend_ulong zend_hash_func(const char *str, size_t len);
  void zend_interned_strings_init(void);
  void zend_interned_strings_dtor(void);
 +void zend_known_interned_strings_init(zend_string ***, uint32_t *);
  
- ZEND_API zend_string *zend_strpprintf(size_t max_len, const char *format, ...);
- 
  END_EXTERN_C()
  
  /* Shortcuts */

diff --cc sapi/phpdbg/phpdbg_prompt.c
Simple merge