[project @ Do not send namespace aliases for extensions with OpenID 1 messages that we create]

This makes the library compatible with the 1.x series of this library,
since it did not handle arbitrary query keys with dots in them (PHP
mangles . to _)

Author: tailor

Diff for: Auth/OpenID/Extension.php

@@ -41,8 +41,12 @@ function getExtensionArgs()
      */
     function toMessage(&$message)
     {
-        if ($message->namespaces->addAlias($this->ns_uri,
-                                           $this->ns_alias) === null) {
+        $implicit = $message->isOpenID1();
+        $added = $message->namespaces->addAlias($this->ns_uri,
+                                                $this->ns_alias,
+                                                $implicit);
+
+        if ($added === null) {
             if ($message->namespaces->getAlias($this->ns_uri) !=
                 $this->ns_alias) {
                 return null;

Diff for: Tests/Auth/OpenID/Extension.php

@@ -0,0 +1,46 @@
+<?php
+
+require_once 'PHPUnit.php';
+require_once 'Auth/OpenID/Message.php';
+require_once 'Auth/OpenID/Extension.php';
+
+class _ExtensionTest_DummyExtension extends Auth_OpenID_Extension {
+    var $ns_uri = 'http://an.extension/';
+    var $ns_alias = 'dummy';
+
+    function getExtensionArgs()
+    {
+        return array();
+    }
+}
+
+class Tests_Auth_OpenID_Extension extends PHPUnit_TestCase {
+    function test_OpenID1()
+    {
+        $oid1_msg = new Auth_OpenID_Message(Auth_OpenID_OPENID1_NS);
+        $ext = new _ExtensionTest_DummyExtension();
+        $ext->toMessage($oid1_msg);
+        $namespaces = $oid1_msg->namespaces;
+
+        $this->assertTrue($namespaces->isImplicit($ext->ns_uri));
+        $this->assertEquals($ext->ns_uri,
+                            $namespaces->getNamespaceURI($ext->ns_alias));
+        $this->assertEquals($ext->ns_alias,
+                            $namespaces->getAlias($ext->ns_uri));
+    }
+
+    function test_OpenID2()
+    {
+        $oid2_msg = new Auth_OpenID_Message(Auth_OpenID_OPENID2_NS);
+        $ext = new _ExtensionTest_DummyExtension();
+        $ext->toMessage($oid2_msg);
+        $namespaces = $oid2_msg->namespaces;
+        $this->assertFalse($namespaces->isImplicit($ext->ns_uri));
+        $this->assertEquals($ext->ns_uri,
+                            $namespaces->getNamespaceURI($ext->ns_alias));
+        $this->assertEquals($ext->ns_alias,
+                            $namespaces->getAlias($ext->ns_uri));
+    }
+}
+
+?>

Diff for: Tests/TestDriver.php

@@ -133,6 +133,7 @@ function global_require_once($name)
                                        'CryptUtil',
                                        'DiffieHellman',
                                        'Discover_OpenID',
+                                       'Extension',
                                        'HMACSHA1',
                                        'KVForm',
                                        'Message',