Merge branch '6.3'

Author: sebastianbergmann

ChangeLog-5.7.md

@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 5.7 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [5.7.22] - 2017-MM-DD
+
+### Fixed
+
+* Fixed [#2769](https://github.com/sebastianbergmann/phpunit/issues/2769): Usage of `setUseErrorHandler()` produces `Undefined variable` error
+
 ## [5.7.21] - 2017-06-21
 
 ### Added
@@ -171,6 +177,7 @@ All notable changes of the PHPUnit 5.7 release series are documented in this fil
 * The `--tap` and `--log-tap` commandline options have been deprecated
 * The `--self-update` and `--self-upgrade` commandline options have been deprecated (PHAR binary only)
 
+[5.7.22]: https://github.com/sebastianbergmann/phpunit/compare/5.7.21...5.7.22
 [5.7.21]: https://github.com/sebastianbergmann/phpunit/compare/5.7.20...5.7.21
 [5.7.20]: https://github.com/sebastianbergmann/phpunit/compare/5.7.19...5.7.20
 [5.7.19]: https://github.com/sebastianbergmann/phpunit/compare/5.7.18...5.7.19

ChangeLog-6.3.md

@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 6.3 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [6.3.1] - 2017-MM-DD
+
+### Fixed
+
+* Fixed [#2769](https://github.com/sebastianbergmann/phpunit/issues/2769): Usage of `setUseErrorHandler()` produces `Undefined variable` error
+
 ## [6.3.0] - 2017-08-04
 
 ### Added
@@ -13,5 +19,6 @@ All notable changes of the PHPUnit 6.3 release series are documented in this fil
 
 * Implemented [#2751](https://github.com/sebastianbergmann/phpunit/pull/2751): Use `fopen()` instead of `is_readable()` to check if a file is readable (workaround for Windows and network shares) 
 
+[6.3.1]: https://github.com/sebastianbergmann/phpunit/compare/6.3.0...6.3.1
 [6.3.0]: https://github.com/sebastianbergmann/phpunit/compare/6.2...6.3.0
 

src/Framework/TestCase.php

@@ -890,7 +890,7 @@ public function run(TestResult $result = null)
             $result->run($this);
         }
 
-        if ($this->useErrorHandler !== null) {
+        if (isset($oldErrorHandlerSetting)) {
             $result->convertErrorsToExceptions($oldErrorHandlerSetting);
         }