5.3->5.2.5

diff --git a/tests/HttpMessage_001.phpt b/tests/HttpMessage_001.phpt
index 8f711c1ab18357a73c5b2e775fb383214da6af24..ecdf22848a5e4061bcfa78527011e02fe177e38c 100644 (file)
--- a/tests/HttpMessage_001.phpt
+++ b/tests/HttpMessage_001.phpt
@@ -3,7 +3,7 @@ HttpMessage
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --FILE--
 <?php

diff --git a/tests/HttpMessage_002.phpt b/tests/HttpMessage_002.phpt
index 65c1b6c8b55783c6a15fdd64d2d219e174675515..4e1f10c268eb6968fd224a672dfc3bc63308ceb7 100644 (file)
--- a/tests/HttpMessage_002.phpt
+++ b/tests/HttpMessage_002.phpt
@@ -3,7 +3,7 @@ HttpMessage properties
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5.3);
+checkmin("5.2.5");
 checkcls('HttpMessage');
 ?>
 --FILE--

diff --git a/tests/HttpMessage_003.phpt b/tests/HttpMessage_003.phpt
index e2f9f4f24e8a622b74c8e94ed8b694b1d15b8e82..f0afbb97851bc60a986900147bf20ac870a2ef1a 100644 (file)
--- a/tests/HttpMessage_003.phpt
+++ b/tests/HttpMessage_003.phpt
@@ -3,7 +3,7 @@ HttpMessage implements Serializable, Countable
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --FILE--
 <?php
@@ -44,26 +44,26 @@ Content-Length: 1
 X
 "
 object(HttpMessage)#%d (%d) {
