[project @ Remove KVForm class that was used for namespacing]

7 files changed, 82 insertions, 88 deletions

diff --git a/Auth/OpenID/Association.php b/Auth/OpenID/Association.php
index 07110b6..5fd967b 100644
--- a/Auth/OpenID/Association.php
+++ b/Auth/OpenID/Association.php
@@ -181,7 +181,7 @@ class Auth_OpenID_Association {
 
         assert(array_keys($data) == $this->assoc_keys);
 
-        return Auth_OpenID_KVForm::arrayToKV($data, $strict = true);
+        return Auth_OpenID_arrayToKV($data, $strict = true);
     }
 
     /**
@@ -193,7 +193,7 @@ class Auth_OpenID_Association {
      */
     function deserialize($class_name, $assoc_s)
     {
-        $pairs = Auth_OpenID_KVForm::kvToArray($assoc_s, $strict = true);
+        $pairs = Auth_OpenID_kvToArray($assoc_s, $strict = true);
         $keys = array();
         $values = array();
         foreach ($pairs as $key => $value) {
@@ -238,7 +238,7 @@ class Auth_OpenID_Association {
      */
     function sign($pairs)
     {
-        $kv = Auth_OpenID_KVForm::arrayToKV($pairs);
+        $kv = Auth_OpenID_arrayToKV($pairs);
         return Auth_OpenID_HMACSHA1($this->secret, $kv);
     }
 
diff --git a/Auth/OpenID/Consumer/Consumer.php b/Auth/OpenID/Consumer/Consumer.php
index d9170a9..7ac2066 100644
--- a/Auth/OpenID/Consumer/Consumer.php
+++ b/Auth/OpenID/Consumer/Consumer.php
@@ -650,7 +650,7 @@ class Auth_OpenID_Consumer {
             return Auth_OpenID_FAILURE;
         }
 
-        $results = Auth_OpenID_KVForm::kvToArray($ret[2]);
+        $results = Auth_OpenID_kvToArray($ret[2]);
         $is_valid = Auth_OpenID_array_get($results, 'is_valid', 'false');
 
         if ($is_valid == 'true') {
@@ -834,7 +834,7 @@ class Auth_OpenID_Consumer {
         }
 
         list($http_code, $url, $data) = $ret;
-        $results = Auth_OpenID_KVForm::kvToArray($data);
+        $results = Auth_OpenID_kvToArray($data);
         if ($http_code == 400) {
             $server_error = Auth_OpenID_array_get($results, 'error',
                                                  '<no message from server>');
@@ -848,7 +848,7 @@ class Auth_OpenID_Consumer {
             return null;
         }
 
-        $results = Auth_OpenID_KVForm::kvToArray($data);
+        $results = Auth_OpenID_kvToArray($data);
 
         return $this->_parseAssociation($results, $dh, $server_url);
     }
diff --git a/Auth/OpenID/KVForm.php b/Auth/OpenID/KVForm.php
index 1b690e5..36d3484 100644
--- a/Auth/OpenID/KVForm.php
+++ b/Auth/OpenID/KVForm.php
@@ -14,89 +14,83 @@
  */
 
 /**
- * The Auth_OpenID_KVForm class.
- *
- * @package OpenID
+ * @access private
  */
-class Auth_OpenID_KVForm {
-    function arrayToKV($values)
-    {
-        if ($values === null) {
+function Auth_OpenID_arrayToKV($values)
+{
+    if ($values === null) {
+        return null;
+    }
+
+    $serialized = '';
+    foreach ($values as $key => $value) {
+        if (is_array($value)) {
+            list($key, $value) = $value;
+        }
+
+        if (strpos($key, ':') !== false) {
+            trigger_error('":" in key:' . addslashes($key), E_USER_WARNING);
             return null;
         }
 
-        $serialized = '';
-        foreach ($values as $key => $value) {
-            if (is_array($value)) {
-                list($key, $value) = $value;
-            }
+        if (strpos($key, "\n") !== false) {
+            trigger_error('"\n" in key:' . addslashes($key), E_USER_WARNING);
+            return null;
+        }
 
-            if (strpos($key, ':') !== false) {
-                trigger_error('":" in key:' . addslashes($key),
-                              E_USER_WARNING);
-                return null;
-            }
+        if (strpos($value, "\n") !== false) {
+            trigger_error('"\n" in value:' . addslashes($value),
+                          E_USER_WARNING);
+            return null;
+        }
+        $serialized .= "$key:$value\n";
+    }
+    return $serialized;
+}
 
-            if (strpos($key, "\n") !== false) {
-                trigger_error('"\n" in key:' . addslashes($key),
-                              E_USER_WARNING);
-                return null;
-            }
+function Auth_OpenID_kvToArray($kvs)
+{
+    $lines = explode("\n", $kvs);
 
-            if (strpos($value, "\n") !== false) {
-                trigger_error('"\n" in value:' . addslashes($value),
-                              E_USER_WARNING);
-                return null;
-            }
-            $serialized .= "$key:$value\n";
-        }
-        return $serialized;
+    $last = array_pop($lines);
+    if ($last !== '') {
+        trigger_error('No newline at end of kv string:' . addslashes($kvs),
+                      E_USER_WARNING);
+        array_push($lines, $last);
     }
 
-    function kvToArray($kvs)
-    {
-        $lines = explode("\n", $kvs);
+    $values = array();
 
-        $last = array_pop($lines);
-        if ($last !== '') {
-            trigger_error('No newline at end of kv string:' . addslashes($kvs),
+    for ($lineno = 0; $lineno < count($lines); $lineno++) {
+        $line = $lines[$lineno];
+        $kv = explode(':', $line, 2);
+        if (count($kv) != 2) {
+            $esc = addslashes($line);
+            trigger_error("No colon on line $lineno: $esc",
                           E_USER_WARNING);
-            array_push($lines, $last);
+            continue;
         }
 
-        $values = array();
-
-        for ($lineno = 0; $lineno < count($lines); $lineno++) {
-            $line = $lines[$lineno];
-            $kv = explode(':', $line, 2);
-            if (count($kv) != 2) {
-                $esc = addslashes($line);
-                trigger_error("No colon on line $lineno: $esc",
-                              E_USER_WARNING);
-                continue;
-            }
-
-            $key = $kv[0];
-            $tkey = trim($key);
-            if ($tkey != $key) {
-                $esc = addslashes($key);
-                trigger_error("Whitespace in key on line $lineno: '$esc'",
-                              E_USER_WARNING);
-            }
-
-            $value = $kv[1];
-            $tval = trim($value);
-            if ($tval != $value) {
-                $esc = addslashes($value);
-                trigger_error("Whitespace in value on line $lineno: '$esc'",
-                              E_USER_WARNING);
-            }
+        $key = $kv[0];
+        $tkey = trim($key);
+        if ($tkey != $key) {
+            $esc = addslashes($key);
+            trigger_error("Whitespace in key on line $lineno: '$esc'",
+                          E_USER_WARNING);
+        }
 
-            $values[$tkey] = $tval;
+        $value = $kv[1];
+        $tval = trim($value);
+        if ($tval != $value) {
+            $esc = addslashes($value);
+            trigger_error("Whitespace in value on line $lineno: '$esc'",
+                          E_USER_WARNING);
         }
 
-        return $values;
+        $values[$tkey] = $tval;
     }
+
+    return $values;
 }
 
 ?>
\ No newline at end of file
diff --git a/Auth/OpenID/Server.php b/Auth/OpenID/Server.php
index 607f54c..f4b36c9 100644
--- a/Auth/OpenID/Server.php
+++ b/Auth/OpenID/Server.php
@@ -254,7 +254,7 @@ class Auth_OpenID_Server {
         }
 
         $reply = array_merge($reply, $sess_reply);
-        $reply_kv = Auth_OpenID_KVForm::arrayToKV($reply);
+        $reply_kv = Auth_OpenID_arrayToKV($reply);
         return array(Auth_OpenID_REMOTE_OK, $reply_kv);
     }
 
@@ -301,7 +301,7 @@ class Auth_OpenID_Server {
             $store->removeAssociation($this->_dumb_key, $assoc_handle);
         }
         
-        $kv = Auth_OpenID_KVForm::arrayToKV($reply);
+        $kv = Auth_OpenID_arrayToKV($reply);
         return array(Auth_OpenID_REMOTE_OK, $kv);
     }
 
@@ -347,7 +347,7 @@ class Auth_OpenID_Server {
 
     function postError($msg)
     {
-        $kv = Auth_OpenID_KVForm::arrayToKV(array('error' => $msg));
+        $kv = Auth_OpenID_arrayToKV(array('error' => $msg));
         return array(Auth_OpenID_REMOTE_ERROR, $kv);
     }
 }
diff --git a/Tests/Auth/OpenID/Consumer.php b/Tests/Auth/OpenID/Consumer.php
index bab2d6f..06cc3b6 100644
--- a/Tests/Auth/OpenID/Consumer.php
+++ b/Tests/Auth/OpenID/Consumer.php
@@ -69,7 +69,7 @@ function Auth_OpenID_associate($qs, $assoc_secret, $assoc_handle)
 
     $reply_dict = array_merge($reply_dict, $dh_args);
 
-    return Auth_OpenID_KVForm::arrayToKV($reply_dict);
+    return Auth_OpenID_arrayToKV($reply_dict);
 }
 
 class Auth_OpenID_TestFetcher {
diff --git a/Tests/Auth/OpenID/KVForm.php b/Tests/Auth/OpenID/KVForm.php
index a3c8c57..c32d661 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_KVForm::kvToArray($this->str);
-        $serial1 = Auth_OpenID_KVForm::arrayToKV($this->arr);
+        $parsed1 = Auth_OpenID_kvToArray($this->str);
+        $serial1 = Auth_OpenID_arrayToKV($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_KVForm::kvToArray($serial1);
-        $serial2 = Auth_OpenID_KVForm::arrayToKV($parsed1);
+        $parsed2 = Auth_OpenID_kvToArray($serial1);
+        $serial2 = Auth_OpenID_arrayToKV($parsed1);
 
         // Round-trip both
-        $parsed3 = Auth_OpenID_KVForm::kvToArray($serial2);
-        $serial3 = Auth_OpenID_KVForm::arrayToKV($parsed2);
+        $parsed3 = Auth_OpenID_kvToArray($serial2);
+        $serial3 = Auth_OpenID_arrayToKV($parsed2);
 
         $this->assertEquals($serial2, $serial3, "serialized forms differ");
 
@@ -104,7 +104,7 @@ extends Tests_Auth_OpenID_KVForm_TestCase {
 
     function _runTest()
     {
-        $serialized = Auth_OpenID_KVForm::arrayToKV($this->arr);
+        $serialized = Auth_OpenID_arrayToKV($this->arr);
         $this->assertTrue($serialized === null,
                           'serialization unexpectedly succeeded');
     }
diff --git a/Tests/Auth/OpenID/Server.php b/Tests/Auth/OpenID/Server.php
index 4fe559c..b015a1b 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_KVForm::kvToArray($info);
+        $resultArgs = Auth_OpenID_kvToArray($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_KVForm::kvToArray($info);
+        $ra = Auth_OpenID_kvToArray($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_KVForm::kvToArray($info);
+        $ra = Auth_OpenID_kvToArray($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_KVForm::kvToArray($info);
+            $ra = Auth_OpenID_kvToArray($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_KVForm::kvToArray($info);
+            $ra = Auth_OpenID_kvToArray($info);
             $this->assertKeyExists('error', $ra);
         }
     }