From d88bbcea827bf2de7cf7425202dc67083b81f853 Mon Sep 17 00:00:00 2001
From: Gabriel Caruso <carusogabriel34@gmail.com>
Date: Mon, 30 Jul 2018 00:53:28 -0300
Subject: [PATCH] Remove superfluous SKIPIF sections of always available
 constants

---
 ext/standard/tests/image/bug72278.phpt                    | 4 ----
 ext/standard/tests/image/getimagesize_jpgapp.phpt         | 6 ------
 ext/standard/tests/image/getimagesize_tif_mm.phpt         | 6 ------
 ext/standard/tests/image/getimagesize_variation2.phpt     | 6 ------
 ext/standard/tests/image/getimagesize_wbmp.phpt           | 6 ------
 ext/standard/tests/image/getimagesize_xbm.phpt            | 6 ------
 .../tests/image/image_type_to_mime_type_variation4.phpt   | 4 ++--
 ext/standard/tests/strings/crypt_blowfish.phpt            | 6 ------
 ext/standard/tests/strings/crypt_blowfish_variation1.phpt | 6 ------
 ext/standard/tests/strings/crypt_sha256.phpt              | 8 +-------
 ext/standard/tests/strings/crypt_sha512.phpt              | 6 ------
 11 files changed, 3 insertions(+), 61 deletions(-)

diff --git a/ext/standard/tests/image/bug72278.phpt b/ext/standard/tests/image/bug72278.phpt
index 1ee194681f6..d9f2a2b5311 100644
--- a/ext/standard/tests/image/bug72278.phpt
+++ b/ext/standard/tests/image/bug72278.phpt
@@ -1,9 +1,5 @@
 --TEST--
 Bug #72278 (getimagesize returning FALSE on valid jpg)
---SKIPIF--
-<?php
-if (!defined('IMAGETYPE_JPEG')) die('skip images of type JPEG not supported');
-?>
 --FILE--
 <?php
 define('FILENAME', __DIR__ . DIRECTORY_SEPARATOR . 'bug72278.jpg');
diff --git a/ext/standard/tests/image/getimagesize_jpgapp.phpt b/ext/standard/tests/image/getimagesize_jpgapp.phpt
index c3ebcef282b..766427b59fe 100644
--- a/ext/standard/tests/image/getimagesize_jpgapp.phpt
+++ b/ext/standard/tests/image/getimagesize_jpgapp.phpt
@@ -1,11 +1,5 @@
 --TEST--
 Test getimagesize() function : basic functionality - load APP info from jpeg.