-  ["type":protected]=>
+  ["type%sprotected%s]=>
   int(2)
-  ["body":protected]=>
+  ["body%sprotected%s]=>
   string(0) ""
-  ["requestMethod":protected]=>
+  ["requestMethod%sprotected%s]=>
   string(0) ""
-  ["requestUrl":protected]=>
+  ["requestUrl%sprotected%s]=>
   string(0) ""
-  ["responseStatus":protected]=>
+  ["responseStatus%sprotected%s]=>
   string(2) "Ok"
-  ["responseCode":protected]=>
+  ["responseCode%sprotected%s]=>
   int(200)
-  ["httpVersion":protected]=>
+  ["httpVersion%sprotected%s]=>
   float(1.1)
-  ["headers":protected]=>
+  ["headers%sprotected%s]=>
   array(1) {
     ["Server"]=>
     string(9) "Funky/1.0"
   }
-  ["parentMessage":protected]=>
+  ["parentMessage%sprotected%s]=>
   NULL
 }
 int(1)

diff --git a/tests/HttpQueryString_001.phpt b/tests/HttpQueryString_001.phpt
index 413bb34cab078de0cd6f13cb5d568c37f9b7d36c..9958e1af05d06e27eec18e2f8ff521474d139337 100644 (file)
--- a/tests/HttpQueryString_001.phpt
+++ b/tests/HttpQueryString_001.phpt
@@ -3,7 +3,7 @@ HttpQueryString global
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --FILE--
 <?php
@@ -72,7 +72,7 @@ object(stdClass)#%d (%d) {
   int(3)
 }
 object(HttpQueryString)#1 (2) {
-  ["queryArray":"HttpQueryString":private]=>
+  ["queryArray%sprivate%s]=>
   &array(3) {
     ["c"]=>
     string(3) "3.4"
@@ -91,7 +91,7 @@ object(HttpQueryString)#1 (2) {
       string(1) "2"
     }
   }
-  ["queryString":"HttpQueryString":private]=>
+  ["queryString%sprivate%s]=>
   &string(49) "c=3.4&r%5B0%5D=1&r%5B1%5D=2&r%5B2%5D=3&z%5B0%5D=2"
 }
 array(3) {

diff --git a/tests/HttpQueryString_002.phpt b/tests/HttpQueryString_002.phpt
index d711f26deff5319697749d444872c2d865b8ccaf..3eba39b08711f1544d0f83f10bc6104420306852 100644 (file)
--- a/tests/HttpQueryString_002.phpt
+++ b/tests/HttpQueryString_002.phpt
@@ -3,7 +3,7 @@ HttpQueryString local
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --FILE--
 <?php
@@ -68,7 +68,7 @@ object(stdClass)#%d (%d) {
   int(3)
 }
 object(HttpQueryString)#1 (2) {
-  ["queryArray":"HttpQueryString":private]=>
+  ["queryArray%sprivate%s]=>
   array(3) {
     ["c"]=>
     string(3) "3.4"
@@ -87,7 +87,7 @@ object(HttpQueryString)#1 (2) {
       string(1) "2"
     }
   }
-  ["queryString":"HttpQueryString":private]=>
+  ["queryString%sprivate%s]=>
   string(49) "c=3.4&r%5B0%5D=1&r%5B1%5D=2&r%5B2%5D=3&z%5B0%5D=2"
 }
 array(3) {

diff --git a/tests/HttpQueryString_003.phpt b/tests/HttpQueryString_003.phpt
index 0287ce9774cee324a1b1e13495ef736b01600c58..6342ad64c5f6594bb3ba5d600c0ed03018ad484d 100644 (file)
--- a/tests/HttpQueryString_003.phpt
+++ b/tests/HttpQueryString_003.phpt
@@ -3,7 +3,7 @@ HttpQueryString xlate
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5.3);
+checkmin("5.2.5");
 checkext('iconv');
 ?>
 --FILE--

diff --git a/tests/HttpQueryString_004.phpt b/tests/HttpQueryString_004.phpt
index cb73ea64955a6e60088448dc9bed03c17496d404..c7db402493e1440119dc0b945d4707197f1d39a2 100644 (file)
--- a/tests/HttpQueryString_004.phpt
+++ b/tests/HttpQueryString_004.phpt
@@ -3,7 +3,7 @@ HttpQueryString w/ objects
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --FILE--
 <?php
@@ -28,7 +28,7 @@ echo "Done\n";
 --EXPECTF--
 %aTEST
 object(HttpQueryString)#3 (2) {
-  ["queryArray":"HttpQueryString":private]=>
+  ["queryArray%sprivate%s]=>
   array(1) {
     ["bar"]=>
     array(1) {
@@ -36,11 +36,11 @@ object(HttpQueryString)#3 (2) {
       int(1)
     }
   }
-  ["queryString":"HttpQueryString":private]=>
+  ["queryString%sprivate%s]=>
   string(14) "bar%5Bbaz%5D=1"
 }
 object(HttpQueryString)#4 (2) {
-  ["queryArray":"HttpQueryString":private]=>
+  ["queryArray%sprivate%s]=>
   array(1) {
     ["bar"]=>
     array(1) {
@@ -48,7 +48,7 @@ object(HttpQueryString)#4 (2) {
       int(0)
     }
   }
-  ["queryString":"HttpQueryString":private]=>
+  ["queryString%sprivate%s]=>
   string(14) "bar%5Bbaz%5D=0"
 }
 Done

diff --git a/tests/HttpRequestPool_001.phpt b/tests/HttpRequestPool_001.phpt
index f94e92f2d0b2803d19a15724fd82b7d9c2024f16..c0d9c940d79a6342ac4f707a868497a9d67a5652 100644 (file)
--- a/tests/HttpRequestPool_001.phpt
+++ b/tests/HttpRequestPool_001.phpt
@@ -3,7 +3,7 @@ HttpRequestPool
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5.3);
+checkmin("5.2.5");
 checkcls('HttpRequestPool');
 checkurl('www.php.net');
 checkurl('dev.iworks.at');

diff --git a/tests/HttpRequestPool_004.phpt b/tests/HttpRequestPool_004.phpt
index 8348ec172807f894be04a1b99dd542a3f6861181..69635fa61b7c54bb4abaa770e5a7b671e52c56be 100644 (file)
--- a/tests/HttpRequestPool_004.phpt
+++ b/tests/HttpRequestPool_004.phpt
@@ -3,7 +3,7 @@ HttpRequestPool::__destruct() invalid curl handle
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5.3);
+checkmin("5.2.5");
 checkcls('HttpRequest');
 checkcls('HttpRequestPool');
 ?>

diff --git a/tests/HttpRequestPool_005.phpt b/tests/HttpRequestPool_005.phpt
index ac16995edb4800ee9b7d366bb69d4a9472f04902..4770fe779f6206a6526cbcfa172b51204d05f4d3 100644 (file)
--- a/tests/HttpRequestPool_005.phpt
+++ b/tests/HttpRequestPool_005.phpt
@@ -3,7 +3,7 @@ HttpRequestPool exception
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5.3);
+checkmin("5.2.5");
 checkcls('HttpRequestPool');
 ?>
 --FILE--

diff --git a/tests/HttpRequest_001.phpt b/tests/HttpRequest_001.phpt
index ddb0a43426b12d1765cf92bf1c4c689d79e42dd5..5ef2d9d7fb59da5782ac0bd395e9999ba9385339 100644 (file)
--- a/tests/HttpRequest_001.phpt
+++ b/tests/HttpRequest_001.phpt
@@ -3,7 +3,7 @@ HttpRequest options
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5.3);
+checkmin("5.2.5");
 checkcls('HttpRequest');
 ?>
 --FILE--

diff --git a/tests/HttpRequest_002.phpt b/tests/HttpRequest_002.phpt
index 6ad0ceddacdad3b0759f4faa346ca80281282753..b00c649e9f59863a122937ed8a17eb9fd8b81c92 100644 (file)
--- a/tests/HttpRequest_002.phpt
+++ b/tests/HttpRequest_002.phpt
@@ -3,7 +3,7 @@ HttpRequest GET/POST
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5.3);
+checkmin("5.2.5");
 checkcls('HttpRequest');
 checkurl('www.google.com');
 checkurl('dev.iworks.at');

diff --git a/tests/HttpRequest_003.phpt b/tests/HttpRequest_003.phpt
index 879b42b87fd71e2ecb536ca4429ff015557c4de7..0f148a0ec6a9587d51c9149f2920edea619c96ec 100644 (file)
--- a/tests/HttpRequest_003.phpt
+++ b/tests/HttpRequest_003.phpt
@@ -3,7 +3,7 @@ HttpRequest SSL
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5.3);
+checkmin("5.2.5");
 checkurl('arweb.info');
 skipif(!http_support(HTTP_SUPPORT_SSLREQUESTS), 'need ssl-request support')
 ?>

diff --git a/tests/HttpRequest_006.phpt b/tests/HttpRequest_006.phpt
index 114d0b07369c7a9f56e49a047f59890a9a970cb5..44afcdeb7510e44aab1484b17acbb49827c04a18 100644 (file)
--- a/tests/HttpRequest_006.phpt
+++ b/tests/HttpRequest_006.phpt
@@ -25,7 +25,7 @@ object(HttpMessage)#%d (%d) {
   ["type:protected"]=>
   int(2)
   ["body:protected"]=>
-  string(309) "string(294) "<?xml version="1.0" encoding="iso-8859-1"?>
+  string(309) "string(294) "<?xml version="1.0" encoding="iso-8859-1%s]>
 <methodCall>
 <methodName>testMethod</methodName>
 <params>
@@ -66,7 +66,7 @@ object(HttpMessage)#%d (%d) {
   ["type:protected"]=>
   int(2)
   ["body:protected"]=>
-  string(309) "string(294) "<?xml version="1.0" encoding="iso-8859-1"?>
+  string(309) "string(294) "<?xml version="1.0" encoding="iso-8859-1%s]>
 <methodCall>
 <methodName>testMethod</methodName>
 <params>
@@ -107,7 +107,7 @@ object(HttpMessage)#%d (%d) {
   ["type:protected"]=>
   int(2)
   ["body:protected"]=>
-  string(309) "string(294) "<?xml version="1.0" encoding="iso-8859-1"?>
+  string(309) "string(294) "<?xml version="1.0" encoding="iso-8859-1%s]>
 <methodCall>
 <methodName>testMethod</methodName>
 <params>

diff --git a/tests/HttpRequest_010.phpt b/tests/HttpRequest_010.phpt
index 292cc1f02538daa40654c33277077301a5ca9e57..ed3ca710d12d62318b0ab31750334d086e699536 100644 (file)
--- a/tests/HttpRequest_010.phpt
+++ b/tests/HttpRequest_010.phpt
@@ -3,7 +3,7 @@ HttpRequest cookie API
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5.3);
+checkmin("5.2.5");
 checkcls("HttpRequest");
 ?>
 --FILE--

diff --git a/tests/HttpResponse_001.phpt b/tests/HttpResponse_001.phpt
index 8d2417dd263694a2fa6709c0581f3b261b8d6e98..58fcf213b01f77b9e0bd211ed81463fb3d9e792d 100644 (file)
--- a/tests/HttpResponse_001.phpt
+++ b/tests/HttpResponse_001.phpt
@@ -3,7 +3,7 @@ HttpResponse - send data with caching headers
 --SKIPIF--
 <?php 
 include 'skip.inc';
-checkmin(5.3);
+checkmin("5.2.5");
 checkcgi();
 ?>
 --FILE--

diff --git a/tests/HttpResponse_002.phpt b/tests/HttpResponse_002.phpt
index 584f4a78e9b5ac3498bd9f4026f47fc9a5a337fa..bbfa30f161826ca97998acd45a9792e771477b9a 100644 (file)
--- a/tests/HttpResponse_002.phpt
+++ b/tests/HttpResponse_002.phpt
@@ -3,7 +3,7 @@ HttpResponse - send gzipped file
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5.3);
+checkmin("5.2.5");
 checkcgi();
 skipif(!http_support(HTTP_SUPPORT_ENCODINGS), "need zlib support");
 ?>

diff --git a/tests/HttpResponse_003.phpt b/tests/HttpResponse_003.phpt
index 8a45f47970845e526978b6ba068a75e9d0219a3a..e128865e9235d145af65e01347c412041c2e5d74 100644 (file)
--- a/tests/HttpResponse_003.phpt
+++ b/tests/HttpResponse_003.phpt
@@ -3,7 +3,7 @@ HttpResponse - send gzipped file with caching headers
 --SKIPIF--
 <?php 
 include 'skip.inc';
-checkmin(5.3);
+checkmin("5.2.5");
 checkcgi();
 skipif(!http_support(HTTP_SUPPORT_ENCODINGS), "need zlib support");
 ?>

diff --git a/tests/HttpResponse_004.phpt b/tests/HttpResponse_004.phpt
index d8d02f9cbc431d27de3f03e011d1d48f9f923d3d..88b788477954b8ef007b70a713d3bda006597165 100644 (file)
--- a/tests/HttpResponse_004.phpt
+++ b/tests/HttpResponse_004.phpt
@@ -4,7 +4,7 @@ HttpResponse - send cached gzipped data
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 skipif(!http_support(HTTP_SUPPORT_ENCODINGS), "need zlib support");
 ?>
 --ENV--

diff --git a/tests/HttpResponse_005.phpt b/tests/HttpResponse_005.phpt
index afa768c8f5b568099442546be8a3ef63e25e8061..bda3aa6493ac1cedac06455756b5a3c14cdb03c0 100644 (file)
--- a/tests/HttpResponse_005.phpt
+++ b/tests/HttpResponse_005.phpt
@@ -4,7 +4,7 @@ HttpResponse file not found
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --FILE--
 <?php

diff --git a/tests/allowed_methods_002.phpt b/tests/allowed_methods_002.phpt
index 99d0c61c8e9f66706d513b75069c132cbedf18e0..993f92e59f1b9cb27afa72530a2af277154856af 100644 (file)
--- a/tests/allowed_methods_002.phpt
+++ b/tests/allowed_methods_002.phpt
@@ -4,7 +4,7 @@ allowed methods
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --FILE--
 <?php

diff --git a/tests/allowed_methods_002_logging.phpt b/tests/allowed_methods_002_logging.phpt
index 6edbb6c76b43799c061add014554c8640edb1239..53a2b81f678aef777f6c1d7c3fbc6b07a8d9cbb4 100644 (file)
--- a/tests/allowed_methods_002_logging.phpt
+++ b/tests/allowed_methods_002_logging.phpt
@@ -4,7 +4,7 @@ logging allowed methods
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --ENV--
 HTTP_HOST=example.com

diff --git a/tests/build_url_003.phpt b/tests/build_url_003.phpt
index 1e552904910c217e254e6686928bc64ebbc12b3b..1736ca6e3b45c77a0b683ea5765dcf25f836cb22 100644 (file)
--- a/tests/build_url_003.phpt
+++ b/tests/build_url_003.phpt
@@ -3,7 +3,7 @@ http_build_url()
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --ENV--
 HTTP_HOST=www.example.com

diff --git a/tests/build_url_004.phpt b/tests/build_url_004.phpt
index f518f7bc5db9facdc0d707762ebf3fc21fd55815..1db54a8f1ae97faf08c52586adc2e7c32e2312c0 100644 (file)
--- a/tests/build_url_004.phpt
+++ b/tests/build_url_004.phpt
@@ -19,4 +19,4 @@ http://www.example.com/foo/baz
 http://www.example.com/foo/baz
 http://mike@www.example.com/foo/baz
 http://www.example.com/?a%5B0%5D=1&a%5B1%5D=b&b=c
-Done
\ No newline at end of file
+Done

diff --git a/tests/cloning_001.phpt b/tests/cloning_001.phpt
index 20c8fe68753268d115b4ad38fa3dea806b13177b..9d26682bef3f2b6564c805e6ae87d0fd6a7ed1f8 100644 (file)
--- a/tests/cloning_001.phpt
+++ b/tests/cloning_001.phpt
@@ -3,7 +3,7 @@ cloning
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5.3);
+checkmin("5.2.5");
 checkcls('HttpRequest');
 ?>
 --FILE--

