From d80ba530783e54241afcb7a1c70ecd9601d3c0f0 Mon Sep 17 00:00:00 2001
From: Sebastian Bergmann <sb@sebastian-bergmann.de>
Date: Tue, 23 Oct 2018 07:55:46 +0200
Subject: [PATCH 1/3] Revert "Cleanup"

This reverts commit 4fa64a49f4592689886b36b146130a8bb34102da.
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 6a09da59549..a295cc6b41d 100644
--- a/composer.json
+++ b/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",

From c151651fb6ed264038d486ea262e243af72e5e64 Mon Sep 17 00:00:00 2001
From: Sebastian Bergmann <sb@sebastian-bergmann.de>
Date: Tue, 23 Oct 2018 07:57:41 +0200
Subject: [PATCH 2/3] Prepare release

---
 ChangeLog-7.4.md       | 7 +++++++
 src/Runner/Version.php | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog-7.4.md b/ChangeLog-7.4.md
index 3f89d9efc9a..d73e401330c 100644
--- a/ChangeLog-7.4.md
+++ b/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
diff --git a/src/Runner/Version.php b/src/Runner/Version.php
index 5a026f1e097..35e2fcfc16c 100644
--- a/src/Runner/Version.php
+++ b/src/Runner/Version.php
@@ -30,7 +30,7 @@ public static function id(): string
         }
 
         if (self::$version === null) {
-            $version       = new VersionId('7.4.2', \dirname(__DIR__, 2));
+            $version       = new VersionId('7.4.3', \dirname(__DIR__, 2));
             self::$version = $version->getVersion();
         }
 

From 5044b628a83d61adbadd2bb2cd1eaf71430e6a2a Mon Sep 17 00:00:00 2001
From: Sebastian Bergmann <sb@sebastian-bergmann.de>
Date: Mon, 29 Oct 2018 08:35:34 +0100
Subject: [PATCH 3/3] Closes #3361

---
 .../2591-separate-function-no-preserve-no-bootstrap-xdebug.phpt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/end-to-end/regression/GitHub/2591-separate-function-no-preserve-no-bootstrap-xdebug.phpt b/tests/end-to-end/regression/GitHub/2591-separate-function-no-preserve-no-bootstrap-xdebug.phpt
index 0003ff25626..866f10f232f 100644
--- a/tests/end-to-end/regression/GitHub/2591-separate-function-no-preserve-no-bootstrap-xdebug.phpt
+++ b/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