---SKIPIF--
-<?php
-	if (!defined("IMAGETYPE_JPEG")) {
-		die("skip jpeg format is not available");
-	}
-?>
 --FILE--
 <?php
 /* Prototype  : proto array getimagesize(string imagefile [, array info])
diff --git a/ext/standard/tests/image/getimagesize_tif_mm.phpt b/ext/standard/tests/image/getimagesize_tif_mm.phpt
index 8bc88fd0488..8cac17b3e7d 100644
--- a/ext/standard/tests/image/getimagesize_tif_mm.phpt
+++ b/ext/standard/tests/image/getimagesize_tif_mm.phpt
@@ -1,11 +1,5 @@
 --TEST--
 GetImageSize() for tiff format with big-endian (aka Motorola, aka MM) ordering
---SKIPIF--
-<?php
-	if (!defined("IMAGETYPE_TIFF_MM")) {
-		die("skip tiff_mm file format is not available");
-	}
-?>
 --FILE--
 <?php
 /* Prototype  : proto array getimagesize(string imagefile [, array info])
diff --git a/ext/standard/tests/image/getimagesize_variation2.phpt b/ext/standard/tests/image/getimagesize_variation2.phpt
index 9e8c16b9ee0..3efdd51b40b 100644
--- a/ext/standard/tests/image/getimagesize_variation2.phpt
+++ b/ext/standard/tests/image/getimagesize_variation2.phpt
@@ -1,11 +1,5 @@
 --TEST--
 Test getimagesize() function : usage variations  - unexpected type for arg 2
---SKIPIF--
-<?php
-	if (!defined("IMAGETYPE_JPEG")) {
-		die("skip jpeg format is not available");
-	}
-?>
 --FILE--
 <?php
 /* Prototype  : proto array getimagesize(string imagefile [, array info])
diff --git a/ext/standard/tests/image/getimagesize_wbmp.phpt b/ext/standard/tests/image/getimagesize_wbmp.phpt
index 503b5f14252..ce2179293c6 100644
--- a/ext/standard/tests/image/getimagesize_wbmp.phpt
+++ b/ext/standard/tests/image/getimagesize_wbmp.phpt
@@ -1,11 +1,5 @@
 --TEST--
 GetImageSize() for wbmp format
---SKIPIF--
-<?php
-	if (!defined("IMAGETYPE_WBMP")) {
-		die("skip wbmp file format is not available");
-	}
-?>
 --FILE--
 <?php
 /* Prototype  : proto array getimagesize(string imagefile [, array info])
diff --git a/ext/standard/tests/image/getimagesize_xbm.phpt b/ext/standard/tests/image/getimagesize_xbm.phpt
index 53406a8fe82..9156d40b102 100644
--- a/ext/standard/tests/image/getimagesize_xbm.phpt
+++ b/ext/standard/tests/image/getimagesize_xbm.phpt
@@ -1,11 +1,5 @@
 --TEST--
 GetImageSize() for xbm format
---SKIPIF--
-<?php
-	if (!defined("IMAGETYPE_XBM")) {
-		die("skip xbm file format is not available");
-	}
-?>
 --FILE--
 <?php
 /* Prototype  : proto array getimagesize(string imagefile [, array info])
diff --git a/ext/standard/tests/image/image_type_to_mime_type_variation4.phpt b/ext/standard/tests/image/image_type_to_mime_type_variation4.phpt
index a67bb86a69b..0a963387360 100644
--- a/ext/standard/tests/image/image_type_to_mime_type_variation4.phpt
+++ b/ext/standard/tests/image/image_type_to_mime_type_variation4.phpt
@@ -2,8 +2,8 @@
 Test image_type_to_mime_type() function : usage variations - Passing IMAGETYPE_ICO and IMAGETYPE_SWC
 --SKIPIF--
 <?php
-	if (!defined("IMAGETYPE_SWC") || !defined("IMAGETYPE_ICO") || !extension_loaded('zlib')) {
-		die("skip zlib extension is not available or IMAGETYPE_SWC/IMAGETYPE_ICO is not defined ");
+	if (!defined("IMAGETYPE_SWC") || !extension_loaded('zlib')) {
+		die("skip zlib extension is not available or IMAGETYPE_SWC is not defined ");
 	}
 ?>
 --FILE--
diff --git a/ext/standard/tests/strings/crypt_blowfish.phpt b/ext/standard/tests/strings/crypt_blowfish.phpt
index de2cf637df8..3af9cb77eb3 100644
--- a/ext/standard/tests/strings/crypt_blowfish.phpt
+++ b/ext/standard/tests/strings/crypt_blowfish.phpt
@@ -1,11 +1,5 @@
 --TEST--
 Official blowfish tests (http://cvsweb.openwall.com/cgi/cvsweb.cgi/Owl/packages/glibc/crypt_blowfish/wrapper.c)
---SKIPIF--
-<?php
-if (!defined("CRYPT_BLOWFISH")) {
-    die("SKIP crypt()-blowfish is not available");
-}
-?>
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/strings/crypt_blowfish_variation1.phpt b/ext/standard/tests/strings/crypt_blowfish_variation1.phpt
index 020b8afc855..5cfdbcfbfe5 100644
--- a/ext/standard/tests/strings/crypt_blowfish_variation1.phpt
+++ b/ext/standard/tests/strings/crypt_blowfish_variation1.phpt
@@ -1,11 +1,5 @@
 --TEST--
 Test Blowfish crypt() with invalid rounds
---SKIPIF--
-<?php
-if (!defined("CRYPT_BLOWFISH")) {
-    die("SKIP crypt()-blowfish is not available");
-}
-?>
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/strings/crypt_sha256.phpt b/ext/standard/tests/strings/crypt_sha256.phpt
index 644ab881699..5374197e20b 100644
--- a/ext/standard/tests/strings/crypt_sha256.phpt
+++ b/ext/standard/tests/strings/crypt_sha256.phpt
@@ -1,11 +1,5 @@
 --TEST--
-crypt() SHA-256 
---SKIPIF--
-<?php
-if (!defined("CRYPT_SHA256")) {
-	die("SKIP crypt()-sha256 is not available");
-}
-?> 
+crypt() SHA-256
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/strings/crypt_sha512.phpt b/ext/standard/tests/strings/crypt_sha512.phpt
index c94ebc5aea3..ffbc5747de1 100644
--- a/ext/standard/tests/strings/crypt_sha512.phpt
+++ b/ext/standard/tests/strings/crypt_sha512.phpt
@@ -1,11 +1,5 @@
 --TEST--
 crypt() SHA-512
---SKIPIF--
-<?php
-if (!defined("CRYPT_SHA512")) {
-	die("SKIP crypt()-sha512 is not available");
-}
-?> 
 --FILE--
 <?php