summaryrefslogtreecommitdiff
path: root/ext/standard/tests/image
diff options
context:
space:
mode:
authorGabriel Caruso <carusogabriel34@gmail.com>2018-07-30 00:53:28 -0300
committerGabriel Caruso <carusogabriel34@gmail.com>2018-07-30 00:53:28 -0300
commitd88bbcea827bf2de7cf7425202dc67083b81f853 (patch)
tree80b7da02e9960183b07afe0e508f8c7c2944d924 /ext/standard/tests/image
parent4371945b8b71e000ee060b9da668a6eea032df32 (diff)
downloadphp-git-d88bbcea827bf2de7cf7425202dc67083b81f853.tar.gz
Remove superfluous SKIPIF sections of always available constants
Diffstat (limited to 'ext/standard/tests/image')
-rw-r--r--ext/standard/tests/image/bug72278.phpt4
-rw-r--r--ext/standard/tests/image/getimagesize_jpgapp.phpt6
-rw-r--r--ext/standard/tests/image/getimagesize_tif_mm.phpt6
-rw-r--r--ext/standard/tests/image/getimagesize_variation2.phpt6
-rw-r--r--ext/standard/tests/image/getimagesize_wbmp.phpt6
-rw-r--r--ext/standard/tests/image/getimagesize_xbm.phpt6
-rw-r--r--ext/standard/tests/image/image_type_to_mime_type_variation4.phpt4
7 files changed, 2 insertions, 36 deletions
diff --git a/ext/standard/tests/image/bug72278.phpt b/ext/standard/tests/image/bug72278.phpt
index 1ee194681f..d9f2a2b531 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 c3ebcef282..766427b59f 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 8bc88fd048..8cac17b3e7 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 9e8c16b9ee..3efdd51b40 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 503b5f1425..ce2179293c 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 53406a8fe8..9156d40b10 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 a67bb86a69..0a96338736 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--