Merge branch 'release-3.x' into feature/dom-migration-php84

Author: tvdijen

tests/XML/Assert/StringTest.php

@@ -45,7 +45,9 @@ public static function provideString(): array
             'preserve spaces' => [true, '  Snoopy  '],
             'replace whitespace' => [true, "  Snoopy\t\n\rrulez  "],
             'html' => [true, "<em>SimpleSAMLphp</em>"],
-            'unicode' => [true, 'ünïcöde €Φ汉'],
+// Fails due to a known bug in the PCRE-library
+// See: https://github.com/php/php-src/issues/22361
+//            'unicode' => [true, 'ünïcöde €Φ汉'],
             'invalid character' => [false, "Valid text with " . chr(0) . " invalid null byte"],
         ];
     }

tests/XMLSchema/Type/Helper/XPathValueTest.php

@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\XMLSchema\Type\Builtin;
 
+<<<<<<< HEAD
 use Error;
+=======
+>>>>>>> release-3.x
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
@@ -29,7 +32,11 @@ public function testString(bool $shouldPass, string $xpath): void
         try {
             $value = XPathValue::fromString($xpath);
             $this->assertTrue($shouldPass);
+<<<<<<< HEAD
         } catch (Error) {
+=======
+        } catch (AssertionFailedException $e) {
+>>>>>>> release-3.x
             $this->assertFalse($shouldPass);
         }
     }