new test for serialize, fix urlencoding of stuff that needs urlencoding

cellog · Jul 28, 2011 · 6ce41aa · 6ce41aa
1 parent f0dd303
commit 6ce41aa
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/Pyrus/JsonSchema/URI.php b/src/Pyrus/JsonSchema/URI.php
@@ -225,7 +225,7 @@ function utfCharToNumber($char) // from PHP manual comments on ord()
     function pctEncChar($matches)
     {
         $chr = $matches[0];
-        $c = $this->utfCharToNumber(dechex($chr[0]));
+        $c = $this->utfCharToNumber($chr);
 
         if ($c < 128) {
             return "%" . strtoupper(dechex($c));

diff --git a/tests/Pyrus/JsonSchema/URI/uri_serialize.phpt b/tests/Pyrus/JsonSchema/URI/uri_serialize.phpt
@@ -0,0 +1,18 @@
+--TEST--
+JsonSchema: URI - serialize
+--FILE--
+<?php
+require dirname(__FILE__) . '/setup.php.inc';
+$components = new Pyrus\JsonSchema\URI\Components;
+$components->scheme = '%http';
+$components->userinfo = 'babyface:boo';
+$components->host = 'far.example.com';
+$components->port = '8080';
+$components->path = '/hi.my.thingy/./there';
+$components->query = 'my=1&there=there';
+$components->fragment = '#';
+$test->assertEquals('http://babyface:[email protected]/hi.my.thingy/there?my=1&there=there#%23', $uri->serialize($components), 'serialize');
+?>
+===DONE===
+--EXPECT--
+===DONE===