Merge branch 'PHP-5.6' into PHP-7.0

21 files changed, 69 insertions, 1 deletions

diff --git a/ext/gd/tests/bug43121.phpt b/ext/gd/tests/bug43121.phpt
index ce2d1d6f6f..feb10267c2 100644
--- a/ext/gd/tests/bug43121.phpt
+++ b/ext/gd/tests/bug43121.phpt
@@ -3,6 +3,9 @@ Bug #43121 (gdImageFill with IMG_COLOR_TILED crashes httpd)
 --SKIPIF--
 <?php
 	if (!extension_loaded('gd')) die("skip gd extension not available\n");
+	if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.0', '<')) {
+		die("skip test requires GD 2.2.0 or higher");
+	}
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug43475.phpt b/ext/gd/tests/bug43475.phpt
index b29b9800a5..f0302d45ef 100644
--- a/ext/gd/tests/bug43475.phpt
+++ b/ext/gd/tests/bug43475.phpt
@@ -3,6 +3,9 @@ Bug #43475 (Thick styled lines have scrambled patterns)
 --SKIPIF--
 <?php
 	if (!extension_loaded('gd')) die("skip gd extension not available\n");
+	if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
+		die("skip test requires GD 2.2.2 or higher");
+	}
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug43828.phpt b/ext/gd/tests/bug43828.phpt
index c43a5c6c00..43d11ae356 100644
--- a/ext/gd/tests/bug43828.phpt
+++ b/ext/gd/tests/bug43828.phpt
@@ -3,6 +3,9 @@ Bug #43828 (broken transparency of imagearc for truecolor in blendingmode)
 --SKIPIF--
 <?php
 if (!extension_loaded('gd')) die('skip ext/gd not available');
+if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
+	die("skip test requires GD 2.2.2 or higher");
+}
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug53154.phpt b/ext/gd/tests/bug53154.phpt
index 6cbae2016c..0c5ee9cc99 100644
--- a/ext/gd/tests/bug53154.phpt
+++ b/ext/gd/tests/bug53154.phpt
@@ -3,6 +3,9 @@ Bug #53154 (Zero-height rectangle has whiskers)
 --SKIPIF--
 <?php
 if (!extension_loaded('gd')) die('skip gd extension not available');
+if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
+    die("skip test requires GD 2.2.2 or higher");
+}
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug53640.phpt b/ext/gd/tests/bug53640.phpt
index ee875de19a..7e8217c27f 100644
--- a/ext/gd/tests/bug53640.phpt
+++ b/ext/gd/tests/bug53640.phpt
@@ -3,6 +3,9 @@ Bug #53640 (XBM images require width to be multiple of 8)
 --SKIPIF--
 <?php
 if (!extension_loaded('gd')) die('skip gd extension not available');
+if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.3', '<')) {
+    die("skip test requires GD 2.2.3 or higher");
+}
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug64641.phpt b/ext/gd/tests/bug64641.phpt
index d8dae9a4d3..713daaf85e 100644
--- a/ext/gd/tests/bug64641.phpt
+++ b/ext/gd/tests/bug64641.phpt
@@ -3,6 +3,9 @@ Bug #64641 (imagefilledpolygon doesn't draw horizontal line)
 --SKIPIF--
 <?php
 if (!extension_loaded('gd')) die("skip gd extension not available\n");
+if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
+	die("skip test requires GD 2.2.2 or higher");
+}
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug66387.phpt b/ext/gd/tests/bug66387.phpt
index 79c49a527b..04ab0b688e 100644
--- a/ext/gd/tests/bug66387.phpt
+++ b/ext/gd/tests/bug66387.phpt
@@ -3,6 +3,9 @@ Bug #66387 (Stack overflow with imagefilltoborder)
 --SKIPIF--
 <?php
 if (!extension_loaded('gd')) die('skip gd extension not available!');
