diff --git a/composer.json b/composer.json
index bcf2a30da3e585676359937b1ee7305598c5c609..a9c31eff55546ec7cff3b9f17301e708db988324 100644
--- a/composer.json
+++ b/composer.json
@@ -64,7 +64,7 @@
"ext-curl": "*",
"mikey179/vfsstream": "~1.6",
"simplesamlphp/simplesamlphp-module-adfs": "dev-master",
- "simplesamlphp/simplesamlphp-test-framework": "^0.1.9"
+ "simplesamlphp/simplesamlphp-test-framework": "^0.2.7"
},
"suggest": {
"predis/predis": "Needed if a Redis server is used to store session information",
diff --git a/composer.lock b/composer.lock
index 6833be4bc4d988e6e11144e7bc58c6cfd20c9bd8..29c71f428de3db9408daa3c905cf95a7b210011b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "19df4d2194b433fde8a20f16a943bb9f",
+ "content-hash": "8e0a88ac04beefe71fb19f5717f3df56",
"packages": [
{
"name": "gettext/gettext",
@@ -4135,6 +4135,7 @@
"keywords": [
"tokenizer"
],
+ "abandoned": true,
"time": "2019-09-17T06:23:10+00:00"
},
{
@@ -4972,21 +4973,22 @@
},
{
"name": "simplesamlphp/simplesamlphp-test-framework",
- "version": "v0.1.9",
+ "version": "v0.2.7",
"source": {
"type": "git",
"url": "https://github.com/simplesamlphp/simplesamlphp-test-framework.git",
- "reference": "cc86116dd5fa1c16c08cd60665a1b2d89cdaae7a"
+ "reference": "196113dcc9137c71e63c1136eb59153190526042"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/simplesamlphp/simplesamlphp-test-framework/zipball/cc86116dd5fa1c16c08cd60665a1b2d89cdaae7a",
- "reference": "cc86116dd5fa1c16c08cd60665a1b2d89cdaae7a",
+ "url": "https://api.github.com/repos/simplesamlphp/simplesamlphp-test-framework/zipball/196113dcc9137c71e63c1136eb59153190526042",
+ "reference": "196113dcc9137c71e63c1136eb59153190526042",
"shasum": ""
},
"require": {
"php": ">=7.2",
"phpunit/phpunit": "^8.5|^9.0",
+ "robrichards/xmlseclibs": "^3.1.0",
"sensiolabs/security-checker": "^6.0",
"squizlabs/php_codesniffer": "^3.5",
"vimeo/psalm": "^3.11"
@@ -5021,7 +5023,7 @@
"keywords": [
"test-framework"
],
- "time": "2020-05-16T15:25:57+00:00"
+ "time": "2020-08-15T14:24:42+00:00"
},
{
"name": "squizlabs/php_codesniffer",
diff --git a/tests/lib/SimpleSAML/Utils/HTTPTest.php b/tests/lib/SimpleSAML/Utils/HTTPTest.php
index 5ecbef2d2ae2fa22a3b83de015d3a3041d1aa4db..965f5df75f86f486920fdbfe51202daaf81a8e15 100644
--- a/tests/lib/SimpleSAML/Utils/HTTPTest.php
+++ b/tests/lib/SimpleSAML/Utils/HTTPTest.php
@@ -481,18 +481,18 @@ class HTTPTest extends ClearStateTestCase
$headers = xdebug_get_headers();
$this->assertStringContainsString('TestCookie=value%2520;', $headers[0]);
- $this->assertRegExp('/\b[Ee]xpires=[Tt]ue/', $headers[0]);
- $this->assertRegExp('/\b[Pp]ath=\/ourPath(;|$)/', $headers[0]);
- $this->assertRegExp('/\b[Dd]omain=example.com(;|$)/', $headers[0]);
- $this->assertRegExp('/\b[Ss]ecure(;|$)/', $headers[0]);
- $this->assertRegExp('/\b[Hh]ttp[Oo]nly(;|$)/', $headers[0]);
+ $this->assertMatchesRegularExpression('/\b[Ee]xpires=[Tt]ue/', $headers[0]);
+ $this->assertMatchesRegularExpression('/\b[Pp]ath=\/ourPath(;|$)/', $headers[0]);
+ $this->assertMatchesRegularExpression('/\b[Dd]omain=example.com(;|$)/', $headers[0]);
+ $this->assertMatchesRegularExpression('/\b[Ss]ecure(;|$)/', $headers[0]);
+ $this->assertMatchesRegularExpression('/\b[Hh]ttp[Oo]nly(;|$)/', $headers[0]);
$this->assertStringContainsString('RawCookie=value%20;', $headers[1]);
- $this->assertRegExp('/\b[Ee]xpires=([Mm]on|[Tt]ue|[Ww]ed|[Tt]hu|[Ff]ri|[Ss]at|[Ss]un)/', $headers[1]);
- $this->assertRegExp('/\b[Pp]ath=\/ourPath(;|$)/', $headers[1]);
- $this->assertRegExp('/\b[Dd]omain=example.com(;|$)/', $headers[1]);
- $this->assertRegExp('/\b[Ss]ecure(;|$)/', $headers[1]);
- $this->assertRegExp('/\b[Hh]ttp[Oo]nly(;|$)/', $headers[1]);
+ $this->assertMatchesRegularExpression('/\b[Ee]xpires=([Mm]on|[Tt]ue|[Ww]ed|[Tt]hu|[Ff]ri|[Ss]at|[Ss]un)/', $headers[1]);
+ $this->assertMatchesRegularExpression('/\b[Pp]ath=\/ourPath(;|$)/', $headers[1]);
+ $this->assertMatchesRegularExpression('/\b[Dd]omain=example.com(;|$)/', $headers[1]);
+ $this->assertMatchesRegularExpression('/\b[Ss]ecure(;|$)/', $headers[1]);
+ $this->assertMatchesRegularExpression('/\b[Hh]ttp[Oo]nly(;|$)/', $headers[1]);
$_SERVER = $original;
}
@@ -533,9 +533,9 @@ class HTTPTest extends ClearStateTestCase
HTTP::setCookie('SSStrict', 'value', ['samesite' => 'Strict']);
$headers = xdebug_get_headers();
- $this->assertNotRegExp('/\b[Ss]ame[Ss]ite=/', $headers[0]);
- $this->assertRegExp('/\b[Ss]ame[Ss]ite=None(;|$)/', $headers[1]);
- $this->assertRegExp('/\b[Ss]ame[Ss]ite=Lax(;|$)/', $headers[2]);
- $this->assertRegExp('/\b[Ss]ame[Ss]ite=Strict(;|$)/', $headers[3]);
+ $this->assertNotMatchesRegularExpression('/\b[Ss]ame[Ss]ite=/', $headers[0]);
+ $this->assertMatchesRegularExpression('/\b[Ss]ame[Ss]ite=None(;|$)/', $headers[1]);
+ $this->assertMatchesRegularExpression('/\b[Ss]ame[Ss]ite=Lax(;|$)/', $headers[2]);
+ $this->assertMatchesRegularExpression('/\b[Ss]ame[Ss]ite=Strict(;|$)/', $headers[3]);
}
}
diff --git a/tests/modules/admin/lib/Controller/FederationTest.php b/tests/modules/admin/lib/Controller/FederationTest.php
index c96641366d366a9bd38b95ccd06f8dd40201259c..761318f83c934cadb1129d3b50a7c0d7c0266e72 100644
--- a/tests/modules/admin/lib/Controller/FederationTest.php
+++ b/tests/modules/admin/lib/Controller/FederationTest.php
@@ -29,10 +29,10 @@ class FederationTest extends TestCase
private const FRAMEWORK = 'vendor/simplesamlphp/simplesamlphp-test-framework';
/** @var string */
- public const CERT_KEY = '../' . self::FRAMEWORK . '/certificates/pem/selfsigned.example.org.key';
+ public const CERT_KEY = '../' . self::FRAMEWORK . '/certificates/rsa-pem/selfsigned.simplesamlphp.org.key';
/** @var string */
- public const CERT_PUBLIC = '../' . self::FRAMEWORK . '/certificates/pem/selfsigned.example.org.crt';
+ public const CERT_PUBLIC = '../' . self::FRAMEWORK . '/certificates/rsa-pem/selfsigned.simplesamlphp.org.crt';
/** @var \SimpleSAML\Configuration */
protected $config;