X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2FHttpQueryString_001.phpt;h=ec64eaddbddc13ecaacd1ba159d932276ddf8f66;hb=bcb27bf6556208cded77e37805852fc2585e8a9f;hp=162d49593af2c254fce577a22721c87f48e5d790;hpb=0ecd173659b63e77e47271e5bd521599cd9e500f;p=m6w6%2Fext-http

diff --git a/tests/HttpQueryString_001.phpt b/tests/HttpQueryString_001.phpt
index 162d495..ec64ead 100644
--- 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.1);
 ?>
 --FILE--
 <?php
@@ -12,25 +12,25 @@ 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(new HttpQueryString(false, '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']);
 
@@ -38,7 +38,7 @@ echo "Done\n";
 ?>
 --EXPECTF--
 %sTEST
-string(30) "a=b&c=3.4&r[0]=1&r[1]=2&r[2]=3"
+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)
@@ -92,7 +92,7 @@ object(HttpQueryString)#1 (2) {
     }
   }
   ["queryString:private"]=>
-  &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"
 }
 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