Merge branch 'PHP-5.6' into PHP-7.0

diff --cc ext/exif/exif.c
index a0ad5e789697d28395c745acc3eb85eeea41a0b8,3663b3f226a2dda2bfa8948cbfcd029bd0cf19cb..ca0190754f8d3c18a69b4020f9464c5d0a5c0c2d
--- 1/ext/exif/exif.c
--- 2/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@@ -2844,7 -2855,7 +2844,7 @@@ static int exif_process_IFD_TAG(image_i
        }
  
        if (components < 0) {
-               exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING, "Process tag(x%04X=%s): Illegal components(%ld)", tag, exif_get_tagname(tag, tagname, -12, tag_table), components);
 -              exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING, "Process tag(x%04X=%s): Illegal components(%d)", tag, exif_get_tagname(tag, tagname, -12, tag_table TSRMLS_CC), components);
++              exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING, "Process tag(x%04X=%s): Illegal components(%d)", tag, exif_get_tagname(tag, tagname, -12, tag_table), components);
                return FALSE;
        }