Merge branch 'PHP-5.6' into PHP-7.0

# Resolved conflicts:
#	ext/gd/gd.c

diff --cc NEWS
Simple merge

diff --cc ext/gd/gd.c
index a3b33fdef33dd1fac80fb28606e4e5711d3e7f50,b843bda98d8c454014214a5f55bf4994106c8504..b6fa6b9bb767f75e8011e71a33afea982ca4d5ba
--- 1/ext/gd/gd.c
--- 2/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@@ -61,8 -61,17 +61,11 @@@
  
  
  static int le_gd, le_gd_font;
 -#if HAVE_LIBT1
 -#include <t1lib.h>
 -static int le_ps_font, le_ps_enc;
 -static void php_free_ps_font(zend_rsrc_list_entry *rsrc TSRMLS_DC);
 -static void php_free_ps_enc(zend_rsrc_list_entry *rsrc TSRMLS_DC);
 -#endif
  
  #include <gd.h>
+ #ifndef HAVE_GD_BUNDLED
+ # include <gd_errors.h>
+ #endif
  #include <gdfontt.h>  /* 1 Tiny font */
  #include <gdfonts.h>  /* 2 Small font */
  #include <gdfontmb.h> /* 3 Medium bold font */
@@@ -1020,8 -1100,21 +1023,20 @@@ static void php_free_gd_font(zend_resou
   */
  void php_gd_error_method(int type, const char *format, va_list args)
  {
 -      TSRMLS_FETCH();
  
-       php_verror(NULL, "", type, format, args);
+       switch (type) {
+               case GD_DEBUG:
+               case GD_INFO:
+               case GD_NOTICE:
+                       type = E_NOTICE;
+                       break;
+               case GD_WARNING:
+                       type = E_WARNING;
+                       break;
+               default:
+                       type = E_ERROR;
+       }
+       php_verror(NULL, "", type, format, args TSRMLS_CC);
  }
  /* }}} */
  #endif