Merge branch '6.0' into 6.1

GuySartorelli · GuySartorelli · commit e0eb76196bf5 · 2025-12-01T11:22:28.000+13:00
diff --git a/tests/php/i18n/YamlReaderTest.php b/tests/php/i18n/YamlReaderTest.php
@@ -43,7 +43,7 @@ public function testThrowsMeaningfulExceptionWhenYmlIsCorrupted()
         $path = __DIR__ . '/i18nTest/_fakewebroot/i18ntestmodule/lang/en_corrupt.yml';
         $this->expectException(InvalidResourceException::class);
         $regex_path = str_replace('.', '\.', $path ?? '');
-        $this->expectExceptionMessageMatches('@^Error parsing YAML, invalid file "' . $regex_path . '"\. Message: ([\w ].*) line 5 @');
+        $this->expectExceptionMessageMatches('@^Error parsing YAML, invalid file "' . $regex_path . '"\. Message: ([\w ].*) line \d@');
         $reader = new YamlReader();
         $reader->read('en', $path);
     }

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function testThrowsMeaningfulExceptionWhenYmlIsCorrupted()`
`43`	`43`	`$path = __DIR__ . '/i18nTest/_fakewebroot/i18ntestmodule/lang/en_corrupt.yml';`
`44`	`44`	`$this->expectException(InvalidResourceException::class);`
`45`	`45`	`$regex_path = str_replace('.', '\.', $path ?? '');`
`46`		`- $this->expectExceptionMessageMatches('@^Error parsing YAML, invalid file "' . $regex_path . '"\. Message: ([\w ].*) line 5 @');`
	`46`	`+ $this->expectExceptionMessageMatches('@^Error parsing YAML, invalid file "' . $regex_path . '"\. Message: ([\w ].*) line \d@');`
`47`	`47`	`$reader = new YamlReader();`
`48`	`48`	`$reader->read('en', $path);`
`49`	`49`	`}`