Merge branch 'PHP-7.0' into PHP-7.1

diff --cc ext/gd/tests/bug48801-mb.phpt
index 6a31cf10dcc7ad4e35fa18868a52572720703ef6,0000000000000000000000000000000000000000..c2b6b455abdac64b64447fe63513ac2512fceeb9
mode 100644,000000..100644
--- 1/ext/gd/tests/bug48801-mb.phpt
--- /dev/null
+++ b/ext/gd/tests/bug48801-mb.phpt
@@@ -1,27 -1,0 +1,22 @@@
- Bug #48801 (Problem with imagettfbbox) freetype < 2.4.10
 +--TEST--
- 
-       include dirname(__FILE__) . '/func.inc';
-       if(version_compare(get_freetype_version(), '2.4.10') >= 0) die('skip for freetype < 2.4.10');
- 
-       die('skip freetype issues');
++Bug #48801 (Problem with imagettfbbox)
 +--SKIPIF--
 +<?php
 +      if(!extension_loaded('gd')){ die('skip gd extension not available'); }
 +      if(!function_exists('imageftbbox')) die('skip imageftbbox() not available');
- --EXPECTF--
- (-1, 15)
- (15%d, 15)
- (15%d, -48)
- (-1, -48)
 +?>
 +--FILE--
 +<?php
 +$cwd = dirname(__FILE__);
 +$font = "$cwd/Tuffy私はガラスを食べられます.ttf";
 +$bbox = imageftbbox(50, 0, $font, "image");
 +echo '(' . $bbox[0] . ', ' . $bbox[1] . ")\n";
 +echo '(' . $bbox[2] . ', ' . $bbox[3] . ")\n";
 +echo '(' . $bbox[4] . ', ' . $bbox[5] . ")\n";
 +echo '(' . $bbox[6] . ', ' . $bbox[7] . ")\n";
 +?>
++--EXPECTREGEX--
++\(4, 15\)
++\(16[0-1], 15\)
++\(16[0-1], -4[7-8]\)
++\(4, -4[7-8]\)