diff --git a/tests/etag_mode_031.phpt b/tests/etag_mode_031.phpt
index 43a0c1a15904e9f98fd8d4ca4a5c1fdb427f7fad..5f7233836993bfd971e3614d5e52e2000e76e710 100644 (file)
--- a/tests/etag_mode_031.phpt
+++ b/tests/etag_mode_031.phpt
@@ -4,7 +4,7 @@ crc32 etag (may fail because PHPs crc32 is actually crc32b)
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --FILE--
 <?php

diff --git a/tests/etag_mode_032.phpt b/tests/etag_mode_032.phpt
index 2f2c6436e591b0dbc421768a1a3c35feb25d097c..cfb5c35510601c4d59398981d5b6df2c1d02a6f0 100644 (file)
--- a/tests/etag_mode_032.phpt
+++ b/tests/etag_mode_032.phpt
@@ -4,7 +4,7 @@ sha1 etag
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --FILE--
 <?php

diff --git a/tests/etag_mode_033.phpt b/tests/etag_mode_033.phpt
index 4842a83eecf3079339818c525b518a0233b9c2c9..c39cc658237f37ee9ae9bd9ef143c1df6c1b19a5 100644 (file)
--- a/tests/etag_mode_033.phpt
+++ b/tests/etag_mode_033.phpt
@@ -4,7 +4,7 @@ md5 etag
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --FILE--
 <?php

