com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/gd/tests/ gd_info_variation1.phpt

From: Date: Sun, 24 Jul 2016 22:16:21 +0000
Subject: com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/gd/tests/ gd_info_variation1.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-93369@lists.php.net to get a copy of this message
Commit: 4db4997ac5b903976d42688c62c0e2216ee6f052 Author: Christoph M. Becker <cmb@php.net> Mon, 25 Jul 2016 00:16:21 +0200 Parents: ad96a052d918c7fcfaab702c4319acac20435d6b d28f1dae9dbe09b63539efe94a0ef449f6790438 Branches: PHP-7.0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4db4997ac5b903976d42688c62c0e2216ee6f052 Log: Merge branch 'PHP-5.6' into PHP-7.0 # Resolved conflicts: # ext/gd/tests/gd_info_variation1.phpt Changed paths: MM ext/gd/tests/gd_info_variation1.phpt Diff: diff --cc ext/gd/tests/gd_info_variation1.phpt index 1810a82,fffde0b..3b46695 --- a/ext/gd/tests/gd_info_variation1.phpt +++ b/ext/gd/tests/gd_info_variation1.phpt @@@ -25,24 -25,28 +25,26 @@@ var_dump(gd_info()) *** Testing gd_info() : variation *** array(%d) { ["GD Version"]=> - string(%d) %a + string(%d) %s ["FreeType Support"]=> - bool%a + bool(%s) - ["T1Lib Support"]=> - bool(%s) ["GIF Read Support"]=> - bool%a + bool(%s) ["GIF Create Support"]=> - bool%a + bool(%s) ["JPEG Support"]=> - bool%a + bool(%s) ["PNG Support"]=> - bool%a + bool(%s) ["WBMP Support"]=> - bool%a + bool(%s) ["XPM Support"]=> - bool%a + bool(%s) ["XBM Support"]=> - bool%a + bool(%s) + ["WebP Support"]=> + bool(%s) ["JIS-mapped Japanese Font Support"]=> - bool%a + bool(%s) } -===DONE=== +===DONE===

« previous php.cvs (#93369) next »