Skip to content
Snippets Groups Projects
Commit 7c96f0f7 authored by Pieter van der Meulen's avatar Pieter van der Meulen
Browse files

PHP 5.3 fixes

parent b7472561
No related branches found
No related tags found
No related merge requests found
...@@ -113,12 +113,14 @@ class Auth_Source_SP_Test extends PHPUnit_Framework_TestCase ...@@ -113,12 +113,14 @@ class Auth_Source_SP_Test extends PHPUnit_Framework_TestCase
/** @var $xml DOMElement */ /** @var $xml DOMElement */
$xml=$ar->toSignedXML(); $xml=$ar->toSignedXML();
// echo $xml->ownerDocument->saveXML($xml); // Print XML // echo $xml->ownerDocument->saveXML($xml); // Print XML
$q=SAML2_Utils::xpQuery($xml, '/samlp:AuthnRequest/@Destination');
$this->assertEquals( $this->assertEquals(
$this->idpConfigArray['SingleSignOnService'][0]['Location'], $this->idpConfigArray['SingleSignOnService'][0]['Location'],
SAML2_Utils::xpQuery($xml, '/samlp:AuthnRequest/@Destination')[0]->value); $q[0]->value);
$q=SAML2_Utils::xpQuery($xml, '/samlp:AuthnRequest/saml:Issuer');
$this->assertEquals( $this->assertEquals(
'http://localhost/simplesaml/module.php/saml/sp/metadata.php/default-sp', 'http://localhost/simplesaml/module.php/saml/sp/metadata.php/default-sp',
SAML2_Utils::xpQuery($xml, '/samlp:AuthnRequest/saml:Issuer')[0]->textContent); $q[0]->textContent);
} }
/** Test setting a Subject /** Test setting a Subject
...@@ -138,12 +140,14 @@ class Auth_Source_SP_Test extends PHPUnit_Framework_TestCase ...@@ -138,12 +140,14 @@ class Auth_Source_SP_Test extends PHPUnit_Framework_TestCase
/** @var $xml DOMElement */ /** @var $xml DOMElement */
$xml=$ar->toSignedXML(); $xml=$ar->toSignedXML();
//echo $xml->ownerDocument->saveXML($xml); // Print XML //echo $xml->ownerDocument->saveXML($xml); // Print XML
$q=SAML2_Utils::xpQuery($xml, '/samlp:AuthnRequest/saml:Subject/saml:NameID/@Format');
$this->assertEquals( $this->assertEquals(
$state['saml:NameID']['Format'], $state['saml:NameID']['Format'],
SAML2_Utils::xpQuery($xml, '/samlp:AuthnRequest/saml:Subject/saml:NameID/@Format')[0]->value); $q[0]->value);
$q=SAML2_Utils::xpQuery($xml, '/samlp:AuthnRequest/saml:Subject/saml:NameID');
$this->assertEquals( $this->assertEquals(
$state['saml:NameID']['Value'], $state['saml:NameID']['Value'],
SAML2_Utils::xpQuery($xml, '/samlp:AuthnRequest/saml:Subject/saml:NameID')[0]->textContent); $q[0]->textContent);
} }
/** Test setting an AuthnConextClassRef /** Test setting an AuthnConextClassRef
...@@ -156,16 +160,18 @@ class Auth_Source_SP_Test extends PHPUnit_Framework_TestCase ...@@ -156,16 +160,18 @@ class Auth_Source_SP_Test extends PHPUnit_Framework_TestCase
/** @var SAML2_AuthnRequest $ar */ /** @var SAML2_AuthnRequest $ar */
$ar = $this->CreateAuthnRequest($state); $ar = $this->CreateAuthnRequest($state);
$a=$ar->getRequestedAuthnContext();
$this->assertEquals( $this->assertEquals(
$state['saml:AuthnContextClassRef'], $state['saml:AuthnContextClassRef'],
$ar->getRequestedAuthnContext()['AuthnContextClassRef'][0] ); $a['AuthnContextClassRef'][0] );
/** @var $xml DOMElement */ /** @var $xml DOMElement */
$xml=$ar->toSignedXML(); $xml=$ar->toSignedXML();
//echo $xml->ownerDocument->saveXML($xml); // Print XML //echo $xml->ownerDocument->saveXML($xml); // Print XML
$q=SAML2_Utils::xpQuery($xml, '/samlp:AuthnRequest/samlp:RequestedAuthnContext/saml:AuthnContextClassRef');
$this->assertEquals( $this->assertEquals(
$state['saml:AuthnContextClassRef'], $state['saml:AuthnContextClassRef'],
SAML2_Utils::xpQuery($xml, '/samlp:AuthnRequest/samlp:RequestedAuthnContext/saml:AuthnContextClassRef')[0]->textContent); $q[0]->textContent);
} }
/** Test setting ForcedAuthn /** Test setting ForcedAuthn
...@@ -185,9 +191,10 @@ class Auth_Source_SP_Test extends PHPUnit_Framework_TestCase ...@@ -185,9 +191,10 @@ class Auth_Source_SP_Test extends PHPUnit_Framework_TestCase
/** @var $xml DOMElement */ /** @var $xml DOMElement */
$xml=$ar->toSignedXML(); $xml=$ar->toSignedXML();
//echo $xml->ownerDocument->saveXML($xml); // Print XML //echo $xml->ownerDocument->saveXML($xml); // Print XML
$q=SAML2_Utils::xpQuery($xml, '/samlp:AuthnRequest/@ForceAuthn');
$this->assertEquals( $this->assertEquals(
$state['ForceAuthn'] ? 'true' : 'false', $state['ForceAuthn'] ? 'true' : 'false',
SAML2_Utils::xpQuery($xml, '/samlp:AuthnRequest/@ForceAuthn')[0]->value); $q[0]->value);
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment