Fix build

tvdijen · tvdijen · commit 115ca2843bd0 · 2026-06-19T14:30:03.000+02:00
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -44,7 +44,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-latest]
+        # Ubuntu 24 (current latest) has a broken PCRE library that causes the StringValueTest to fail
+        operating-system: [ubuntu-26.04, ubuntu-latest]
         php-versions: ['8.5']
 
     steps:
diff --git a/tests/XMLSchema/Type/Helper/XPathValueTest.php b/tests/XMLSchema/Type/Helper/XPathValueTest.php
@@ -4,6 +4,7 @@
 
 namespace SimpleSAML\Test\XMLSchema\Type\Builtin;
 
+use Error;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
@@ -28,7 +29,7 @@ public function testString(bool $shouldPass, string $xpath): void
         try {
             $value = XPathValue::fromString($xpath);
             $this->assertTrue($shouldPass);
-        } catch (AssertionFailedException $e) {
+        } catch (Error|AssertionFailedException) {
             $this->assertFalse($shouldPass);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace SimpleSAML\Test\XMLSchema\Type\Builtin;`
`6`	`6`
	`7`	`+use Error;`
`7`	`8`	`use PHPUnit\Framework\Attributes\CoversClass;`
`8`	`9`	`use PHPUnit\Framework\Attributes\DataProvider;`
`9`	`10`	`use PHPUnit\Framework\TestCase;`
`@@ -28,7 +29,7 @@ public function testString(bool $shouldPass, string $xpath): void`
`28`	`29`	`try {`
`29`	`30`	`$value = XPathValue::fromString($xpath);`
`30`	`31`	`$this->assertTrue($shouldPass);`
`31`		`- } catch (AssertionFailedException $e) {`
	`32`	`+ } catch (Error\|AssertionFailedException) {`
`32`	`33`	`$this->assertFalse($shouldPass);`
`33`	`34`	`}`
`34`	`35`	`}`