Migrate skip checks to --EXTENSIONS-- for ext/gd

ext/gd/tests/001-mb.phpt

@@ -1,5 +1,7 @@
 --TEST--
 imagecreatefrompng() and empty/missing file
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php if (!function_exists("imagecreatefrompng")) print "skip"; ?>
 --FILE--

ext/gd/tests/001.phpt

@@ -1,5 +1,7 @@
 --TEST--
 imagecreatefrompng() and empty/missing file
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php if (!function_exists("imagecreatefrompng")) print "skip"; ?>
 --FILE--

ext/gd/tests/bug19366.phpt

@@ -1,9 +1,7 @@
 --TEST--
 Bug #19366 (gdimagefill() function crashes (fixed in bundled libgd))
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 echo "Alive: create image\n";

ext/gd/tests/bug22544-mb.phpt

@@ -1,11 +1,7 @@
 --TEST--
 Bug #22544 (TrueColor transparency in PNG images).
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available\n");
-    }
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
     $image = imageCreateTruecolor(640, 100);

ext/gd/tests/bug22544.phpt

@@ -1,11 +1,7 @@
 --TEST--
 Bug #22544 (TrueColor transparency in PNG images).
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available\n");
-    }
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
     $image = imageCreateTruecolor(640, 100);

ext/gd/tests/bug24155.phpt

@@ -1,10 +1,9 @@
 --TEST--
 Bug #24155 (gdImageRotate270 rotation problem).
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available\n");
-    }
     if (!function_exists("imagerotate")) die("skip requires bundled GD library\n");
 ?>
 --FILE--

ext/gd/tests/bug24594.phpt

@@ -1,11 +1,7 @@
 --TEST--
 Bug #24594 (Filling an area using tiles).
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available\n");
-    }
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
     $tile = imagecreate(36,36);

ext/gd/tests/bug27582_1.phpt

@@ -1,9 +1,7 @@
 --TEST--
 Bug #27582 (ImageFillToBorder() on alphablending image looses alpha on fill color)
---SKIPIF--
-<?php
-        if (!extension_loaded('gd')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $dest = dirname(realpath(__FILE__)) . '/bug27582.png';

ext/gd/tests/bug28147.phpt

@@ -1,9 +1,7 @@
 --TEST--
 Bug #28147 (Crash with anti-aliased line)
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 //

ext/gd/tests/bug36697-mb.phpt

@@ -1,11 +1,7 @@
 --TEST--
 Bug #36697 (TrueColor transparency with GIF palette output).
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available\n");
-    }
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $dest = __DIR__ . "/36697私はガラスを食べられます.gif";

ext/gd/tests/bug36697.phpt

@@ -1,11 +1,7 @@
 --TEST--
 Bug #36697 (TrueColor transparency with GIF palette output).
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available\n");
-    }
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $dest = __DIR__ . "/36697.gif";

ext/gd/tests/bug37346-mb.phpt

@@ -1,9 +1,7 @@
 --TEST--
 Bug #37346 (gdimagecreatefromgif, bad colormap)
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreatefromgif(__DIR__ . '/bug37346私はガラスを食べられます.gif');

ext/gd/tests/bug37346.phpt

@@ -1,9 +1,7 @@
 --TEST--
 Bug #37346 (gdimagecreatefromgif, bad colormap)
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreatefromgif(__DIR__ . '/bug37346.gif');

ext/gd/tests/bug37360.phpt

@@ -1,9 +1,7 @@
 --TEST--
 Bug #37360 (gdimagecreatefromgif, bad image sizes)
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreatefromgif(__DIR__ . '/bug37360.gif');

ext/gd/tests/bug38112.phpt

@@ -1,11 +1,7 @@
 --TEST--
 Bug #38112 (GIF Invalid Code size ).
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available\n");
-    }
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreatefromgif(__DIR__ . '/bug38112.gif');

ext/gd/tests/bug38179.phpt

@@ -1,9 +1,7 @@
 --TEST--
 Bug #38179 (imagecopy from a palette to a truecolor image loses alpha channel)
