Fix tests for PHP7.3 and PHP7.4

SAML-Toolkits · Jun 9, 2023 · da8c051 · da8c051
1 parent fc74ec9
commit da8c051
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/tests/src/OneLogin/Saml2/MetadataTest.php b/tests/src/OneLogin/Saml2/MetadataTest.php
@@ -165,8 +165,9 @@ public function testSignMetadata()
         try {
             $signedMetadata2 = Metadata::signMetadata('', $key, $cert);
             $this->fail('Exception was not raised');
-        } catch (\Error $e) {
-            $this->assertStringContainsString('Argument #1 ($source) must not be empty', $e->getMessage());
+        } catch (\Error | \Exception $e) {
+            $expectedErrors = array('DOMDocument::loadXML(): Argument #1 ($source) must not be empty', 'DOMDocument::loadXML(): Empty string supplied as input');
+            $this->assertTrue(in_array($e->getMessage(), $expectedErrors));
         }
     }
 
@@ -261,8 +262,9 @@ public function testAddX509KeyDescriptors()
         try {
             $signedMetadata2 = Metadata::addX509KeyDescriptors('', $cert);
             $this->fail('Exception was not raised');
-        } catch (\Error $e) {
-            $this->assertStringContainsString('Argument #1 ($source) must not be empty', $e->getMessage());
+        } catch (\Error | \Exception $e) {
+            $expectedErrors = array('DOMDocument::loadXML(): Argument #1 ($source) must not be empty', 'Error parsing metadata. DOMDocument::loadXML(): Empty string supplied as input');
+            $this->assertTrue(in_array($e->getMessage(), $expectedErrors));
         }
 
         libxml_use_internal_errors(true);

diff --git a/tests/src/OneLogin/Saml2/SettingsTest.php b/tests/src/OneLogin/Saml2/SettingsTest.php
@@ -831,8 +831,9 @@ public function testValidateMetadataNoXML()
         try {
             $errors = $settings->validateMetadata($metadata);
             $this->fail('Exception was not raised');
-        } catch (\Error $e) {
-            $this->assertStringContainsString('Argument #1 ($source) must not be empty', $e->getMessage());
+        } catch (\Error | \Exception $e) {
+            $expectedErrors = array('DOMDocument::loadXML(): Argument #1 ($source) must not be empty', 'DOMDocument::loadXML(): Empty string supplied as input');
+            $this->assertTrue(in_array($e->getMessage(), $expectedErrors));
         }
 
         $metadata = '<no xml>';