summaryrefslogtreecommitdiff
path: root/ext/spl
diff options
context:
space:
mode:
authorGabriel Caruso <carusogabriel34@gmail.com>2018-02-03 11:34:01 -0200
committerNikita Popov <nikita.ppv@gmail.com>2018-02-03 17:50:31 +0100
commit766ce8bdd514263b0ea19cbe323455794eb928f8 (patch)
tree9b6725d26e33d24c3ecda0b7f316aad3862034d9 /ext/spl
parente0171ed9d0b93270278d08d9c47a49c6cfb83794 (diff)
downloadphp-git-766ce8bdd514263b0ea19cbe323455794eb928f8.tar.gz
Remove superfluous SKIPIF sections in SPL tests
Diffstat (limited to 'ext/spl')
-rw-r--r--ext/spl/tests/bug44144.phpt4
-rw-r--r--ext/spl/tests/bug49263.phpt2
-rw-r--r--ext/spl/tests/bug71412.phpt4
-rw-r--r--ext/spl/tests/countable_class_basic1.phpt8
-rw-r--r--ext/spl/tests/dit_002.phpt2
5 files changed, 2 insertions, 18 deletions
diff --git a/ext/spl/tests/bug44144.phpt b/ext/spl/tests/bug44144.phpt
index 2933d2f220..7dbcf1e636 100644
--- a/ext/spl/tests/bug44144.phpt
+++ b/ext/spl/tests/bug44144.phpt
@@ -1,7 +1,5 @@
--TEST--
Bug #44144 (spl_autoload_functions() should return object instance when appropriate)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
--FILE--
<?php
class Foo {
@@ -23,5 +21,3 @@ array(1) {
string(15) "nonstaticMethod"
}
}
-
-
diff --git a/ext/spl/tests/bug49263.phpt b/ext/spl/tests/bug49263.phpt
index 2075577ba8..a2e2e0b396 100644
--- a/ext/spl/tests/bug49263.phpt
+++ b/ext/spl/tests/bug49263.phpt
@@ -1,7 +1,5 @@
--TEST--
SPL: SplObjectStorage serialization references
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
--FILE--
<?php
$o1 = new stdClass;
diff --git a/ext/spl/tests/bug71412.phpt b/ext/spl/tests/bug71412.phpt
index 3378604af3..7db6b08469 100644
--- a/ext/spl/tests/bug71412.phpt
+++ b/ext/spl/tests/bug71412.phpt
@@ -1,11 +1,9 @@
--TEST--
Bug#71412 ArrayIterator reflection parameter info
---SKIPIF--
-<?php
-extension_loaded('SPL') || print "skip";
--FILE--
<?php
echo (new ReflectionMethod('ArrayIterator', '__construct'));
+?>
--EXPECT--
Method [ <internal:SPL, ctor> public method __construct ] {
diff --git a/ext/spl/tests/countable_class_basic1.phpt b/ext/spl/tests/countable_class_basic1.phpt
index c64aad6b6d..3108cb1818 100644
--- a/ext/spl/tests/countable_class_basic1.phpt
+++ b/ext/spl/tests/countable_class_basic1.phpt
@@ -1,13 +1,5 @@
--TEST--
SPL: Test shape of interface Countable.
---SKIPIF--
-<?php
-// Skip the test case if Standard PHP Library(spl) is not installed
- if( !extension_loaded('spl'))
- {
- die('skip spl is not installed');
- }
-?>
--FILE--
<?php
ReflectionClass::export('Countable');
diff --git a/ext/spl/tests/dit_002.phpt b/ext/spl/tests/dit_002.phpt
index a2665421e0..f4cd3ab058 100644
--- a/ext/spl/tests/dit_002.phpt
+++ b/ext/spl/tests/dit_002.phpt
@@ -1,7 +1,7 @@
--TEST--
SPL: DirectoryIterator defaults
--SKIPIF--
-<?php if (!extension_loaded("spl") || !extension_loaded('reflection') || !defined('GLOB_ERR')) print "skip"; ?>
+<?php if (!defined('GLOB_ERR')) die('skip GLOB_ERR not defined'); ?>
--FILE--
<?php