From 654073073221f2ecbbd2b9b69ca8da74461112f1 Mon Sep 17 00:00:00 2001
From: Arnaud Le Blanc <lbarnaud@php.net>
Date: Wed, 20 May 2009 10:08:32 +0000
Subject: [PATCH] MFH: Fix skipif

---
 ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt | 1 +
 ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt | 1 +
 ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt | 1 +
 sapi/cli/tests/006.phpt                              | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt
index d8f91d328e..22bab4eae3 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt
@@ -2,6 +2,7 @@
 SOAP Interop Round2 base 005 (php/direct): echoString(utf-8)
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
+<?php if (!function_exists('utf8_encode')) die('skip utf8_encode() not available'); ?>
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt
index 116e14faac..f94c06f58c 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt
@@ -2,6 +2,7 @@
 SOAP Interop Round2 base 005 (soap/direct): echoString(utf-8)
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
+<?php if (!function_exists('utf8_encode')) die('skip utf8_encode() not available'); ?>
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt
index 728b4f5c58..3bb1368b97 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt
@@ -2,6 +2,7 @@
 SOAP Interop Round2 base 005 (php/wsdl): echoString(utf-8)
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
+<?php if (!function_exists('utf8_encode')) die('skip utf8_encode() not available'); ?>
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/sapi/cli/tests/006.phpt b/sapi/cli/tests/006.phpt
index f9d2432247..e322d7ef71 100644
--- a/sapi/cli/tests/006.phpt
+++ b/sapi/cli/tests/006.phpt
@@ -3,7 +3,7 @@ show information about extension
 --SKIPIF--
 <?php 
 include "skipif.inc"; 
-if (!extension_loaded("reflection")) {
+if (!extension_loaded("reflection") || !extension_loaded("session")) {
 	die("skip");
 }
 ?>
-- 
2.40.0