PHP 8 compatibility

[m6w6/ext-http] / tests / skipif.inc

diff --git a/tests/skipif.inc b/tests/skipif.inc
index 85dbac2902d2c2ae7915b9fe9dcc18d4d6d053c5..51272fbe575b16705e7cb24564e9154e494d6331 100644 (file)
--- a/tests/skipif.inc
+++ b/tests/skipif.inc
@@ -1,13 +1,17 @@
 <?php
 _ext("http");
 
-function _ext($ext) { 
+function _ext($ext) {
        if (!extension_loaded($ext)) {
                die("skip $ext extension needed\n");
        }
 }
 
 function utf8locale() {
+       $locale = setlocale(LC_CTYPE, null);
+       if (stristr($locale, "utf") && substr($locale, -1) === "8") {
+               return true;
+       }
        if (stristr(setlocale(LC_CTYPE, "C.UTF-8"), "utf")) {
                return true;
        }
@@ -37,8 +41,8 @@ function skip_client_test($message = "skip need a client driver\n") {
 }
 
 function skip_curl_test($version) {
-       if (!version_compare(http\Client\Curl\Versions\CURL, $version, "<=")) {
-               die("need at least libcurl version $version\n");
+       if (!version_compare(http\Client\Curl\Versions\CURL, $version, ">=")) {
+               die("skip need at least libcurl version $version\n");
        }
 }