diff --git a/tests/etag_mode_034.phpt b/tests/etag_mode_034.phpt
index 6416a4801dc7305aff21f42cabb9d046f1a0b04b..f97bda931c6221dd1697afc347ce6da9c4f3a40c 100644 (file)
--- a/tests/etag_mode_034.phpt
+++ b/tests/etag_mode_034.phpt
@@ -4,7 +4,7 @@ ext/hash etag
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 skipif(!extension_loaded('hash'), 'need ext/hash support');
 ?>
 --FILE--

diff --git a/tests/etag_mode_041.phpt b/tests/etag_mode_041.phpt
index e1f8a5f850e0ef2f1da5fc1072d340568716938a..0834ede6e139cf5f89cfe8d6039c90508063a02e 100644 (file)
--- a/tests/etag_mode_041.phpt
+++ b/tests/etag_mode_041.phpt
@@ -4,7 +4,7 @@ ob crc32 etag (may fail because PHPs crc32 is actually crc32b)
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --FILE--
 <?php

diff --git a/tests/etag_mode_042.phpt b/tests/etag_mode_042.phpt
index 843e636e84aeb4d781c2cd4a0a8678fba60ca1f4..1d74254079179c7baab0c467b4d60aa2ff2666b9 100644 (file)
--- a/tests/etag_mode_042.phpt
+++ b/tests/etag_mode_042.phpt
@@ -4,7 +4,7 @@ ob sha1 etag
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --FILE--
 <?php

