From 1624b0a91ff05f5be77696eb674381f08dd94e95 Mon Sep 17 00:00:00 2001
From: Gabriel Caruso <carusogabriel34@gmail.com>
Date: Sat, 3 Feb 2018 12:03:29 -0200
Subject: [PATCH] Remove superfluous SKIPIF sections in Zend tests

---
 Zend/tests/bug36214.phpt                   | 2 --
 Zend/tests/bug42819.phpt                   | 4 +---
 Zend/tests/bug45805.phpt                   | 4 +---
 Zend/tests/bug50174.phpt                   | 2 --
 Zend/tests/closure_042.phpt                | 4 +---
 Zend/tests/gc_024.phpt                     | 2 --
 Zend/tests/ns_035.phpt                     | 2 --
 Zend/tests/ns_036.phpt                     | 2 --
 Zend/tests/ns_054.phpt                     | 2 --
 Zend/tests/ns_056.phpt                     | 2 --
 Zend/tests/return_types/reflection001.phpt | 6 +-----
 Zend/tests/unset_cv10.phpt                 | 2 --
 12 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/Zend/tests/bug36214.phpt b/Zend/tests/bug36214.phpt
index 630773713a..b2e3e5dd21 100644
--- a/Zend/tests/bug36214.phpt
+++ b/Zend/tests/bug36214.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #36214 (__get method works properly only when conditional operator is used)
---SKIPIF--
-<?php if (!extension_loaded("spl")) die("skip SPL is no available"); ?>
 --FILE--
 <?php
 class context {
diff --git a/Zend/tests/bug42819.phpt b/Zend/tests/bug42819.phpt
index 4630dc29b5..d0b5c0b2ee 100644
--- a/Zend/tests/bug42819.phpt
+++ b/Zend/tests/bug42819.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #42819 (namespaces in indexes of constant arrays)
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip SPL extension required"; ?>
 --FILE--
 <?php
 namespace foo\foo;
@@ -303,4 +301,4 @@ Fatal error: Uncaught Error: Undefined constant 'foo\foo\unknown' in %sbug42819.
 Stack trace:
 #0 %s(%d): foo\oops()
 #1 {main}
-  thrown in %sbug42819.php on line %d
\ No newline at end of file
+  thrown in %sbug42819.php on line %d
diff --git a/Zend/tests/bug45805.phpt b/Zend/tests/bug45805.phpt
index 1bb03e917e..edeca7456c 100644
--- a/Zend/tests/bug45805.phpt
+++ b/Zend/tests/bug45805.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #45805 (Crash on throwing exception from error handler)
---SKIPIF--
-<?php extension_loaded('reflection') or die('skip'); ?>
 --FILE--
 <?php
 class PHPUnit_Util_ErrorHandler
@@ -33,7 +31,7 @@ class B {
 set_error_handler(
   array('PHPUnit_Util_ErrorHandler', 'handleError'), E_ALL | E_STRICT
 );
-            
+
 $o = new B;
 $o->bar();
 ?>
diff --git a/Zend/tests/bug50174.phpt b/Zend/tests/bug50174.phpt
index ac2ad2cb8d..6ed5733b67 100644
--- a/Zend/tests/bug50174.phpt
+++ b/Zend/tests/bug50174.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #50174 (Incorrectly matched docComment)
---SKIPIF--
-<?php if (!extension_loaded('reflection') || !extension_loaded('spl')) print "skip SPL and reflection extensions required"; ?>
 --FILE--
 <?php
 
diff --git a/Zend/tests/closure_042.phpt b/Zend/tests/closure_042.phpt
index 8969765bcd..dc849a5282 100644
--- a/Zend/tests/closure_042.phpt
+++ b/Zend/tests/closure_042.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Closure 042: Binding an instance to a non-scoped non-static closures gives it a dummy scope
---SKIPIF--
-<?php if(!extension_loaded("reflection")) print "skip no reflection"; ?>
 --FILE--
 <?php
 
@@ -18,7 +16,7 @@ $rm = new ReflectionFunction($d);
 var_dump($rm->getClosureScopeClass()->name); //dummy sope is Closure
 
 echo "Done.\n";
-
+?>
 --EXPECTF--
 object(stdClass)#%d (0) {
 }
diff --git a/Zend/tests/gc_024.phpt b/Zend/tests/gc_024.phpt
index ca78da63d3..3f6290241a 100644
--- a/Zend/tests/gc_024.phpt
+++ b/Zend/tests/gc_024.phpt
@@ -2,8 +2,6 @@
 GC 024: GC and objects with non-standard handlers
 --INI--
 zend.enable_gc=1
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip SPL extension required"; ?>
 --FILE--
 <?php
 $a = new ArrayObject();
diff --git a/Zend/tests/ns_035.phpt b/Zend/tests/ns_035.phpt
index fcc771a74e..7fdf7d83f3 100644
--- a/Zend/tests/ns_035.phpt
+++ b/Zend/tests/ns_035.phpt
@@ -1,7 +1,5 @@
 --TEST--
 035: Name ambiguity in compile-time constant reference (php name)
---SKIPIF--
-<?php if (!extension_loaded("spl")) die("skip SPL is no available"); ?>
 --FILE--
 <?php
 namespace A;
diff --git a/Zend/tests/ns_036.phpt b/Zend/tests/ns_036.phpt
index 245cf7d5b5..0458a38df0 100644
--- a/Zend/tests/ns_036.phpt
+++ b/Zend/tests/ns_036.phpt
@@ -1,7 +1,5 @@
 --TEST--
 036: Name ambiguity in compile-time constant reference (ns name)
---SKIPIF--
-<?php if (!extension_loaded("spl")) die("skip SPL is no available"); ?>
 --FILE--
 <?php
 namespace A;
diff --git a/Zend/tests/ns_054.phpt b/Zend/tests/ns_054.phpt
index 54ab958611..c6dd2553f8 100644
--- a/Zend/tests/ns_054.phpt
+++ b/Zend/tests/ns_054.phpt
@@ -1,7 +1,5 @@
 --TEST--
 054: namespace and interfaces
---SKIPIF--
-<?php if (!extension_loaded("spl")) die("skip SPL is no available"); ?>
 --FILE--
 <?php
 namespace test\ns1;
diff --git a/Zend/tests/ns_056.phpt b/Zend/tests/ns_056.phpt
index 2390608d4e..b61609793d 100644
--- a/Zend/tests/ns_056.phpt
+++ b/Zend/tests/ns_056.phpt
@@ -1,7 +1,5 @@
 --TEST--
 056: type-hint compatibility in namespaces
---SKIPIF--
-<?php if (!extension_loaded("spl")) die("skip SPL is no available"); ?>
 --FILE--
 <?php
 namespace test\ns1;
diff --git a/Zend/tests/return_types/reflection001.phpt b/Zend/tests/return_types/reflection001.phpt
index c95f7292b5..c2ff253cdb 100644
--- a/Zend/tests/return_types/reflection001.phpt
+++ b/Zend/tests/return_types/reflection001.phpt
@@ -1,9 +1,5 @@
 --TEST--
 Return type and Reflection::export()
---SKIPIF--
-<?php
-if (!extension_loaded('reflection')) print 'skip';
-?>
 --FILE--
 <?php
 
@@ -14,6 +10,7 @@ class A {
 }
 
 ReflectionClass::export("A");
+?>
 --EXPECTF--
 Class [ <user> class A ] {
   @@ %sreflection001.php 3-7
@@ -41,4 +38,3 @@ Class [ <user> class A ] {
     }
   }
 }
-
diff --git a/Zend/tests/unset_cv10.phpt b/Zend/tests/unset_cv10.phpt
index 3b943d8b6a..335463b0ca 100644
--- a/Zend/tests/unset_cv10.phpt
+++ b/Zend/tests/unset_cv10.phpt
@@ -1,7 +1,5 @@
 --TEST--
 unset() CV 10 (unset() of global variable in ArrayObject::offsetUnset($GLOBALS))
---SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip SPL extension required"; ?>
 --FILE--
 <?php
 $a = new ArrayObject($GLOBALS);
-- 
2.50.1