Merge branch '7.4'

ChangeLog-7.4.md

@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 7.4 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [7.4.3] - 2018-10-23
+
+### Changed
+
+* Use `^3.1` of `sebastian/environment` again due to [regression](https://github.com/sebastianbergmann/environment/issues/31)
+
 ## [7.4.2] - 2018-10-23
 
 ### Fixed
@@ -25,6 +31,7 @@ All notable changes of the PHPUnit 7.4 release series are documented in this fil
 * Implemented [#3284](https://github.com/sebastianbergmann/phpunit/issues/3284): Ability to reorder tests based on execution time
 * Implemented [#3290](https://github.com/sebastianbergmann/phpunit/issues/3290): Ability to load a PHP script before any code of PHPUnit itself is loaded
 
+[7.4.3]: https://github.com/sebastianbergmann/phpunit/compare/7.4.2...7.4.3
 [7.4.2]: https://github.com/sebastianbergmann/phpunit/compare/7.4.1...7.4.2
 [7.4.1]: https://github.com/sebastianbergmann/phpunit/compare/7.4.0...7.4.1
 [7.4.0]: https://github.com/sebastianbergmann/phpunit/compare/7.3...7.4.0

composer.json

@@ -38,7 +38,7 @@
         "phpunit/php-timer": "^2.0",
         "sebastian/comparator": "^3.0",
         "sebastian/diff": "^3.0",
-        "sebastian/environment": "^4.0",
+        "sebastian/environment": "^3.1 || ^4.0",
         "sebastian/exporter": "^3.1",
         "sebastian/global-state": "^2.0",
         "sebastian/object-enumerator": "^3.0.3",

tests/end-to-end/regression/GitHub/2591-separate-function-no-preserve-no-bootstrap-xdebug.phpt

@@ -5,6 +5,8 @@ Expected result is to have an error, because of no classes loaded.
 <?php
 if (!extension_loaded('xdebug')) {
     print 'skip: xdebug not loaded';
+} elseif (version_compare(PHP_VERSION, '7.3.0-dev', '>=')) {
+     print 'skip: PHP < 7.3 required';
 }
 --FILE--
 <?php