+if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.1', '<')) {
+    die("skip test requires GD 2.2.1 or higher");
+}
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug67447.phpt b/ext/gd/tests/bug67447.phpt
index 2caa49b623..878b322689 100644
--- a/ext/gd/tests/bug67447.phpt
+++ b/ext/gd/tests/bug67447.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Bug #67447 (imagecrop() adds a black line when cropping)
+--SKIPIF--
+<?php
+	if (!extension_loaded('gd')) {
+		die("skip gd extension not available\n");
+	}
+?>
 --FILE--
 <?php
 // true color
diff --git a/ext/gd/tests/bug71912.phpt b/ext/gd/tests/bug71912.phpt
index c86188b0f2..9cb792126d 100644
--- a/ext/gd/tests/bug71912.phpt
+++ b/ext/gd/tests/bug71912.phpt
@@ -3,6 +3,9 @@ Bug #71912 (libgd: signedness vulnerability)
 --SKIPIF--
 <?php
         if(!extension_loaded('gd')){ die('skip gd extension not available'); }
+        if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.0', '<')) {
+            die("skip test requires GD 2.2.0 or higher");
+        }
         if(!function_exists('imagecreatefromgd2')) die('skip imagecreatefromgd2() not available');
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug72339.phpt b/ext/gd/tests/bug72339.phpt
index 2c30ee8a74..c886283346 100644
--- a/ext/gd/tests/bug72339.phpt
+++ b/ext/gd/tests/bug72339.phpt
@@ -1,7 +1,12 @@
 --TEST--
 Bug #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow 
 --SKIPIF--
-<?php if (!function_exists("imagecreatefromgd2")) print "skip"; ?>
+<?php
+if (!function_exists("imagecreatefromgd2")) print "skip";
+if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
+	die("skip test requires GD 2.2.2 or higher");
+}
+?>
 --FILE--
 <?php
 $fname = dirname(__FILE__) . DIRECTORY_SEPARATOR . "bug72339.gd";
diff --git a/ext/gd/tests/bug72512.phpt b/ext/gd/tests/bug72512.phpt
index 2a2024d4cb..3f9e219fc3 100644
--- a/ext/gd/tests/bug72512.phpt
+++ b/ext/gd/tests/bug72512.phpt
@@ -3,6 +3,9 @@ Bug #19366 (gdimagefill() function crashes (fixed in bundled libgd))
 --SKIPIF--
 <?php
 	if (!extension_loaded('gd')) die("skip gd extension not available\n");
+	if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
+		die("skip test requires GD 2.2.2 or higher");
+	}
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug72512_0.phpt b/ext/gd/tests/bug72512_0.phpt
index 5f98662d45..565d60a632 100644
--- a/ext/gd/tests/bug72512_0.phpt
+++ b/ext/gd/tests/bug72512_0.phpt
@@ -3,6 +3,9 @@ Bug #72512 gdImageTrueColorToPaletteBody allows arbitrary write/read access, var
 --SKIPIF--
 <?php
 	if (!extension_loaded('gd')) die("skip gd extension not available\n");
+	if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
+		die("skip test requires GD 2.2.2 or higher");
+	}
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug72512_1.phpt b/ext/gd/tests/bug72512_1.phpt
index bba01a7118..2983ff29b8 100644
--- a/ext/gd/tests/bug72512_1.phpt
+++ b/ext/gd/tests/bug72512_1.phpt
@@ -3,6 +3,9 @@ Bug #72512 gdImageTrueColorToPaletteBody allows arbitrary write/read access, var
 --SKIPIF--
 <?php
 	if (!extension_loaded('gd')) die("skip gd extension not available\n");
+	if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
+		die("skip test requires GD 2.2.2 or higher");
+	}
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/github_bug_215.phpt b/ext/gd/tests/github_bug_215.phpt
index f44a5401e1..8657f95d76 100644
--- a/ext/gd/tests/github_bug_215.phpt
+++ b/ext/gd/tests/github_bug_215.phpt
@@ -3,6 +3,9 @@ Github #215 (imagefilltoborder stack overflow when invalid pallete index used)
 --SKIPIF-- 
 <?php  
 if (!extension_loaded("gd")) die("skip GD not present"); 