diff --git a/tests/etag_mode_043.phpt b/tests/etag_mode_043.phpt
index 303312b416b07a78dc86a1aacdb1b294655b685f..98777e167bf56440491b563ef88db9780731488e 100644 (file)
--- a/tests/etag_mode_043.phpt
+++ b/tests/etag_mode_043.phpt
@@ -4,7 +4,7 @@ ob md5 etag
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --FILE--
 <?php

diff --git a/tests/etag_mode_044.phpt b/tests/etag_mode_044.phpt
index faf4bf1f25e83dd352071f1a6d6db0354e86bdec..6992860fb78983caf3e32eb4b34c6bb001c6251d 100644 (file)
--- a/tests/etag_mode_044.phpt
+++ b/tests/etag_mode_044.phpt
@@ -4,7 +4,7 @@ ob ext/hash etag
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 skipif(!extension_loaded('hash'), 'need ext/hash support');
 ?>
 --FILE--

diff --git a/tests/exceptions.phpt b/tests/exceptions.phpt
index c99461fbddeecb789ac8b65317909cbc998a95b0..fdda3f3b35edf8ddb3fbeb1662d70cd8a28730c8 100644 (file)
--- a/tests/exceptions.phpt
+++ b/tests/exceptions.phpt
@@ -3,7 +3,7 @@ exceptions
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --FILE--
 <?php

diff --git a/tests/match_request_header_001.phpt b/tests/match_request_header_001.phpt
index 7c1c2b7bfbea1a8ab9a1ebd02dc039160404c7f5..34aa3c2dfa6d536339567c520ea1467e5b45a956 100644 (file)
--- a/tests/match_request_header_001.phpt
+++ b/tests/match_request_header_001.phpt
@@ -3,7 +3,7 @@ http_match_request_header()
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --ENV--
 HTTP_FOO=bar

diff --git a/tests/negotiation_001.phpt b/tests/negotiation_001.phpt
index 9cf99365b50c45072e2a5e5ae3e8e231b19594b0..3c2a6d0b2e9c8d4698be647a09d0a409eda5499b 100644 (file)
--- a/tests/negotiation_001.phpt
+++ b/tests/negotiation_001.phpt
@@ -3,7 +3,7 @@ negotiation
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --ENV--
 HTTP_ACCEPT=application/xml, application/xhtml+xml, text/html ; q = .8

diff --git a/tests/ob_deflatehandler_001.phpt b/tests/ob_deflatehandler_001.phpt
index bd41dcdb8083f2bd4616c8bfa34cbc40639312c2..bed680385079d1a003bbdebac2eed50a1a73f779 100644 (file)
--- a/tests/ob_deflatehandler_001.phpt
+++ b/tests/ob_deflatehandler_001.phpt
@@ -4,7 +4,7 @@ ob_deflatehandler
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 skipif(!http_support(HTTP_SUPPORT_ENCODINGS), "need zlib");
 ?>
 --ENV--

