Merge branch '6.3' into 6.4

nicolas-grekas · nicolas-grekas · commit ad0a0325e85b · 2023-06-02T17:19:46.000+02:00
* 6.3:
  [PhpUnitBridge] Fix requiring bootstrap.php
  [Messenger] Prevent `StopWorkerOnSignalsListener::$signals` to be assigned to null in case `SIGTERM` constant doesn't exist
diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php
@@ -260,8 +260,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 \"*\"");
     }
@@ -271,9 +269,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");
     }
diff --git a/src/Symfony/Bridge/PhpUnit/bootstrap.php b/src/Symfony/Bridge/PhpUnit/bootstrap.php
@@ -25,6 +25,10 @@
     return;
 }
 
+if (isset($fileIdentifier)) {
+    unset($GLOBALS['__composer_autoload_files'][$fileIdentifier]);
+}
+
 // Enforce a consistent locale
 setlocale(\LC_ALL, 'C');
 
diff --git a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSignalsListener.php b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSignalsListener.php
@@ -29,7 +29,7 @@ public function __construct(array $signals = null, LoggerInterface $logger = nul
         if (null === $signals && \defined('SIGTERM')) {
             $signals = [SIGTERM, SIGINT];
         }
-        $this->signals = $signals;
+        $this->signals = $signals ?? [];
         $this->logger = $logger;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -260,8 +260,6 @@`
`260`	`260`	`if ('\\' === \DIRECTORY_SEPARATOR) {`
`261`	`261`	`file_put_contents('composer.json', preg_replace('/^( {8})"phpunit-bridge": \{$/m', "$0\n$1 ".'"options": {"symlink": false},', file_get_contents('composer.json')));`
`262`	`262`	`}`
`263`		`- $phpunitBridgeComposerJson = file_get_contents($path.'/composer.json');`
`264`		`- file_put_contents($path.'/composer.json', preg_replace('/^( {8})"files": .*/m', '', $phpunitBridgeComposerJson));`
`265`	`263`	`} else {`
`266`	`264`	`$passthruOrFail("$COMPOSER require --no-update symfony/phpunit-bridge \"*\"");`
`267`	`265`	`}`
`@@ -271,9 +269,6 @@`
`271`	`269`	`// --no-suggest is not in the list to keep compat with composer 1.0, which is shipped with Ubuntu 16.04LTS`
`272`	`270`	`$exit = proc_close(proc_open("$q$COMPOSER install --no-dev --prefer-dist --no-progress $q", [], $p, getcwd()));`
`273`	`271`	`putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));`
`274`		`- if (file_exists($path)) {`
`275`		`- file_put_contents($path.'/composer.json', $phpunitBridgeComposerJson);`
`276`		`- }`
`277`	`272`	`if ($prevCacheDir) {`
`278`	`273`	`putenv("COMPOSER_CACHE_DIR=$prevCacheDir");`
`279`	`274`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,10 @@`
`25`	`25`	`return;`
`26`	`26`	`}`
`27`	`27`
	`28`	`+if (isset($fileIdentifier)) {`
	`29`	`+ unset($GLOBALS['__composer_autoload_files'][$fileIdentifier]);`
	`30`	`+}`
	`31`	`+`
`28`	`32`	`// Enforce a consistent locale`
`29`	`33`	`setlocale(\LC_ALL, 'C');`
`30`	`34`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function __construct(array $signals = null, LoggerInterface $logger = nul`
`29`	`29`	`if (null === $signals && \defined('SIGTERM')) {`
`30`	`30`	`$signals = [SIGTERM, SIGINT];`
`31`	`31`	`}`
`32`		`- $this->signals = $signals;`
	`32`	`+ $this->signals = $signals ?? [];`
`33`	`33`	`$this->logger = $logger;`
`34`	`34`	`}`
`35`	`35`