From: Pierrick Charron <pierrick@php.net>
Date: Wed, 26 Dec 2012 05:43:37 +0000 (-0500)
Subject: Fix ext/curl tests to work on every libcurl versions
X-Git-Tag: php-5.5.0alpha3~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8456cef1dbcb6c5a5690ce4553063ad18874f0b1;p=php

Fix ext/curl tests to work on every libcurl versions

Thanks Laruence :)
---

diff --git a/ext/curl/tests/curl_multi_setopt_basic001.phpt b/ext/curl/tests/curl_multi_setopt_basic001.phpt
index af74a0f400..a13cf6d716 100644
--- a/ext/curl/tests/curl_multi_setopt_basic001.phpt
+++ b/ext/curl/tests/curl_multi_setopt_basic001.phpt
@@ -1,6 +1,7 @@
 --TEST--
 curl_multi_setopt basic test
 --SKIPIF--
+<?php
 if (!extension_loaded("curl")) {
 	    exit("skip curl extension not loaded");
 }
@@ -8,6 +9,7 @@ $curl_version = curl_version();
 if ($curl_version['version_number'] < 0x071000) {
 	    exit("skip: test works only with curl >= 7.16.0");
 }
+?>
 --FILE--
 <?php
 
diff --git a/ext/curl/tests/curl_multi_strerror_001.phpt b/ext/curl/tests/curl_multi_strerror_001.phpt
index 85a665ce6f..ac330acaee 100644
--- a/ext/curl/tests/curl_multi_strerror_001.phpt
+++ b/ext/curl/tests/curl_multi_strerror_001.phpt
@@ -1,6 +1,7 @@
 --TEST--
 curl_multi_strerror basic test
 --SKIPIF--
+<?php
 if (!extension_loaded("curl")) {
 	    exit("skip curl extension not loaded");
 }
@@ -8,13 +9,14 @@ $curl_version = curl_version();
 if ($curl_version['version_number'] < 0x070c00) {
 	exit("skip: test works only with curl >= 7.12.0");
 }
+?>
 --FILE--
 <?php
 
-var_dump(curl_multi_strerror(CURLM_OK));
-var_dump(curl_multi_strerror(CURLM_BAD_HANDLE));
+var_dump(strtolower(curl_multi_strerror(CURLM_OK)));
+var_dump(strtolower(curl_multi_strerror(CURLM_BAD_HANDLE)));
 
 ?>
 --EXPECTF--
-string(8) "No error"
-string(20) "Invalid multi handle"
+string(8) "no error"
+string(20) "invalid multi handle"
diff --git a/ext/curl/tests/curl_share_setopt_basic001.phpt b/ext/curl/tests/curl_share_setopt_basic001.phpt
index 88e92860b0..33c03e3337 100644
--- a/ext/curl/tests/curl_share_setopt_basic001.phpt
+++ b/ext/curl/tests/curl_share_setopt_basic001.phpt
@@ -1,9 +1,11 @@
 --TEST--
 curl_share_setopt basic test
 --SKIPIF--
+<?php
 if (!extension_loaded("curl")) {
 	    exit("skip curl extension not loaded");
 }
+?>
 --FILE--
 <?php
 
diff --git a/ext/curl/tests/curl_strerror_001.phpt b/ext/curl/tests/curl_strerror_001.phpt
index c61481bc8b..f8a0de311b 100644
--- a/ext/curl/tests/curl_strerror_001.phpt
+++ b/ext/curl/tests/curl_strerror_001.phpt
@@ -1,6 +1,7 @@
 --TEST--
 curl_strerror basic test
 --SKIPIF--
+<?php
 if (!extension_loaded("curl")) {
 	    exit("skip curl extension not loaded");
 }
@@ -8,15 +9,16 @@ $curl_version = curl_version();
 if ($curl_version['version_number'] < 0x070c00) {
 	exit("skip: test works only with curl >= 7.12.0");
 }
+?>
 --FILE--
 <?php
 
-var_dump(curl_strerror(CURLE_OK));
-var_dump(curl_strerror(CURLE_UNSUPPORTED_PROTOCOL));
-var_dump(curl_strerror(-1));
+var_dump(strtolower(curl_strerror(CURLE_OK)));
+var_dump(strtolower(curl_strerror(CURLE_UNSUPPORTED_PROTOCOL)));
+var_dump(strtolower(curl_strerror(-1)));
 
 ?>
 --EXPECTF--
-string(8) "No error"
-string(20) "Unsupported protocol"
-string(13) "Unknown error"
+string(8) "no error"
+string(20) "unsupported protocol"
+string(13) "unknown error"