5.3->5.2.5

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

diff --git a/tests/HttpQueryString_001.phpt b/tests/HttpQueryString_001.phpt
index 31137dd48252ba07361bd4b32c39dede64a8259f..9958e1af05d06e27eec18e2f8ff521474d139337 100644 (file)
--- a/tests/HttpQueryString_001.phpt
+++ b/tests/HttpQueryString_001.phpt
@@ -3,7 +3,7 @@ HttpQueryString global
 --SKIPIF--
 <?php
 include 'skip.inc';
-checkver(5);
+checkmin("5.2.5");
 ?>
 --FILE--
 <?php
@@ -12,33 +12,33 @@ echo "-TEST\n";
 $_GET = array('a'=>'b','c'=>'3.4','r'=>array(1,2,3));
 $_SERVER['QUERY_STRING'] = 'a=b&c=3.4&r[0]=1&r[1]=2&r[2]=3';
 
-var_dump(HttpQueryString::getInstance()->get());
-var_dump(HttpQueryString::getInstance()->get('n'));
-var_dump(HttpQueryString::getInstance()->get('a'));
-var_dump(HttpQueryString::getInstance()->get('a', "i", 0, true));
-var_dump(HttpQueryString::getInstance()->get('a', "string", 'hi!'));
-var_dump(HttpQueryString::getInstance()->get('c'));
-var_dump(HttpQueryString::getInstance()->get('c', HttpQueryString::TYPE_INT));
-var_dump(HttpQueryString::getInstance()->get('c', HttpQueryString::TYPE_FLOAT));
-var_dump(HttpQueryString::getInstance()->get('c', HttpQueryString::TYPE_BOOL));
-var_dump(HttpQueryString::getInstance()->get('r'));
-var_dump(HttpQueryString::getInstance()->get('r', HttpQueryString::TYPE_ARRAY));
-var_dump(HttpQueryString::getInstance()->get('r', HttpQueryString::TYPE_OBJECT));
+var_dump(HttpQueryString::singleton()->get());
+var_dump(HttpQueryString::singleton()->get('n'));
+var_dump(HttpQueryString::singleton()->get('a'));
+var_dump(HttpQueryString::singleton()->get('a', "i", 0, true));
+var_dump(HttpQueryString::singleton()->get('a', "string", 'hi!'));
+var_dump(HttpQueryString::singleton()->get('c'));
+var_dump(HttpQueryString::singleton()->get('c', HttpQueryString::TYPE_INT));
+var_dump(HttpQueryString::singleton()->get('c', HttpQueryString::TYPE_FLOAT));
+var_dump(HttpQueryString::singleton()->get('c', HttpQueryString::TYPE_BOOL));
+var_dump(HttpQueryString::singleton()->get('r'));
+var_dump(HttpQueryString::singleton()->get('r', HttpQueryString::TYPE_ARRAY));
+var_dump(HttpQueryString::singleton()->get('r', HttpQueryString::TYPE_OBJECT));
 
-HttpQueryString::getInstance()->set('z[0]=2');
+HttpQueryString::singleton()->set(new HttpQueryString(false, 'z[0]=2'));
 
-HttpQueryString::getInstance()->set(array('a'=>'b', 'c'=> "3.4"));
-HttpQueryString::getInstance()->set(array('a' => NULL));
+HttpQueryString::singleton()->set(array('a'=>'b', 'c'=> "3.4"));
+HttpQueryString::singleton()->set(array('a' => NULL));
 
-var_dump(HttpQueryString::getInstance());
+var_dump(HttpQueryString::singleton());
 var_dump($_GET);
 var_dump($_SERVER['QUERY_STRING']);
 
 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)
@@ -72,7 +72,7 @@ object(stdClass)#%d (%d) {
   int(3)
 }
 object(HttpQueryString)#1 (2) {
-  ["queryArray:private"]=>
+  ["queryArray%sprivate%s]=>
   &array(3) {
     ["c"]=>
     string(3) "3.4"
@@ -91,8 +91,8 @@ object(HttpQueryString)#1 (2) {
       string(1) "2"
     }
   }
-  ["queryString:private"]=>
-  &string(33) "c=3.4&r[0]=1&r[1]=2&r[2]=3&z[0]=2"
+  ["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) {
   ["c"]=>
@@ -112,5 +112,5 @@ array(3) {
     string(1) "2"
   }
 }
-string(33) "c=3.4&r[0]=1&r[1]=2&r[2]=3&z[0]=2"
+string(49) "c=3.4&r%5B0%5D=1&r%5B1%5D=2&r%5B2%5D=3&z%5B0%5D=2"
 Done
\ No newline at end of file