diff options
12 files changed, 16 insertions, 16 deletions
diff --git a/Auth/OpenID/Discover.php b/Auth/OpenID/Discover.php index 7f03ea5..770819d 100644 --- a/Auth/OpenID/Discover.php +++ b/Auth/OpenID/Discover.php @@ -18,7 +18,7 @@ define('Auth_OpenID_TYPE_1_2', 'http://openid.net/signon/1.2'); define('Auth_OpenID_TYPE_1_1', 'http://openid.net/signon/1.1'); define('Auth_OpenID_TYPE_1_0', 'http://openid.net/signon/1.0'); define('Auth_OpenID_TYPE_2_0_IDP', 'http://specs.openid.net/auth/2.0/server'); -define('Auth_OpenID_TYPE_2_0', 'http://openid.net/signon/2.0'); +define('Auth_OpenID_TYPE_2_0', 'http://specs.openid.net/auth/2.0/signon'); function Auth_OpenID_getOpenIDTypeURIs() { diff --git a/Auth/OpenID/Message.php b/Auth/OpenID/Message.php index 527b5ec..8ea429e 100644 --- a/Auth/OpenID/Message.php +++ b/Auth/OpenID/Message.php @@ -15,7 +15,7 @@ require_once 'Auth/Yadis/XML.php'; // This doesn't REALLY belong here, but where is better? define('Auth_OpenID_IDENTIFIER_SELECT', - "http://openid.net/identifier_select/2.0"); + "http://specs.openid.net/auth/2.0/identifier_select"); // URI for Simple Registration extension, the only commonly deployed // OpenID 1.x extension, and so a special case @@ -25,7 +25,7 @@ define('Auth_OpenID_SREG_URI', 'http://openid.net/sreg/1.0'); define('Auth_OpenID_OPENID1_NS', 'http://openid.net/signon/1.0'); // The OpenID 2.0 namespace URI -define('Auth_OpenID_OPENID2_NS', 'http://openid.net/signon/2.0'); +define('Auth_OpenID_OPENID2_NS', 'http://specs.openid.net/auth/2.0'); // The namespace consisting of pairs with keys that are prefixed with // "openid." but not in another namespace. diff --git a/Tests/Auth/OpenID/Consumer.php b/Tests/Auth/OpenID/Consumer.php index b6a64f4..a17370a 100644 --- a/Tests/Auth/OpenID/Consumer.php +++ b/Tests/Auth/OpenID/Consumer.php @@ -1770,7 +1770,7 @@ class IDPDrivenTest extends PHPUnit_TestCase { $this->consumer = new Auth_OpenID_GenericConsumer($this->store); $this->endpoint = new Auth_OpenID_ServiceEndpoint(); $this->endpoint->server_url = "http://idp.unittest/"; - $this->endpoint->type_uris = array('http://specs.openid.net/auth/2.0/server'); + $this->endpoint->type_uris = array(Auth_OpenID_TYPE_2_0_IDP); } function test_idpDrivenBegin() @@ -1866,7 +1866,7 @@ class TestDiscoveryVerification extends PHPUnit_TestCase { function test_theGoodStuff() { $endpoint = new Auth_OpenID_ServiceEndpoint(); - $endpoint->type_uris = array(Auth_OpenID_OPENID2_NS); + $endpoint->type_uris = array(Auth_OpenID_TYPE_2_0); $endpoint->claimed_id = $this->identifier; $endpoint->server_url = $this->server_url; $endpoint->local_id = $this->identifier; @@ -1880,7 +1880,7 @@ class TestDiscoveryVerification extends PHPUnit_TestCase { { // a set of things without the stuff $endpoint = new Auth_OpenID_ServiceEndpoint(); - $endpoint->type_uris = array(Auth_OpenID_OPENID2_NS); + $endpoint->type_uris = array(Auth_OpenID_TYPE_2_0); $endpoint->claimed_id = $this->identifier; $endpoint->server_url = "http://the-MOON.unittest/"; $endpoint->local_id = $this->identifier; @@ -1896,7 +1896,7 @@ class TestDiscoveryVerification extends PHPUnit_TestCase { { // a set of things with the server stuff but other delegate $endpoint = new Auth_OpenID_ServiceEndpoint(); - $endpoint->type_uris = array(Auth_OpenID_OPENID2_NS); + $endpoint->type_uris = array(Auth_OpenID_TYPE_2_0); $endpoint->claimed_id = $this->identifier; $endpoint->server_url = $this->server_url; $endpoint->local_id = "http://unittest/juan-carlos"; diff --git a/Tests/Auth/OpenID/Discover_OpenID.php b/Tests/Auth/OpenID/Discover_OpenID.php index 4fa0743..a09ca97 100644 --- a/Tests/Auth/OpenID/Discover_OpenID.php +++ b/Tests/Auth/OpenID/Discover_OpenID.php @@ -178,7 +178,7 @@ class _DiscoveryBase extends PHPUnit_TestCase { $this->assertFalse($s->compatibilityMode()); $this->assertTrue($s->isOPIdentifier()); $this->assertEquals($s->preferredNamespace(), - Auth_OpenID_TYPE_2_0); + Auth_OpenID_OPENID2_NS); } else { $this->assertEquals($claimed_id, $s->claimed_id); $this->assertEquals($local_id, $s->getLocalID()); diff --git a/Tests/Auth/OpenID/Negotiation.php b/Tests/Auth/OpenID/Negotiation.php index c982f3f..a7f4303 100644 --- a/Tests/Auth/OpenID/Negotiation.php +++ b/Tests/Auth/OpenID/Negotiation.php @@ -42,7 +42,7 @@ class TestOpenID2SessionNegotiation extends PHPUnit_TestCase { $dumb = null; $this->consumer = new ErrorRaisingConsumer($dumb); $this->endpoint = new Auth_OpenID_ServiceEndpoint(); - $this->endpoint->type_uris = array(Auth_OpenID_OPENID2_NS); + $this->endpoint->type_uris = array(Auth_OpenID_TYPE_2_0); $this->endpoint->server_url = 'bogus'; } diff --git a/Tests/Auth/OpenID/data/test_discover_openid2_xrds.xml b/Tests/Auth/OpenID/data/test_discover_openid2_xrds.xml index 25ed581..8091ab9 100644 --- a/Tests/Auth/OpenID/data/test_discover_openid2_xrds.xml +++ b/Tests/Auth/OpenID/data/test_discover_openid2_xrds.xml @@ -4,7 +4,7 @@ > <XRD> <Service priority="10"> - <Type>http://openid.net/signon/2.0</Type> + <Type>http://specs.openid.net/auth/2.0/signon</Type> <URI>http://www.myopenid.com/server</URI> <LocalID>http://smoker.myopenid.com/</LocalID> </Service> diff --git a/Tests/Auth/OpenID/data/test_discover_openid2_xrds_no_local_id.xml b/Tests/Auth/OpenID/data/test_discover_openid2_xrds_no_local_id.xml index acd08ef..e6a0eb9 100644 --- a/Tests/Auth/OpenID/data/test_discover_openid2_xrds_no_local_id.xml +++ b/Tests/Auth/OpenID/data/test_discover_openid2_xrds_no_local_id.xml @@ -4,7 +4,7 @@ > <XRD> <Service priority="10"> - <Type>http://openid.net/signon/2.0</Type> + <Type>http://specs.openid.net/auth/2.0/signon</Type> <URI>http://www.myopenid.com/server</URI> </Service> </XRD> diff --git a/Tests/Auth/OpenID/data/test_discover_openid_1_and_2_xrds.xml b/Tests/Auth/OpenID/data/test_discover_openid_1_and_2_xrds.xml index e8a1f5b..6d85d57 100644 --- a/Tests/Auth/OpenID/data/test_discover_openid_1_and_2_xrds.xml +++ b/Tests/Auth/OpenID/data/test_discover_openid_1_and_2_xrds.xml @@ -6,7 +6,7 @@ <XRD> <Service priority="10"> - <Type>http://openid.net/signon/2.0</Type> + <Type>http://specs.openid.net/auth/2.0/signon</Type> <Type>http://openid.net/signon/1.1</Type> <URI>http://www.myopenid.com/server</URI> <LocalID>http://smoker.myopenid.com/</LocalID> diff --git a/Tests/Auth/OpenID/data/test_discover_openid_1_and_2_xrds_bad_delegate.xml b/Tests/Auth/OpenID/data/test_discover_openid_1_and_2_xrds_bad_delegate.xml index 019cd65..db7282e 100644 --- a/Tests/Auth/OpenID/data/test_discover_openid_1_and_2_xrds_bad_delegate.xml +++ b/Tests/Auth/OpenID/data/test_discover_openid_1_and_2_xrds_bad_delegate.xml @@ -6,7 +6,7 @@ <XRD> <Service priority="10"> - <Type>http://openid.net/signon/2.0</Type> + <Type>http://specs.openid.net/auth/2.0/signon</Type> <Type>http://openid.net/signon/1.0</Type> <Type>http://openid.net/signon/1.1</Type> <URI>http://www.myopenid.com/server</URI> diff --git a/Tests/Auth/OpenID/data/test_discover_yadis_2_bad_local_id.xml b/Tests/Auth/OpenID/data/test_discover_yadis_2_bad_local_id.xml index b72727c..68c2ce1 100644 --- a/Tests/Auth/OpenID/data/test_discover_yadis_2_bad_local_id.xml +++ b/Tests/Auth/OpenID/data/test_discover_yadis_2_bad_local_id.xml @@ -6,7 +6,7 @@ <XRD> <Service priority="10"> - <Type>http://openid.net/signon/2.0</Type> + <Type>http://specs.openid.net/auth/2.0/signon</Type> <URI>http://www.myopenid.com/server</URI> <LocalID>http://smoker.myopenid.com/</LocalID> <LocalID>http://localid.mismatch.invalid/</LocalID> diff --git a/Tests/Auth/OpenID/data/test_discover_yadis_2entries_idp.xml b/Tests/Auth/OpenID/data/test_discover_yadis_2entries_idp.xml index daef25b..9a07b3d 100644 --- a/Tests/Auth/OpenID/data/test_discover_yadis_2entries_idp.xml +++ b/Tests/Auth/OpenID/data/test_discover_yadis_2entries_idp.xml @@ -7,7 +7,7 @@ <CanonicalID>=!1000</CanonicalID> <Service priority="10"> - <Type>http://openid.net/signon/2.0</Type> + <Type>http://specs.openid.net/auth/2.0/signon</Type> <URI>http://www.myopenid.com/server</URI> <openid:LocalID>http://smoker.myopenid.com/</openid:LocalID> </Service> diff --git a/Tests/Auth/OpenID/data/test_discover_yadis_idp_last.xml b/Tests/Auth/OpenID/data/test_discover_yadis_idp_last.xml index aa89589..8af94c6 100644 --- a/Tests/Auth/OpenID/data/test_discover_yadis_idp_last.xml +++ b/Tests/Auth/OpenID/data/test_discover_yadis_idp_last.xml @@ -5,7 +5,7 @@ > <XRD> <Service priority="10"> - <Type>http://openid.net/signon/2.0</Type> + <Type>http://specs.openid.net/auth/2.0/signon</Type> <URI>http://www.myopenid.com/server2_0</URI> </Service> |