+if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
+    die("skip test requires GD 2.2.2 or higher");
+}
 ?> 
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagecolorallocatealpha_basic.phpt b/ext/gd/tests/imagecolorallocatealpha_basic.phpt
index a42c51d483..8595b40507 100644
--- a/ext/gd/tests/imagecolorallocatealpha_basic.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_basic.phpt
@@ -5,6 +5,9 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
 <?php 
 	if (!extension_loaded("gd")) die("skip GD not present");
+	if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
+		die("skip test requires GD 2.2.2 or higher");
+	}
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagefilledarc_basic.phpt b/ext/gd/tests/imagefilledarc_basic.phpt
index 4e3bf29137..8c76a83406 100644
--- a/ext/gd/tests/imagefilledarc_basic.phpt
+++ b/ext/gd/tests/imagefilledarc_basic.phpt
@@ -6,6 +6,9 @@ Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
 --SKIPIF--
 <?php 
 if (!extension_loaded("gd")) die("skip GD not present");
+if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
+	die("skip test requires GD 2.2.2 or higher");
+}
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagefilledarc_variation1.phpt b/ext/gd/tests/imagefilledarc_variation1.phpt
index 257c898abd..f4130a9c69 100644
--- a/ext/gd/tests/imagefilledarc_variation1.phpt
+++ b/ext/gd/tests/imagefilledarc_variation1.phpt
@@ -6,6 +6,9 @@ Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
 --SKIPIF--
 <?php 
 if (!extension_loaded("gd")) die("skip GD not present");
+if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
+	die("skip test requires GD 2.2.2 or higher");
+}
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagefilledarc_variation2.phpt b/ext/gd/tests/imagefilledarc_variation2.phpt
index c6ccca4b17..033d6f65f0 100644
--- a/ext/gd/tests/imagefilledarc_variation2.phpt
+++ b/ext/gd/tests/imagefilledarc_variation2.phpt
@@ -6,6 +6,9 @@ Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
 --SKIPIF--
 <?php 
 if (!extension_loaded("gd")) die("skip GD not present");
+if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
+	die("skip test requires GD 2.2.2 or higher");
+}
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagegammacorrect_basic.phpt b/ext/gd/tests/imagegammacorrect_basic.phpt
index 0f4a9fdc67..b803e9517f 100644
--- a/ext/gd/tests/imagegammacorrect_basic.phpt
+++ b/ext/gd/tests/imagegammacorrect_basic.phpt
@@ -6,6 +6,9 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
 <?php 
 	if (!extension_loaded("gd")) die("skip GD not present");
+	if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
+		die("skip test requires GD 2.2.2 or higher");
+	}
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagegammacorrect_variation1.phpt b/ext/gd/tests/imagegammacorrect_variation1.phpt
index f022d1d559..a0df819a7d 100644
--- a/ext/gd/tests/imagegammacorrect_variation1.phpt
+++ b/ext/gd/tests/imagegammacorrect_variation1.phpt
@@ -6,6 +6,9 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
 <?php 
 	if (!extension_loaded("gd")) die("skip GD not present");
+	if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
+		die("skip test requires GD 2.2.2 or higher");
+	}
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagetruecolortopalette_basic.phpt b/ext/gd/tests/imagetruecolortopalette_basic.phpt
index bbc1277112..e7b327475b 100644
--- a/ext/gd/tests/imagetruecolortopalette_basic.phpt
+++ b/ext/gd/tests/imagetruecolortopalette_basic.phpt
@@ -5,6 +5,9 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
 <?php 
 	if (!extension_loaded("gd")) die("skip GD not present");
+	if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
+		die("skip test requires GD 2.2.2 or higher");
+	}
 	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
 ?>
 --FILE--