Skip to content

Commit da8c051

Browse files
committed
Fix tests for PHP7.3 and PHP7.4
1 parent fc74ec9 commit da8c051

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

tests/src/OneLogin/Saml2/MetadataTest.php

+6-4
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,9 @@ public function testSignMetadata()
165165
try {
166166
$signedMetadata2 = Metadata::signMetadata('', $key, $cert);
167167
$this->fail('Exception was not raised');
168-
} catch (\Error $e) {
169-
$this->assertStringContainsString('Argument #1 ($source) must not be empty', $e->getMessage());
168+
} catch (\Error | \Exception $e) {
169+
$expectedErrors = array('DOMDocument::loadXML(): Argument #1 ($source) must not be empty', 'DOMDocument::loadXML(): Empty string supplied as input');
170+
$this->assertTrue(in_array($e->getMessage(), $expectedErrors));
170171
}
171172
}
172173

@@ -261,8 +262,9 @@ public function testAddX509KeyDescriptors()
261262
try {
262263
$signedMetadata2 = Metadata::addX509KeyDescriptors('', $cert);
263264
$this->fail('Exception was not raised');
264-
} catch (\Error $e) {
265-
$this->assertStringContainsString('Argument #1 ($source) must not be empty', $e->getMessage());
265+
} catch (\Error | \Exception $e) {
266+
$expectedErrors = array('DOMDocument::loadXML(): Argument #1 ($source) must not be empty', 'Error parsing metadata. DOMDocument::loadXML(): Empty string supplied as input');
267+
$this->assertTrue(in_array($e->getMessage(), $expectedErrors));
266268
}
267269

268270
libxml_use_internal_errors(true);

tests/src/OneLogin/Saml2/SettingsTest.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -831,8 +831,9 @@ public function testValidateMetadataNoXML()
831831
try {
832832
$errors = $settings->validateMetadata($metadata);
833833
$this->fail('Exception was not raised');
834-
} catch (\Error $e) {
835-
$this->assertStringContainsString('Argument #1 ($source) must not be empty', $e->getMessage());
834+
} catch (\Error | \Exception $e) {
835+
$expectedErrors = array('DOMDocument::loadXML(): Argument #1 ($source) must not be empty', 'DOMDocument::loadXML(): Empty string supplied as input');
836+
$this->assertTrue(in_array($e->getMessage(), $expectedErrors));
836837
}
837838

838839
$metadata = '<no xml>';

0 commit comments

Comments
 (0)