From 8f575273011c95cd6db88a6322f82190d6cb6605 Mon Sep 17 00:00:00 2001
From: Sebastian Bergmann <sb@sebastian-bergmann.de>
Date: Fri, 21 Jan 2022 06:48:06 +0100
Subject: [PATCH 1/2] Update ChangeLog

---
 ChangeLog-8.5.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog-8.5.md b/ChangeLog-8.5.md
index 4bec6a15f66..164831f2d55 100644
--- a/ChangeLog-8.5.md
+++ b/ChangeLog-8.5.md
@@ -7,6 +7,7 @@ All notable changes of the PHPUnit 8.5 release series are documented in this fil
 ### Fixed
 
 * [#4799](https://github.com/sebastianbergmann/phpunit/pull/4799): Memory leaks in `PHPUnit\Framework\TestSuite` class
+* [#4857](https://github.com/sebastianbergmann/phpunit/pull/4857): Result of `debug_backtrace()` is not used correctly
 
 ## [8.5.22] - 2021-12-25
 

From efb20ff3623b9d09bf190a68fdfe574538a8d496 Mon Sep 17 00:00:00 2001
From: Sebastian Bergmann <sb@sebastian-bergmann.de>
Date: Fri, 21 Jan 2022 06:50:34 +0100
Subject: [PATCH 2/2] Prepare release

---
 ChangeLog-8.5.md       | 4 ++--
 src/Runner/Version.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ChangeLog-8.5.md b/ChangeLog-8.5.md
index 164831f2d55..05afd3a83cb 100644
--- a/ChangeLog-8.5.md
+++ b/ChangeLog-8.5.md
@@ -2,7 +2,7 @@
 
 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.23] - 2022-MM-DD
+## [8.5.23] - 2022-01-21
 
 ### Fixed
 
@@ -197,7 +197,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.23]: https://github.com/sebastianbergmann/phpunit/compare/8.5.22...8.5
+[8.5.23]: https://github.com/sebastianbergmann/phpunit/compare/8.5.22...8.5.23
 [8.5.22]: https://github.com/sebastianbergmann/phpunit/compare/8.5.21...8.5.22
 [8.5.21]: https://github.com/sebastianbergmann/phpunit/compare/8.5.20...8.5.21
 [8.5.20]: https://github.com/sebastianbergmann/phpunit/compare/8.5.19...8.5.20
diff --git a/src/Runner/Version.php b/src/Runner/Version.php
index 5052b8deda5..fd3a497eb74 100644
--- a/src/Runner/Version.php
+++ b/src/Runner/Version.php
@@ -38,7 +38,7 @@ public static function id(): string
         }
 
         if (self::$version === '') {
-            self::$version = (new VersionId('8.5.22', dirname(__DIR__, 2)))->getVersion();
+            self::$version = (new VersionId('8.5.23', dirname(__DIR__, 2)))->getVersion();
         }
 
         return self::$version;