From f5317784ed9c8bd0b167d3ef3c2fbb2bda3e648c Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Thu, 6 Jan 2022 18:40:25 +0100
Subject: [PATCH] New style arrays
---
.../modules/core/lib/Auth/Process/PHPTest.php | 6 +-
.../core/lib/Auth/Process/TargetedIDTest.php | 4 +-
.../lib/Auth/Source/MultiAuthTest.php | 116 +++++++++---------
.../lib/Auth/Process/NameIDAttributeTest.php | 2 +-
4 files changed, 64 insertions(+), 64 deletions(-)
diff --git a/tests/modules/core/lib/Auth/Process/PHPTest.php b/tests/modules/core/lib/Auth/Process/PHPTest.php
index 40644af95..28493d48b 100644
--- a/tests/modules/core/lib/Auth/Process/PHPTest.php
+++ b/tests/modules/core/lib/Auth/Process/PHPTest.php
@@ -53,7 +53,7 @@ class PHPTest extends TestCase
{
$config = [
'code' => '
- $attributes["key"] = array("value");
+ $attributes["key"] = ["value"];
',
];
$request = ['Attributes' => []];
@@ -74,7 +74,7 @@ class PHPTest extends TestCase
{
$config = [
'code' => '
- $attributes["orig2"] = array("value0");
+ $attributes["orig2"] = ["value0"];
',
];
$request = [
@@ -130,7 +130,7 @@ class PHPTest extends TestCase
$config = [
'code' => '
- $attributes["orig2"] = array("value0");
+ $attributes["orig2"] = ["value0"];
$state["newKey"] = ["newValue"];
$state["Destination"]["attributes"][] = "givenName";
',
diff --git a/tests/modules/core/lib/Auth/Process/TargetedIDTest.php b/tests/modules/core/lib/Auth/Process/TargetedIDTest.php
index 34a740d41..305445536 100644
--- a/tests/modules/core/lib/Auth/Process/TargetedIDTest.php
+++ b/tests/modules/core/lib/Auth/Process/TargetedIDTest.php
@@ -120,7 +120,7 @@ class TargetedIDTest extends TestCase
'identifyingAttribute' => 'eduPersonPrincipalName',
];
- $request = array(
+ $request = [
'Attributes' => [
'eduPersonPrincipalName' => ['joe'],
'eduPersonTargetedID' => [$nameid->toXML()->ownerDocument->saveXML()],
@@ -133,7 +133,7 @@ class TargetedIDTest extends TestCase
'metadata-set' => 'saml20-sp-remote',
'entityid' => 'joe',
],
- );
+ ];
$result = self::processFilter($config, $request);
$attributes = $result['Attributes'];
diff --git a/tests/modules/multiauth/lib/Auth/Source/MultiAuthTest.php b/tests/modules/multiauth/lib/Auth/Source/MultiAuthTest.php
index 83be7f6e0..0f7709ea1 100644
--- a/tests/modules/multiauth/lib/Auth/Source/MultiAuthTest.php
+++ b/tests/modules/multiauth/lib/Auth/Source/MultiAuthTest.php
@@ -33,42 +33,42 @@ class MultiAuthTest extends ClearStateTestCase
);
Configuration::setPreLoadedConfig($this->config, 'config.php');
- $this->sourceConfig = Configuration::loadFromArray(array(
- 'example-multi' => array(
+ $this->sourceConfig = Configuration::loadFromArray([
+ 'example-multi' => [
'multiauth:MultiAuth',
/*
* The available authentication sources.
* They must be defined in this authsources.php file.
*/
- 'sources' => array(
- 'example-saml' => array(
- 'text' => array(
+ 'sources' => [
+ 'example-saml' => [
+ 'text' => [
'en' => 'Log in using a SAML SP',
'es' => 'Entrar usando un SP SAML',
- ),
+ ],
'css-class' => 'SAML',
- ),
- 'example-admin' => array(
- 'text' => array(
+ ],
+ 'example-admin' => [
+ 'text' => [
'en' => 'Log in using the admin password',
'es' => 'Entrar usando la contraseña de administrador',
- ),
- ),
- ),
+ ],
+ ],
+ ],
'preselect' => 'example-saml',
- ),
+ ],
- 'example-saml' => array(
+ 'example-saml' => [
'saml:SP',
'entityId' => 'my-entity-id',
'idp' => 'my-idp',
- ),
+ ],
- 'example-admin' => array(
+ 'example-admin' => [
'core:AdminPassword',
- ),
- ));
+ ],
+ ]);
Configuration::setPreLoadedConfig($this->sourceConfig, 'authsources.php');
}
@@ -79,11 +79,11 @@ class MultiAuthTest extends ClearStateTestCase
{
$this->expectException(Exception::class);
$this->expectExceptionMessage('The required "sources" config option was not found');
- $sourceConfig = Configuration::loadFromArray(array(
- 'example-multi' => array(
+ $sourceConfig = Configuration::loadFromArray([
+ 'example-multi' => [
'multiauth:MultiAuth',
- ),
- ));
+ ],
+ ]);
Configuration::setPreLoadedConfig($sourceConfig, 'authsources.php');
@@ -97,42 +97,42 @@ class MultiAuthTest extends ClearStateTestCase
{
$this->expectException(Exception::class);
$this->expectExceptionMessage('The optional "preselect" config option must be present in "sources"');
- $sourceConfig = Configuration::loadFromArray(array(
- 'example-multi' => array(
+ $sourceConfig = Configuration::loadFromArray([
+ 'example-multi' => [
'multiauth:MultiAuth',
/*
* The available authentication sources.
* They must be defined in this authsources.php file.
*/
- 'sources' => array(
- 'example-saml' => array(
- 'text' => array(
+ 'sources' => [
+ 'example-saml' => [
+ 'text' => [
'en' => 'Log in using a SAML SP',
'es' => 'Entrar usando un SP SAML',
- ),
+ ],
'css-class' => 'SAML',
- ),
- 'example-admin' => array(
- 'text' => array(
+ ],
+ 'example-admin' => [
+ 'text' => [
'en' => 'Log in using the admin password',
'es' => 'Entrar usando la contraseña de administrador',
- ),
- ),
- ),
+ ],
+ ],
+ ],
'preselect' => 'other',
- ),
+ ],
- 'example-saml' => array(
+ 'example-saml' => [
'saml:SP',
'entityId' => 'my-entity-id',
'idp' => 'my-idp',
- ),
+ ],
- 'example-admin' => array(
+ 'example-admin' => [
'core:AdminPassword',
- ),
- ));
+ ],
+ ]);
Configuration::setPreLoadedConfig($sourceConfig, 'authsources.php');
new MultiAuth(['AuthId' => 'example-multi'], $sourceConfig->getArray('example-multi'));
@@ -143,41 +143,41 @@ class MultiAuthTest extends ClearStateTestCase
*/
public function testPreselectIsOptional(): void
{
- $sourceConfig = Configuration::loadFromArray(array(
- 'example-multi' => array(
+ $sourceConfig = Configuration::loadFromArray([
+ 'example-multi' => [
'multiauth:MultiAuth',
/*
* The available authentication sources.
* They must be defined in this authsources.php file.
*/
- 'sources' => array(
- 'example-saml' => array(
- 'text' => array(
+ 'sources' => [
+ 'example-saml' => [
+ 'text' => [
'en' => 'Log in using a SAML SP',
'es' => 'Entrar usando un SP SAML',
- ),
+ ],
'css-class' => 'SAML',
- ),
- 'example-admin' => array(
- 'text' => array(
+ ],
+ 'example-admin' => [
+ 'text' => [
'en' => 'Log in using the admin password',
'es' => 'Entrar usando la contraseña de administrador',
- ),
- ),
- ),
- ),
+ ],
+ ],
+ ],
+ ],
- 'example-saml' => array(
+ 'example-saml' => [
'saml:SP',
'entityId' => 'my-entity-id',
'idp' => 'my-idp',
- ),
+ ],
- 'example-admin' => array(
+ 'example-admin' => [
'core:AdminPassword',
- ),
- ));
+ ],
+ ]);
Configuration::setPreLoadedConfig($sourceConfig, 'authsources.php');
diff --git a/tests/modules/saml/lib/Auth/Process/NameIDAttributeTest.php b/tests/modules/saml/lib/Auth/Process/NameIDAttributeTest.php
index ba0b5472e..64c64aba2 100644
--- a/tests/modules/saml/lib/Auth/Process/NameIDAttributeTest.php
+++ b/tests/modules/saml/lib/Auth/Process/NameIDAttributeTest.php
@@ -228,7 +228,7 @@ class NameIDAttributeTest extends TestCase
],
'saml:sp:NameID' => $nameId,
];
- $this->processFilter(array(), $request);
+ $this->processFilter([], $request);
$this->assertEquals("{$nameId->getFormat()}", Constants::NAMEID_UNSPECIFIED);
$this->assertEquals("{$nameId->getNameQualifier()}", $idpId);
$this->assertEquals("{$nameId->getSPNameQualifier()}", $spId);
--
GitLab