[project @ Moved fixArgs from Util to OpenID]

5 files changed, 25 insertions, 24 deletions

diff --git a/Auth/OpenID.php b/Auth/OpenID.php
index 8ed5dd7..dc28c5d 100644
--- a/Auth/OpenID.php
+++ b/Auth/OpenID.php
@@ -99,6 +99,26 @@ class Auth_OpenID {
         }
         return $fetcher;
     }
+
+    /**
+     * Rename query arguments back to 'openid.' from 'openid_'
+     *
+     * @access private
+     * @param array $args An associative array of URL query arguments
+     */
+    function fixArgs($args)
+    {
+        foreach (array_keys($args) as $key) {
+            $fixed = preg_replace('/^openid_/', 'openid.', $key);
+            if ($fixed != $key) {
+                $val = $args[$key];
+                unset($args[$key]);
+                $args[$fixed] = $val;
+            }
+        }
+
+        return $args;
+    }
 }
 
 ?>
\ No newline at end of file
diff --git a/Auth/OpenID/Consumer.php b/Auth/OpenID/Consumer.php
index f27972c..caf1b52 100644
--- a/Auth/OpenID/Consumer.php
+++ b/Auth/OpenID/Consumer.php
@@ -508,7 +508,7 @@ class Auth_OpenID_Consumer {
      */
     function completeAuth($token, $query)
     {
-        $query = Auth_OpenID_fixArgs($query);
+        $query = Auth_OpenID::fixArgs($query);
 
         $mode = Auth_OpenID_arrayGet($query, 'openid.mode', '');
 
diff --git a/Auth/OpenID/Server.php b/Auth/OpenID/Server.php
index 466f8ab..b27b36b 100644
--- a/Auth/OpenID/Server.php
+++ b/Auth/OpenID/Server.php
@@ -113,14 +113,14 @@ class Auth_OpenID_Server {
         case 'GET':
             // Convert anything that starts with openid_ to openid.
             if ($args === null) {
-                $args = Auth_OpenID_fixArgs($_GET);
+                $args = Auth_OpenID::fixArgs($_GET);
             }
             $request = new Auth_OpenID_ServerRequest($this->server_url, $args);
             return $request->retry(&$this, $is_authorized);
 
         case 'POST':
             if ($args === null) {
-                $args = Auth_OpenID_fixArgs($_POST);
+                $args = Auth_OpenID::fixArgs($_POST);
             }
             $mode = $args['openid.mode'];
             switch ($mode) {
diff --git a/Auth/OpenID/Util.php b/Auth/OpenID/Util.php
index 67ba691..8bed09b 100644
--- a/Auth/OpenID/Util.php
+++ b/Auth/OpenID/Util.php
@@ -61,26 +61,6 @@ function Auth_OpenID_arrayGet($arr, $key, $fallback = null)
 }
 
 /**
- * Rename query arguments back to 'openid.' from 'openid_'
- *
- * @access private
- * @param array $args An associative array of URL query arguments
- */
-function Auth_OpenID_fixArgs($args)
-{
-    foreach (array_keys($args) as $key) {
-        $fixed = preg_replace('/^openid_/', 'openid.', $key);
-        if ($fixed != $key) {
-            $val = $args[$key];
-            unset($args[$key]);
-            $args[$fixed] = $val;
-        }
-    }
-
-    return $args;
-}
-
-/**
  * Implements the PHP 5 'http_build_query' functionality.
  *
  * @access private
diff --git a/Tests/Auth/OpenID/Server.php b/Tests/Auth/OpenID/Server.php
index cfda435..9bbe29f 100644
--- a/Tests/Auth/OpenID/Server.php
+++ b/Tests/Auth/OpenID/Server.php
@@ -6,6 +6,7 @@
 
 require_once "PHPUnit.php";
 require_once "Tests/Auth/OpenID/MemStore.php";
+require_once "Auth/OpenID.php";
 require_once "Auth/OpenID/Server.php";
 
 function _Auth_OpenID_NotAuthorized()
@@ -38,7 +39,7 @@ class Tests_Auth_OpenID_Server extends PHPUnit_TestCase {
 
         $query = array();
         parse_str($query_str, $query);
-        $query = Auth_OpenID_fixArgs($query);
+        $query = Auth_OpenID::fixArgs($query);
         return array($base, $query);
     }