Merge branch '8.5' into 9.3

Author: sebastianbergmann

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.9] - 2020-MM-DD
+
+### Fixed
+
+* [#4470](https://github.com/sebastianbergmann/phpunit/pull/4470): Infinite recursion when `--static-backup --strict-global-state` is used
+
 ## [8.5.8] - 2020-06-22
 
 ### Fixed
@@ -77,6 +83,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.9]: https://github.com/sebastianbergmann/phpunit/compare/8.5.8...8.5
 [8.5.8]: https://github.com/sebastianbergmann/phpunit/compare/8.5.7...8.5.8
 [8.5.7]: https://github.com/sebastianbergmann/phpunit/compare/8.5.6...8.5.7
 [8.5.6]: https://github.com/sebastianbergmann/phpunit/compare/8.5.5...8.5.6

src/Framework/TestCase.php

@@ -2298,6 +2298,7 @@ private function createGlobalStateSnapshot(bool $backupGlobals): Snapshot
             $excludeList->addClassNamePrefix('Symfony');
             $excludeList->addClassNamePrefix('Doctrine\Instantiator');
             $excludeList->addClassNamePrefix('Prophecy');
+            $excludeList->addStaticAttribute(ComparatorFactory::class, 'instance');
 
             foreach ($this->backupStaticAttributesExcludeList as $class => $attributes) {
                 foreach ($attributes as $attribute) {