diff --git a/tests/parse_cookie_002.phpt b/tests/parse_cookie_002.phpt
index b4179227cee657e2aeda495eeaaeed4f12317b8e..220f4e91f3d79a1b7b59b3089526a8da952d4cbc 100644 (file)
--- a/tests/parse_cookie_002.phpt
+++ b/tests/parse_cookie_002.phpt
@@ -3,7 +3,7 @@ parse cookie
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --FILE--
 <?php

diff --git a/tests/persistent_handles_002.phpt b/tests/persistent_handles_002.phpt
index afaad11b9447945d01b644be3b55b494f744ca46..5b5d28cf60af23c4f0e40525077284a7b9d760f3 100644 (file)
--- a/tests/persistent_handles_002.phpt
+++ b/tests/persistent_handles_002.phpt
@@ -3,7 +3,7 @@ persistent handles
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5.3);
+checkmin("5.2.5");
 skipif(!http_support(HTTP_SUPPORT_REQUESTS), "need request support");
 skipif(function_exists('zend_thread_id'), "need non-ZTS build");
 ?>

diff --git a/tests/redirect_011.phpt b/tests/redirect_011.phpt
index e30fed04d5ec554423202d1c6251fd76fe6146b8..70a0262134a973b248b3d12682abca577e082d5e 100644 (file)
--- a/tests/redirect_011.phpt
+++ b/tests/redirect_011.phpt
@@ -4,7 +4,7 @@ http_redirect() with params
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --ENV--
 HTTP_HOST=localhost

diff --git a/tests/redirect_011_logging.phpt b/tests/redirect_011_logging.phpt
index 22eada52da3f5dfeb2077b0ed950b0e44785841f..2735172f23504e54c0d7c6c5824f7009056b46bd 100644 (file)
--- a/tests/redirect_011_logging.phpt
+++ b/tests/redirect_011_logging.phpt
@@ -4,7 +4,7 @@ logging redirects
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --ENV--
 HTTP_HOST=example.com

diff --git a/tests/redirect_012.phpt b/tests/redirect_012.phpt
index 620b679cafb0daed63dcbe8101c4263def2216e2..977b593727e0c0b3b49db495a03c6dc5fc0cc623 100644 (file)
--- a/tests/redirect_012.phpt
+++ b/tests/redirect_012.phpt
@@ -4,7 +4,7 @@ http_redirect() with session
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 checkext('session');
 ?>
 --ENV--

diff --git a/tests/redirect_012_logging.phpt b/tests/redirect_012_logging.phpt
index 22eada52da3f5dfeb2077b0ed950b0e44785841f..2735172f23504e54c0d7c6c5824f7009056b46bd 100644 (file)
--- a/tests/redirect_012_logging.phpt
+++ b/tests/redirect_012_logging.phpt
@@ -4,7 +4,7 @@ logging redirects
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --ENV--
 HTTP_HOST=example.com

diff --git a/tests/redirect_013.phpt b/tests/redirect_013.phpt
index f8bec1772ab2d87d8197b4a078362ae0201853d4..fb14140eaf0c24e6fe13109de9e1d72713470179 100644 (file)
--- a/tests/redirect_013.phpt
+++ b/tests/redirect_013.phpt
@@ -4,7 +4,7 @@ http_redirect() permanent
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --ENV--
 HTTP_HOST=localhost

diff --git a/tests/redirect_013_logging.phpt b/tests/redirect_013_logging.phpt
index c8f77ac01931690799e9ceaf4eeb150273ec4a93..b2623bf614a983b837591460df7dcae251622257 100644 (file)
--- a/tests/redirect_013_logging.phpt
+++ b/tests/redirect_013_logging.phpt
@@ -4,7 +4,7 @@ logging redirects
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --ENV--
 HTTP_HOST=example.com

diff --git a/tests/send_data_001.phpt b/tests/send_data_001.phpt
index 2aadc8e3a790026a8c29609735a4f8eb8ede7b8f..d744d8d5169d3eaedf97696f36a6370600ee04ff 100644 (file)
--- a/tests/send_data_001.phpt
+++ b/tests/send_data_001.phpt
@@ -4,7 +4,7 @@ http_send_data() NIL-NUM range
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --ENV--
 HTTP_RANGE=bytes=-5

diff --git a/tests/send_data_002.phpt b/tests/send_data_002.phpt
index 8b9dd690274cebeb295eb802b360a2e5a051f505..1dc775b428bb2dce8e867b93deca73395a6717a3 100644 (file)
--- a/tests/send_data_002.phpt
+++ b/tests/send_data_002.phpt
@@ -4,7 +4,7 @@ http_send_data() NUM-NUM range
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --ENV--
 HTTP_RANGE=bytes=5-6

