Added the following patch from the trac.openidenabled.com bug tracker:

http://trac.openidenabled.com/trac/ticket/338
(http://trac.openidenabled.com/trac/attachment/ticket/338/openid-php5.3.diff)

Patch makes php-openid library compatible with PHP 5.3, and included changes to many files.

Original Message:
Reported by:  	http://paulisageek.com/
Opened 6 months ago
Last modified 2 months ago
php openid library doesn't seem to work with php 5.3

	"I get many PHP warnings and then the error condition on the Consumer.

	Deprecated: Assigning the return value of new by reference is deprecated in *path*/Auth/OpenID/Consumer.php on line 271

	Deprecated: Assigning the return value of new by reference is deprecated in *path*/Auth/OpenID/Consumer.php on line 273

	Warning: Parameter 1 to filter_MatchesAnyOpenIDType() expected to be a reference, value given in *path*/Auth/Yadis/XRDS.php on line 431

	Warning: Parameter 2 to Auth_OpenID_GenericConsumer::_completeInvalid() expected to be a reference, value given in *path*/Auth/OpenID/Consumer.php on line 669 "

It should be noted that 3 hunks across 7 files failed, and I applied most of them manually. 7 files were patched.

7 files changed, 10 insertions, 8 deletions

diff --git a/Auth/OpenID/BigMath.php b/Auth/OpenID/BigMath.php
index 58b46bf..7fca2dc 100644
--- a/Auth/OpenID/BigMath.php
+++ b/Auth/OpenID/BigMath.php
@@ -365,6 +365,7 @@ function Auth_OpenID_detectMathLibrary($exts)
 {
     $loaded = false;
 
+	$hasDl = function_exists('dl');
     foreach ($exts as $extension) {
         if (extension_loaded($extension['extension'])) {
             return $extension;
diff --git a/Auth/OpenID/Consumer.php b/Auth/OpenID/Consumer.php
index 92466cf..98e408b 100644
--- a/Auth/OpenID/Consumer.php
+++ b/Auth/OpenID/Consumer.php
@@ -666,7 +666,7 @@ class Auth_OpenID_GenericConsumer {
                                         '_completeInvalid');
 
         return call_user_func_array(array($this, $method),
-                                    array($message, $endpoint, $return_to));
+                                    array($message, &$endpoint, $return_to));
     }
 
     /**
@@ -1181,7 +1181,7 @@ class Auth_OpenID_GenericConsumer {
         // oidutil.log('Performing discovery on %s' % (claimed_id,))
         list($unused, $services) = call_user_func($this->discoverMethod,
                                                   $claimed_id,
-                                                  $this->fetcher);
+												  &$this->fetcher);
 
         if (!$services) {
             return new Auth_OpenID_FailureResponse(null,
diff --git a/Auth/OpenID/Server.php b/Auth/OpenID/Server.php
index b642f91..27e0318 100644
--- a/Auth/OpenID/Server.php
+++ b/Auth/OpenID/Server.php
@@ -821,7 +821,7 @@ class Auth_OpenID_CheckIDRequest extends Auth_OpenID_Request {
                                     array($this->trust_root, $this->return_to));
     }
 
-    static function fromMessage($message, $server)
+    static function fromMessage(&$message, $server)
     {
         $mode = $message->getArg(Auth_OpenID_OPENID_NS, 'mode');
         $immediate = null;
@@ -1703,7 +1703,7 @@ class Auth_OpenID_Server {
     {
         if (method_exists($this, "openid_" . $request->mode)) {
             $handler = array($this, "openid_" . $request->mode);
-            return call_user_func($handler, $request);
+            return call_user_func($handler, &$request);
         }
         return null;
     }
diff --git a/Auth/OpenID/TrustRoot.php b/Auth/OpenID/TrustRoot.php
index 0f53958..000440b 100644
--- a/Auth/OpenID/TrustRoot.php
+++ b/Auth/OpenID/TrustRoot.php
@@ -413,7 +413,7 @@ function Auth_OpenID_getAllowedReturnURLs($relying_party_url, $fetcher,
     }
 
     call_user_func_array($discover_function,
-                         array($relying_party_url, $fetcher));
+                         array($relying_party_url, &$fetcher));
 
     $return_to_urls = array();
     $matching_endpoints = Auth_OpenID_extractReturnURL($endpoints);
diff --git a/Auth/Yadis/Manager.php b/Auth/Yadis/Manager.php
index 5829de6..ee6f68b 100644
--- a/Auth/Yadis/Manager.php
+++ b/Auth/Yadis/Manager.php
@@ -413,7 +413,7 @@ class Auth_Yadis_Discovery {
 
             list($yadis_url, $services) = call_user_func($discover_cb,
                                                          $this->url,
-                                                         $fetcher);
+                                                         &$fetcher);
 
             $manager = $this->createManager($services, $yadis_url);
         }
diff --git a/Auth/Yadis/XRDS.php b/Auth/Yadis/XRDS.php
index 1960952..1f5af96 100644
--- a/Auth/Yadis/XRDS.php
+++ b/Auth/Yadis/XRDS.php
@@ -428,7 +428,8 @@ class Auth_Yadis_XRDS {
                 $matches = 0;
 
                 foreach ($filters as $filter) {
-                    if (call_user_func_array($filter, array($service))) {
+
+                    if (call_user_func_array($filter, array(&$service))) {
                         $matches++;
 
                         if ($filter_mode == SERVICES_YADIS_MATCH_ANY) {
diff --git a/Auth/Yadis/Yadis.php b/Auth/Yadis/Yadis.php
index f885367..9ea2db7 100644
--- a/Auth/Yadis/Yadis.php
+++ b/Auth/Yadis/Yadis.php
@@ -141,7 +141,7 @@ function Auth_Yadis_getServiceEndpoints($input_url, $xrds_parse_func,
     }
 
     $yadis_result = call_user_func_array($discover_func,
-                                         array($input_url, $fetcher));
+                                         array($input_url, &$fetcher));
 
     if ($yadis_result === null) {
         return array($input_url, array());