---SKIPIF--
-<?php
-        if (!function_exists('imagecopy')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $src = imagecreate(5,5);

ext/gd/tests/bug38212-mb.phpt

@@ -1,9 +1,7 @@
 --TEST--
 Bug #38212 (Seg Fault on invalid imagecreatefromgd2part() parameters)
---SKIPIF--
-<?php
-        if (!function_exists('imagecopy')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 require __DIR__ . '/func.inc';

ext/gd/tests/bug38212.phpt

@@ -1,9 +1,7 @@
 --TEST--
 Bug #38212 (Seg Fault on invalid imagecreatefromgd2part() parameters)
---SKIPIF--
-<?php
-        if (!function_exists('imagecopy')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 require __DIR__ . '/func.inc';

ext/gd/tests/bug39082.phpt

@@ -1,11 +1,7 @@
 --TEST--
 Bug #39082 (Output image to stdout segfaults).
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available\n");
-    }
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreatetruecolor(1,1);

ext/gd/tests/bug39273.phpt

@@ -1,9 +1,7 @@
 --TEST--
 Bug #37360 (gdimagecreatefromgif, bad image sizes)
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $small = imagecreatetruecolor(10, 10);

ext/gd/tests/bug39366.phpt

@@ -1,8 +1,9 @@
 --TEST--
 Bug #39366 (imagerotate does not respect alpha with angles>45)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
     if (!function_exists("imagerotate")) die("skip requires bundled GD library\n");
 ?>
 --FILE--

ext/gd/tests/bug39508.phpt

@@ -1,9 +1,7 @@
 --TEST--
 Bug #39508 (imagefill crashes with small images 3 pixels or less)
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreatetruecolor(3,1);

ext/gd/tests/bug39780.phpt

@@ -1,8 +1,9 @@
 --TEST--
 Bug #39780 (PNG image with CRC/data error raises a fatal error)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
     if (!GD_BUNDLED) die("skip requires bundled GD library\n");
 ?>
 --FILE--

ext/gd/tests/bug39780_extern.phpt

@@ -1,8 +1,9 @@
 --TEST--
 Bug #39780 (PNG image with CRC/data error raises a fatal error)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
     if (GD_BUNDLED) die("skip requires extern GD\n");
 ?>
 --FILE--

ext/gd/tests/bug40764.phpt

@@ -1,9 +1,7 @@
 --TEST--
 Bug #40764 (line thickness not respected for horizontal and vertical lines)
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $image=imagecreatetruecolor(400, 400);

ext/gd/tests/bug41442.phpt

@@ -1,10 +1,9 @@
 --TEST--
 Bug #41442 (imagegd2() under output control)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available.");
-    }
     if (!function_exists("imagegd2")) {
         die("skip GD2 support unavailable");
     }

ext/gd/tests/bug42434.phpt

@@ -1,11 +1,7 @@
 --TEST--
 Bug #42434 (ImageLine w/ antialias = 1px shorter)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) {
-    die('skip gd extension not available');
-}
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreatetruecolor(10, 2);

ext/gd/tests/bug43073.phpt

@@ -1,8 +1,9 @@
 --TEST--
 Bug #43073 (TrueType bounding box is wrong for angle<>0)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
     if(!function_exists('imagettftext')) die('skip imagettftext() not available');
 ?>
 --FILE--

ext/gd/tests/bug43121.phpt

@@ -1,8 +1,9 @@
 --TEST--
 Bug #43121 (gdImageFill with IMG_COLOR_TILED crashes httpd)
+--EXTENSIONS--
+gd
 --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");
     }

ext/gd/tests/bug43475.phpt

@@ -1,8 +1,9 @@
 --TEST--
 Bug #43475 (Thick styled lines have scrambled patterns)
+--EXTENSIONS--
+gd
 --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");
     }

ext/gd/tests/bug43828.phpt

@@ -1,8 +1,9 @@
 --TEST--
 Bug #43828 (broken transparency of imagearc for truecolor in blendingmode)
+--EXTENSIONS--
+gd
 --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");
 }

ext/gd/tests/bug44849.phpt

@@ -1,9 +1,7 @@
 --TEST--
 Bug #44849 (imagecolorclosesthwb is not available on Windows)
---SKIPIF--
-<?php
-    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
     var_dump(function_exists('imagecolorclosesthwb'));

ext/gd/tests/bug45799.phpt

@@ -1,9 +1,7 @@
 --TEST--
 Bug #45799 (imagepng() crashes on empty image).
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $img = imagecreate(500,500);