From: Christoph M. Becker <cmb@php.net>
Date: Sun, 24 Jul 2016 22:16:21 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.10RC1~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4db4997ac5b903976d42688c62c0e2216ee6f052;p=php

Merge branch 'PHP-5.6' into PHP-7.0

# Resolved conflicts:
#	ext/gd/tests/gd_info_variation1.phpt
---

4db4997ac5b903976d42688c62c0e2216ee6f052
diff --cc ext/gd/tests/gd_info_variation1.phpt
index 1810a82f85,fffde0ba24..3b4669561f
--- 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===