diff --git a/tests/send_data_003.phpt b/tests/send_data_003.phpt
index 1fd8561e32fd54d24cb75120477a378d23b8e14a..f47c38d8f5bed5bd2b32ac552c57179a6de864c1 100644 (file)
--- a/tests/send_data_003.phpt
+++ b/tests/send_data_003.phpt
@@ -4,7 +4,7 @@ http_send_data() NUM-NIL range
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --ENV--
 HTTP_RANGE=bytes=5981-

diff --git a/tests/send_data_005.phpt b/tests/send_data_005.phpt
index 2e16105672ffed71d29be50eafbf0a3b87cf5138..c373b105fb0d4326463e36e6b7b61b0001c76298 100644 (file)
--- a/tests/send_data_005.phpt
+++ b/tests/send_data_005.phpt
@@ -4,7 +4,7 @@ http_send_data() oversized range
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --ENV--
 HTTP_RANGE=bytes=5990-6000

diff --git a/tests/send_data_006.phpt b/tests/send_data_006.phpt
index 3112c46f905b3e15d9c4262c4fdde40ab0bab802..418d4f0a5357855e86486fffefd9f330e7c521c6 100644 (file)
--- a/tests/send_data_006.phpt
+++ b/tests/send_data_006.phpt
@@ -4,7 +4,7 @@ http_send_data() multiple ranges
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --ENV--
 HTTP_RANGE=bytes=0-3, 4-5,9-11

diff --git a/tests/send_data_007.phpt b/tests/send_data_007.phpt
index 3aa94c1317e201304789e718b8334cd1adc461fb..e82fa83cb3806c4f5942d008ca8fdb9f1c28992e 100644 (file)
--- a/tests/send_data_007.phpt
+++ b/tests/send_data_007.phpt
@@ -4,7 +4,7 @@ http_send_data() NIL-NIL range
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --ENV--
 HTTP_RANGE=bytes=0-0

diff --git a/tests/send_data_008.phpt b/tests/send_data_008.phpt
index bf8abb77601ed666c2f1fd936fcc024eacbd5034..3a695636cb7601c2b94cf45d5801d95e43f9b0b4 100644 (file)
--- a/tests/send_data_008.phpt
+++ b/tests/send_data_008.phpt
@@ -4,7 +4,7 @@ http_send_data() multiple ranges
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --ENV--
 HTTP_RANGE=bytes=0-0,-1

diff --git a/tests/send_file_005.phpt b/tests/send_file_005.phpt
index 7cecd6df9479516d654e75cf71528815e7567c31..51f6b8fed2d06c216259cc81f6a65fb8c5d5a448 100644 (file)
--- a/tests/send_file_005.phpt
+++ b/tests/send_file_005.phpt
@@ -4,7 +4,7 @@ http_send_file() multiple ranges
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --ENV--
 HTTP_RANGE=bytes=0-3, 4-5,9-11

diff --git a/tests/send_file_006.phpt b/tests/send_file_006.phpt
index c3eceb01e6fd328ab543fb254326e57d82b9e5ca..1b9331969a1608e1b41c24c0c7d98b3154c0a9aa 100644 (file)
--- a/tests/send_file_006.phpt
+++ b/tests/send_file_006.phpt
@@ -4,7 +4,7 @@ http_send_file() first/last byte range
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --ENV--
 HTTP_RANGE=bytes=0-0,-1

diff --git a/tests/send_file_007.phpt b/tests/send_file_007.phpt
index eb6452dc446e6230252ad7c0122bc0215c1be650..09f11671d416f9b55843e641944253d3584f2fca 100644 (file)
--- a/tests/send_file_007.phpt
+++ b/tests/send_file_007.phpt
@@ -4,7 +4,7 @@ http_send_file() NIL-NIL range
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --ENV--
 HTTP_RANGE=bytes=0-0

diff --git a/tests/send_file_009.phpt b/tests/send_file_009.phpt
index bf539014f7dd1e9371977fd34471f2184d550f18..2d360b005b4bc58f76526eb9b232726e69690d63 100644 (file)
--- a/tests/send_file_009.phpt
+++ b/tests/send_file_009.phpt
@@ -4,7 +4,7 @@ http_send_file() NUM-NUM range
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --ENV--
 HTTP_RANGE=bytes=5-9

diff --git a/tests/send_file_010.phpt b/tests/send_file_010.phpt
index 31935c53656851aaa53b42334845bd8f5cfc0736..d0f4318e2fceb99e681daf539cd34bb4918617df 100644 (file)
--- a/tests/send_file_010.phpt
+++ b/tests/send_file_010.phpt
@@ -4,7 +4,7 @@ http_send_file() NIL-NUM range
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --ENV--
 HTTP_RANGE=bytes=-9

