fix tests

[m6w6/ext-http] / tests / HttpQueryString_002.phpt

diff --git a/tests/HttpQueryString_002.phpt b/tests/HttpQueryString_002.phpt
index 944f2a00c6a12785d590c41c75d41e0e0b132fcc..f70cbac4aa0b6123a3a72d5b2fe234d73b30336e 100644 (file)
--- a/tests/HttpQueryString_002.phpt
+++ b/tests/HttpQueryString_002.phpt
@@ -3,14 +3,13 @@ HttpQueryString local
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkver(5);
+checkmin("5.2.5");
 ?>
 --FILE--
 <?php
 echo "-TEST\n";
 
-$q = new HttpQueryString(false);
-$q->mod(array('a'=>'b','c'=>'3.4','r'=>array(1,2,3)));
+$q = new HttpQueryString(false, $array = array('a'=>'b','c'=>'3.4','r'=>array(1,2,3)));
 var_dump($q->get());
 var_dump($q->get('n'));
 var_dump($q->get('a'));
@@ -24,20 +23,18 @@ var_dump($q->get('r'));
 var_dump($q->get('r', HttpQueryString::TYPE_ARRAY));
 var_dump($q->get('r', HttpQueryString::TYPE_OBJECT));
 
-$q->set('z', array(2));
-
-$q->mod(array('a'=>'b', 'c'=> "3.4"));
-$q->del('a');
+$q->set('z[0]=2');
+$q->set(array('a'=>'b', 'c'=> "3.4"));
+$q->set(array('a' => NULL));
 
 var_dump($q);
-var_dump($_GET);
-var_dump($_SERVER['QUERY_STRING']);
+var_dump($array);
 
 echo "Done\n";
 ?>
 --EXPECTF--
-%sTEST
-string(30) "a=b&c=3.4&r[0]=1&r[1]=2&r[2]=3"
+%aTEST
+string(42) "a=b&c=3.4&r%5B0%5D=1&r%5B1%5D=2&r%5B2%5D=3"
 NULL
 string(1) "b"
 int(0)
@@ -71,7 +68,7 @@ object(stdClass)#%d (%d) {
   int(3)
 }
 object(HttpQueryString)#1 (2) {
-  ["queryArray:private"]=>
+  ["queryArray%s]=>
   array(3) {
     ["c"]=>
     string(3) "3.4"
@@ -87,13 +84,25 @@ object(HttpQueryString)#1 (2) {
     ["z"]=>
     array(1) {
       [0]=>
-      int(2)
+      string(1) "2"
     }
   }
-  ["queryString:private"]=>
-  string(33) "c=3.4&r[0]=1&r[1]=2&r[2]=3&z[0]=2"
+  ["queryString%s]=>
+  string(49) "c=3.4&r%5B0%5D=1&r%5B1%5D=2&r%5B2%5D=3&z%5B0%5D=2"
 }
-array(0) {
+array(3) {
+  ["a"]=>
+  string(1) "b"
+  ["c"]=>
+  string(3) "3.4"
+  ["r"]=>
+  array(3) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+  }
 }
-NULL
 Done
\ No newline at end of file