Skip to content
Snippets Groups Projects
Commit f5317784 authored by Tim van Dijen's avatar Tim van Dijen
Browse files

New style arrays

parent c8592641
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
tests/modules/core/lib/Auth/Process/PHPTest.php
+ 3
− 3
View file @ f5317784
...@@ -53,7 +53,7 @@ class PHPTest extends TestCase ...@@ -53,7 +53,7 @@ class PHPTest extends TestCase
{ {
$config = [ $config = [
'code' => ' 'code' => '
$attributes["key"] = array("value"); $attributes["key"] = ["value"];
', ',
]; ];
$request = ['Attributes' => []]; $request = ['Attributes' => []];
...@@ -74,7 +74,7 @@ class PHPTest extends TestCase ...@@ -74,7 +74,7 @@ class PHPTest extends TestCase
{ {
$config = [ $config = [
'code' => ' 'code' => '
$attributes["orig2"] = array("value0"); $attributes["orig2"] = ["value0"];
', ',
]; ];
$request = [ $request = [
...@@ -130,7 +130,7 @@ class PHPTest extends TestCase ...@@ -130,7 +130,7 @@ class PHPTest extends TestCase
$config = [ $config = [
'code' => ' 'code' => '
$attributes["orig2"] = array("value0"); $attributes["orig2"] = ["value0"];
$state["newKey"] = ["newValue"]; $state["newKey"] = ["newValue"];
$state["Destination"]["attributes"][] = "givenName"; $state["Destination"]["attributes"][] = "givenName";
', ',
......
tests/modules/core/lib/Auth/Process/TargetedIDTest.php
+ 2
− 2
View file @ f5317784
...@@ -120,7 +120,7 @@ class TargetedIDTest extends TestCase ...@@ -120,7 +120,7 @@ class TargetedIDTest extends TestCase
'identifyingAttribute' => 'eduPersonPrincipalName', 'identifyingAttribute' => 'eduPersonPrincipalName',
]; ];
$request = array( $request = [
'Attributes' => [ 'Attributes' => [
'eduPersonPrincipalName' => ['joe'], 'eduPersonPrincipalName' => ['joe'],
'eduPersonTargetedID' => [$nameid->toXML()->ownerDocument->saveXML()], 'eduPersonTargetedID' => [$nameid->toXML()->ownerDocument->saveXML()],
...@@ -133,7 +133,7 @@ class TargetedIDTest extends TestCase ...@@ -133,7 +133,7 @@ class TargetedIDTest extends TestCase
'metadata-set' => 'saml20-sp-remote', 'metadata-set' => 'saml20-sp-remote',
'entityid' => 'joe', 'entityid' => 'joe',
], ],
); ];
$result = self::processFilter($config, $request); $result = self::processFilter($config, $request);
$attributes = $result['Attributes']; $attributes = $result['Attributes'];
......
tests/modules/multiauth/lib/Auth/Source/MultiAuthTest.php
+ 58
− 58
View file @ f5317784
...@@ -33,42 +33,42 @@ class MultiAuthTest extends ClearStateTestCase ...@@ -33,42 +33,42 @@ class MultiAuthTest extends ClearStateTestCase
); );
Configuration::setPreLoadedConfig($this->config, 'config.php'); Configuration::setPreLoadedConfig($this->config, 'config.php');
$this->sourceConfig = Configuration::loadFromArray(array( $this->sourceConfig = Configuration::loadFromArray([
'example-multi' => array( 'example-multi' => [
'multiauth:MultiAuth', 'multiauth:MultiAuth',
/* /*
* The available authentication sources. * The available authentication sources.
* They must be defined in this authsources.php file. * They must be defined in this authsources.php file.
*/ */
'sources' => array( 'sources' => [
'example-saml' => array( 'example-saml' => [
'text' => array( 'text' => [
'en' => 'Log in using a SAML SP', 'en' => 'Log in using a SAML SP',
'es' => 'Entrar usando un SP SAML', 'es' => 'Entrar usando un SP SAML',
), ],
'css-class' => 'SAML', 'css-class' => 'SAML',
), ],
'example-admin' => array( 'example-admin' => [
'text' => array( 'text' => [
'en' => 'Log in using the admin password', 'en' => 'Log in using the admin password',
'es' => 'Entrar usando la contraseña de administrador', 'es' => 'Entrar usando la contraseña de administrador',
), ],
), ],
), ],
'preselect' => 'example-saml', 'preselect' => 'example-saml',
), ],
'example-saml' => array( 'example-saml' => [
'saml:SP', 'saml:SP',
'entityId' => 'my-entity-id', 'entityId' => 'my-entity-id',
'idp' => 'my-idp', 'idp' => 'my-idp',
), ],
'example-admin' => array( 'example-admin' => [
'core:AdminPassword', 'core:AdminPassword',
), ],
)); ]);
Configuration::setPreLoadedConfig($this->sourceConfig, 'authsources.php'); Configuration::setPreLoadedConfig($this->sourceConfig, 'authsources.php');
} }
...@@ -79,11 +79,11 @@ class MultiAuthTest extends ClearStateTestCase ...@@ -79,11 +79,11 @@ class MultiAuthTest extends ClearStateTestCase
{ {
$this->expectException(Exception::class); $this->expectException(Exception::class);
$this->expectExceptionMessage('The required "sources" config option was not found'); $this->expectExceptionMessage('The required "sources" config option was not found');
$sourceConfig = Configuration::loadFromArray(array( $sourceConfig = Configuration::loadFromArray([
'example-multi' => array( 'example-multi' => [
'multiauth:MultiAuth', 'multiauth:MultiAuth',
), ],
)); ]);
Configuration::setPreLoadedConfig($sourceConfig, 'authsources.php'); Configuration::setPreLoadedConfig($sourceConfig, 'authsources.php');
...@@ -97,42 +97,42 @@ class MultiAuthTest extends ClearStateTestCase ...@@ -97,42 +97,42 @@ class MultiAuthTest extends ClearStateTestCase
{ {
$this->expectException(Exception::class); $this->expectException(Exception::class);
$this->expectExceptionMessage('The optional "preselect" config option must be present in "sources"'); $this->expectExceptionMessage('The optional "preselect" config option must be present in "sources"');
$sourceConfig = Configuration::loadFromArray(array( $sourceConfig = Configuration::loadFromArray([
'example-multi' => array( 'example-multi' => [
'multiauth:MultiAuth', 'multiauth:MultiAuth',
/* /*
* The available authentication sources. * The available authentication sources.
* They must be defined in this authsources.php file. * They must be defined in this authsources.php file.
*/ */
'sources' => array( 'sources' => [
'example-saml' => array( 'example-saml' => [
'text' => array( 'text' => [
'en' => 'Log in using a SAML SP', 'en' => 'Log in using a SAML SP',
'es' => 'Entrar usando un SP SAML', 'es' => 'Entrar usando un SP SAML',
), ],
'css-class' => 'SAML', 'css-class' => 'SAML',
), ],
'example-admin' => array( 'example-admin' => [
'text' => array( 'text' => [
'en' => 'Log in using the admin password', 'en' => 'Log in using the admin password',
'es' => 'Entrar usando la contraseña de administrador', 'es' => 'Entrar usando la contraseña de administrador',
), ],
), ],
), ],
'preselect' => 'other', 'preselect' => 'other',
), ],
'example-saml' => array( 'example-saml' => [
'saml:SP', 'saml:SP',
'entityId' => 'my-entity-id', 'entityId' => 'my-entity-id',
'idp' => 'my-idp', 'idp' => 'my-idp',
), ],
'example-admin' => array( 'example-admin' => [
'core:AdminPassword', 'core:AdminPassword',
), ],
)); ]);
Configuration::setPreLoadedConfig($sourceConfig, 'authsources.php'); Configuration::setPreLoadedConfig($sourceConfig, 'authsources.php');
new MultiAuth(['AuthId' => 'example-multi'], $sourceConfig->getArray('example-multi')); new MultiAuth(['AuthId' => 'example-multi'], $sourceConfig->getArray('example-multi'));
...@@ -143,41 +143,41 @@ class MultiAuthTest extends ClearStateTestCase ...@@ -143,41 +143,41 @@ class MultiAuthTest extends ClearStateTestCase
*/ */
public function testPreselectIsOptional(): void public function testPreselectIsOptional(): void
{ {
$sourceConfig = Configuration::loadFromArray(array( $sourceConfig = Configuration::loadFromArray([
'example-multi' => array( 'example-multi' => [
'multiauth:MultiAuth', 'multiauth:MultiAuth',
/* /*
* The available authentication sources. * The available authentication sources.
* They must be defined in this authsources.php file. * They must be defined in this authsources.php file.
*/ */
'sources' => array( 'sources' => [
'example-saml' => array( 'example-saml' => [
'text' => array( 'text' => [
'en' => 'Log in using a SAML SP', 'en' => 'Log in using a SAML SP',
'es' => 'Entrar usando un SP SAML', 'es' => 'Entrar usando un SP SAML',
), ],
'css-class' => 'SAML', 'css-class' => 'SAML',
), ],
'example-admin' => array( 'example-admin' => [
'text' => array( 'text' => [
'en' => 'Log in using the admin password', 'en' => 'Log in using the admin password',
'es' => 'Entrar usando la contraseña de administrador', 'es' => 'Entrar usando la contraseña de administrador',
), ],
), ],
), ],
), ],
'example-saml' => array( 'example-saml' => [
'saml:SP', 'saml:SP',
'entityId' => 'my-entity-id', 'entityId' => 'my-entity-id',
'idp' => 'my-idp', 'idp' => 'my-idp',
), ],
'example-admin' => array( 'example-admin' => [
'core:AdminPassword', 'core:AdminPassword',
), ],
)); ]);
Configuration::setPreLoadedConfig($sourceConfig, 'authsources.php'); Configuration::setPreLoadedConfig($sourceConfig, 'authsources.php');
......
tests/modules/saml/lib/Auth/Process/NameIDAttributeTest.php
+ 1
− 1
View file @ f5317784
...@@ -228,7 +228,7 @@ class NameIDAttributeTest extends TestCase ...@@ -228,7 +228,7 @@ class NameIDAttributeTest extends TestCase
], ],
'saml:sp:NameID' => $nameId, 'saml:sp:NameID' => $nameId,
]; ];
$this->processFilter(array(), $request); $this->processFilter([], $request);
$this->assertEquals("{$nameId->getFormat()}", Constants::NAMEID_UNSPECIFIED); $this->assertEquals("{$nameId->getFormat()}", Constants::NAMEID_UNSPECIFIED);
$this->assertEquals("{$nameId->getNameQualifier()}", $idpId); $this->assertEquals("{$nameId->getNameQualifier()}", $idpId);
$this->assertEquals("{$nameId->getSPNameQualifier()}", $spId); $this->assertEquals("{$nameId->getSPNameQualifier()}", $spId);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment