3 files changed, 13 insertions, 13 deletions

diff --git a/Tests/Auth/OpenID/Consumer.php b/Tests/Auth/OpenID/Consumer.php
index 4ab9c7e..f14bd9a 100644
--- a/Tests/Auth/OpenID/Consumer.php
+++ b/Tests/Auth/OpenID/Consumer.php
@@ -70,7 +70,7 @@ function Auth_OpenID_associate($qs, $assoc_secret, $assoc_handle)
 
     $reply_dict = array_merge($reply_dict, $dh_args);
 
-    return Auth_OpenID_arrayToKV($reply_dict);
+    return Auth_OpenID_KVForm::fromArray($reply_dict);
 }
 
 class Auth_OpenID_TestFetcher extends Auth_OpenID_HTTPFetcher {
diff --git a/Tests/Auth/OpenID/KVForm.php b/Tests/Auth/OpenID/KVForm.php
index c32d661..d6bcc71 100644
--- a/Tests/Auth/OpenID/KVForm.php
+++ b/Tests/Auth/OpenID/KVForm.php
@@ -68,8 +68,8 @@ extends Tests_Auth_OpenID_KVForm_TestCase {
     {
         // Do one parse, after which arrayToKV and kvToArray should be
         // inverses.
-        $parsed1 = Auth_OpenID_kvToArray($this->str);
-        $serial1 = Auth_OpenID_arrayToKV($this->arr);
+        $parsed1 = Auth_OpenID_KVForm::toArray($this->str);
+        $serial1 = Auth_OpenID_KVForm::fromArray($this->arr);
 
         if ($this->lossy == "neither" || $this->lossy == "str") {
             $this->assertEquals($this->arr, $parsed1, "str was lossy");
@@ -79,12 +79,12 @@ extends Tests_Auth_OpenID_KVForm_TestCase {
             $this->assertEquals($this->str, $serial1, "array was lossy");
         }
 
-        $parsed2 = Auth_OpenID_kvToArray($serial1);
-        $serial2 = Auth_OpenID_arrayToKV($parsed1);
+        $parsed2 = Auth_OpenID_KVForm::toArray($serial1);
+        $serial2 = Auth_OpenID_KVForm::fromArray($parsed1);
 
         // Round-trip both
-        $parsed3 = Auth_OpenID_kvToArray($serial2);
-        $serial3 = Auth_OpenID_arrayToKV($parsed2);
+        $parsed3 = Auth_OpenID_KVForm::toArray($serial2);
+        $serial3 = Auth_OpenID_KVForm::fromArray($parsed2);
 
         $this->assertEquals($serial2, $serial3, "serialized forms differ");
 
@@ -104,7 +104,7 @@ extends Tests_Auth_OpenID_KVForm_TestCase {
 
     function _runTest()
     {
-        $serialized = Auth_OpenID_arrayToKV($this->arr);
+        $serialized = Auth_OpenID_KVForm::fromArray($this->arr);
         $this->assertTrue($serialized === null,
                           'serialization unexpectedly succeeded');
     }
diff --git a/Tests/Auth/OpenID/Server.php b/Tests/Auth/OpenID/Server.php
index 7fbfeef..bc61386 100644
--- a/Tests/Auth/OpenID/Server.php
+++ b/Tests/Auth/OpenID/Server.php
@@ -96,7 +96,7 @@ class Tests_Auth_OpenID_Server extends PHPUnit_TestCase {
             $this->noauth, 'POST', $args);
 
         $this->assertEquals(Auth_OpenID_REMOTE_ERROR, $status);
-        $resultArgs = Auth_OpenID_kvToArray($info);
+        $resultArgs = Auth_OpenID_KVForm::toArray($info);
         $this->assertTrue(array_key_exists('error', $resultArgs));
     }
 
@@ -117,7 +117,7 @@ class Tests_Auth_OpenID_Server extends PHPUnit_TestCase {
         list($status, $info) = $this->server->associate(array());
 
         $this->assertEquals(Auth_OpenID_REMOTE_OK, $status);
-        $ra = Auth_OpenID_kvToArray($info);
+        $ra = Auth_OpenID_KVForm::toArray($info);
         $this->assertEquals('HMAC-SHA1', $ra['assoc_type']);
         $this->assertKeyAbsent('session_type', $ra);
         $this->assertKeyExists('assoc_handle', $ra);
@@ -137,7 +137,7 @@ class Tests_Auth_OpenID_Server extends PHPUnit_TestCase {
         list($status, $info) = $this->server->associate($args);
         $this->assertEquals(Auth_OpenID_REMOTE_OK, $status);
 
-        $ra = Auth_OpenID_kvToArray($info);
+        $ra = Auth_OpenID_KVForm::toArray($info);
         $this->assertEquals('HMAC-SHA1', $ra['assoc_type']);
         $this->assertEquals('DH-SHA1', $ra['session_type']);
         $this->assertKeyExists('assoc_handle', $ra);
@@ -156,7 +156,7 @@ class Tests_Auth_OpenID_Server extends PHPUnit_TestCase {
         list($status, $info) = $this->server->associate($args);
         if (defined('Auth_OpenID_NO_MATH_SUPPORT')) {
             $this->assertEquals(Auth_OpenID_REMOTE_OK, $status);
-            $ra = Auth_OpenID_kvToArray($info);
+            $ra = Auth_OpenID_KVForm::toArray($info);
             $this->assertEquals('HMAC-SHA1', $ra['assoc_type']);
             $this->assertKeyExists('assoc_handle', $ra);
             $this->assertKeyExists('mac_key', $ra);
@@ -164,7 +164,7 @@ class Tests_Auth_OpenID_Server extends PHPUnit_TestCase {
             $this->assertTrue($exp > 0);
         } else {
             $this->assertEquals(Auth_OpenID_REMOTE_ERROR, $status);
-            $ra = Auth_OpenID_kvToArray($info);
+            $ra = Auth_OpenID_KVForm::toArray($info);
             $this->assertKeyExists('error', $ra);
         }
     }