diff --git a/tests/send_file_011.phpt b/tests/send_file_011.phpt
index 99b43888a8336bf194b19c9621e37b1bf31f06e0..8444a7d1f0d78596f976d69bf2215a2db14d9192 100644 (file)
--- a/tests/send_file_011.phpt
+++ b/tests/send_file_011.phpt
@@ -4,7 +4,7 @@ http_send_file() NUM-NIL range
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --ENV--
 HTTP_RANGE=bytes=1000- 

diff --git a/tests/send_file_013.phpt b/tests/send_file_013.phpt
index 4de94b4d5f10d03cf8269190fcdede19c06cd2e3..cd3f3cba9cb9447aec8b3105bb247c0823934d09 100644 (file)
--- a/tests/send_file_013.phpt
+++ b/tests/send_file_013.phpt
@@ -4,7 +4,7 @@ http_send_file() oversized range
 <?php 
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --ENV--
 HTTP_RANGE=bytes=-1111

diff --git a/tests/send_ifrange_001.phpt b/tests/send_ifrange_001.phpt
index b4aae05da53a79682b48eaf9b593a08ddf6eb653..40185ac7cb39b1c153c1b2caadd460d0d257d0c7 100644 (file)
--- a/tests/send_ifrange_001.phpt
+++ b/tests/send_ifrange_001.phpt
@@ -4,7 +4,7 @@ http_send() If-Range
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --ENV--
 HTTP_RANGE=bytes=0-1

diff --git a/tests/send_ifrange_003.phpt b/tests/send_ifrange_003.phpt
index df97814af9b393024739acd2c532530c86834218..226c72f3d251ea068d0185809f7202b98a4f64a7 100644 (file)
--- a/tests/send_ifrange_003.phpt
+++ b/tests/send_ifrange_003.phpt
@@ -4,7 +4,7 @@ http_send() If-Range
 <?php
 include 'skip.inc';
 checkcgi();
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --ENV--
 HTTP_RANGE=bytes=0-1

diff --git a/tests/skip.inc b/tests/skip.inc
index 63ae05cff423c3f4f13a78d403a6a18d92966f4a..d8770fb1fda6f405e690ddd3ab22f489a6352c06 100644 (file)
--- a/tests/skip.inc
+++ b/tests/skip.inc
@@ -6,8 +6,8 @@ if (!function_exists('fprintf')) {
 function skipif($if, $skip) { if ($if) { fprintf(STDOUT, "skip $skip"); exit(); }}
 function checkcgi() { skipif(!strncasecmp('CLI', PHP_SAPI, 3), 'need CGI SAPI'); }
 function checkext($ext) { skipif(!extension_loaded($ext), "need ext/$ext"); }
-function checkmin($ver) { skipif(round($ver,1) > round((double) PHP_VERSION,1), sprintf("need PHP >= v%0.1f",$ver)); }
-function checkmax($ver) { skipif(round($ver,1) < round((double) PHP_VERSION,1), sprintf("need PHP <= v%0.1f",$ver)); }
+function checkmin($ver) { skipif(version_compare(PHP_VERSION, $ver) < 0, sprintf("need PHP >= v%s",$ver)); }
+function checkmax($ver) { skipif(version_compare(PHP_VERSION, $ver) > 0, sprintf("need PHP <= v%s",$ver)); }
 function checkurl($url) { skipif(!@fsockopen($url, 80), "$url not responsive"); }
 function checkcls($cls) { skipif(!class_exists($cls), "need class $cls"); }
 function checkver($ver) { checkmin($ver); }

diff --git a/tests/stream_filters_001.phpt b/tests/stream_filters_001.phpt
index 56e522837d1846296f365520ec82b3e56f5de9eb..7a3ec69908c0cc0d4c394ceafb79061502edbdfd 100644 (file)
--- a/tests/stream_filters_001.phpt
+++ b/tests/stream_filters_001.phpt
@@ -3,7 +3,7 @@ stream filters
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5.3);
+checkmin("5.2.5");
 ?>
 --FILE--
 <?php

diff --git a/tests/stream_filters_003.phpt b/tests/stream_filters_003.phpt
index 145ec1537735f42c7491e4b57d03e9d88363f966..2cf81028c32de2f9e51fd08c8f51fd7f42365403 100644 (file)
--- a/tests/stream_filters_003.phpt
+++ b/tests/stream_filters_003.phpt
@@ -3,7 +3,7 @@ stream filter fun
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkmin(5.3);
+checkmin("5.2.5");
 skipif(!http_support(HTTP_SUPPORT_ENCODINGS), "need zlib");
 ?>
 --FILE--