Merge branch '6.4' into 7.0

* 6.4:
  [PhpUnitBridge] Fix requiring bootstrap.php
  [Messenger] Prevent `StopWorkerOnSignalsListener::$signals` to be assigned to null in case `SIGTERM` constant doesn't exist

Author: nicolas-grekas

bin/simple-phpunit.php

@@ -256,8 +256,6 @@
         if ('\\' === \DIRECTORY_SEPARATOR) {
             file_put_contents('composer.json', preg_replace('/^( {8})"phpunit-bridge": \{$/m', "$0\n$1    ".'"options": {"symlink": false},', file_get_contents('composer.json')));
         }
-        $phpunitBridgeComposerJson = file_get_contents($path.'/composer.json');
-        file_put_contents($path.'/composer.json', preg_replace('/^( {8})"files": .*/m', '', $phpunitBridgeComposerJson));
     } else {
         $passthruOrFail("$COMPOSER require --no-update symfony/phpunit-bridge \"*\"");
     }
@@ -267,9 +265,6 @@
     // --no-suggest is not in the list to keep compat with composer 1.0, which is shipped with Ubuntu 16.04LTS
     $exit = proc_close(proc_open("$q$COMPOSER install --no-dev --prefer-dist --no-progress $q", [], $p, getcwd()));
     putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));
-    if (file_exists($path)) {
-        file_put_contents($path.'/composer.json', $phpunitBridgeComposerJson);
-    }
     if ($prevCacheDir) {
         putenv("COMPOSER_CACHE_DIR=$prevCacheDir");
     }

bootstrap.php

@@ -25,6 +25,10 @@
     return;
 }
 
+if (isset($fileIdentifier)) {
+    unset($GLOBALS['__composer_autoload_files'][$fileIdentifier]);
+}
+
 // Enforce a consistent locale
 setlocale(\LC_ALL, 'C');