Merge branch '8.5' into 9.6

sebastianbergmann · Feb 25, 2023 · 9b20b5c · 9b20b5c
2 parents f691be2 + cb67d43
commit 9b20b5c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/ChangeLog-8.5.md b/ChangeLog-8.5.md
@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 8.5 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [8.5.33] - 2023-MM-DD
+
+### Fixed
+
+* [#5186](https://github.com/sebastianbergmann/phpunit/issues/5186): SBOM does not validate
+
 ## [8.5.32] - 2023-01-26
 
 ### Fixed
@@ -262,6 +268,7 @@ All notable changes of the PHPUnit 8.5 release series are documented in this fil
 * [#3967](https://github.com/sebastianbergmann/phpunit/issues/3967): Cannot double interface that extends interface that extends `\Throwable`
 * [#3968](https://github.com/sebastianbergmann/phpunit/pull/3968): Test class run in a separate PHP process are passing when `exit` called inside
 
+[8.5.33]: https://github.com/sebastianbergmann/phpunit/compare/8.5.32...8.5
 [8.5.32]: https://github.com/sebastianbergmann/phpunit/compare/8.5.31...8.5.32
 [8.5.31]: https://github.com/sebastianbergmann/phpunit/compare/8.5.30...8.5.31
 [8.5.30]: https://github.com/sebastianbergmann/phpunit/compare/8.5.29...8.5.30

diff --git a/build/scripts/phar-manifest.php b/build/scripts/phar-manifest.php
@@ -51,7 +51,7 @@ function sbom(string $outputFilename, array $package, string $version, array $de
     $writer->startDocument();
 
     $writer->startElement('bom');
-    $writer->writeAttribute('xmlns', 'https://cyclonedx.org/schema/bom/1.4');
+    $writer->writeAttribute('xmlns', 'http://cyclonedx.org/schema/bom/1.4');
 
     $writer->startElement('components');