Merge branch '7.4' into 8.0

nicolas-grekas · nicolas-grekas · commit 7113778e2e91 · 2026-04-29T17:02:55.000+02:00
* 7.4: (23 commits)
  [Form] Preserve collection children added by PRE_SET_DATA listeners
  [Messenger] Keep deduplication lock when handler throws
  [Mailer][Postmark] Handle alternate error payload shapes for Payload Too Large
  CS fix
  [Serializer] Catch TypeError when setting an attribute to collect denormalization errors
  [Config] Allow env placeholders in NumericNode min/max checks
  [Mime] Preserve inline part filename instead of overwriting it with the Content-ID
  [FrameworkBundle] Apply tagged MIME type guessers in File::getMimeType()
  [Notifier] [Ntfy] Fix Basic auth header by keeping base64 padding
  [MonologBridge] Guard against re-entrant calls in AbstractTokenProcessor
  [RateLimiter] Keep token bucket alive while reservation debt is unpaid
  [Lock] Avoid aborting outer PostgreSQL transaction on lock contention
  [HttpClient] Don't share CURL_LOCK_DATA_CONNECT to honor max_host_connections
  [Validator] fix mapping properties using property hooks
  [DoctrineBridge] Fail with a clear exception when symfony/form is missing
  [DoctrineBridge] Prevent install with incompatible symfony/property-info versions
  [AssetMapper] Allow spaces in version constraints
  [Dotenv] Strip NUL byte placeholder from values passed to `putenv()`
  [Cache] Normalize default_lifetime for pools wrapped by ChainAdapter
  [Config] Fix array-shape generator dropping alternative types on nested PrototypedArrayNode
  ...

# Conflicts:
#	src/Symfony/Bridge/Doctrine/Tests/Types/DatePointTypeTest.php
#	src/Symfony/Bridge/Doctrine/Tests/Types/UlidTypeTest.php
#	src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
#	src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
#	src/Symfony/Component/JsonStreamer/Tests/JsonStreamReaderTest.php
#	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
#	src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php
#	src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
#	src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
#	src/Symfony/Component/TypeInfo/Tests/TypeFactoryTest.php
diff --git a/Tests/ApplicationTest.php b/Tests/ApplicationTest.php
@@ -2485,7 +2485,7 @@ public function testAlarmSubscriberNotCalledForOtherSignals()
     #[RequiresPhpExtension('pcntl')]
     public function testAlarmSubscriber()
     {
-        $command = new BaseSignableCommand(signal: \SIGALRM);
+        $command = new BaseSignableCommand(true, \SIGALRM);
 
         $subscriber1 = new AlarmEventSubscriber();
         $subscriber2 = new AlarmEventSubscriber();
@@ -2703,7 +2703,7 @@ public function testsPreservedHelpOptionWhenItsAnAlternative()
     #[TestWith([4])]
     public function testAlarmSubscriberCalledAfterSignalSubscriberAndInheritsExitCode(int|false $exitCode)
     {
-        $command = new BaseSignableCommand(signal: \SIGALRM);
+        $command = new BaseSignableCommand(true, \SIGALRM);
 
         $subscriber1 = new class($exitCode) extends SignalEventSubscriber {
             public function __construct(private int|false $exitCode)
diff --git a/Tests/Command/CompleteCommandTest.php b/Tests/Command/CompleteCommandTest.php
@@ -37,7 +37,7 @@ protected function setUp(): void
         $this->application = new Application();
         $this->application->addCommand(new CompleteCommandTest_HelloCommand());
         $this->application->getDefinition()
-            ->addOption(new InputOption('global-option', null, InputOption::VALUE_REQUIRED, suggestedValues: ['foo', 'bar', 'baz']));
+            ->addOption(new InputOption('global-option', null, InputOption::VALUE_REQUIRED, '', null, ['foo', 'bar', 'baz']));
 
         $this->command->setApplication($this->application);
         $this->tester = new CommandTester($this->command);
diff --git a/Tests/Exception/RunCommandFailedExceptionTest.php b/Tests/Exception/RunCommandFailedExceptionTest.php
@@ -41,8 +41,8 @@ private static function createException(\Throwable $inner): RunCommandFailedExce
             $inner,
             new RunCommandContext(
                 new RunCommandMessage('foo'),
-                exitCode: Command::FAILURE,
-                output: 'bar'
+                Command::FAILURE,
+                'bar'
             )
         );
     }
diff --git a/Tests/Fixtures/application_test_sigint.php b/Tests/Fixtures/application_test_sigint.php
@@ -18,7 +18,7 @@
 (new class extends Command {
     protected function configure(): void
     {
-        $this->addArgument('mode', InputArgument::OPTIONAL, default: 'single');
+        $this->addArgument('mode', InputArgument::OPTIONAL, '', 'single');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int
diff --git a/Tests/Messenger/RunCommandMessageHandlerTest.php b/Tests/Messenger/RunCommandMessageHandlerTest.php
@@ -60,7 +60,7 @@ public function testExecutesCommandThatThrowsException()
     public function testExecutesCommandThatCatchesThrownException()
     {
         $handler = new RunCommandMessageHandler($this->createApplicationWithCommand());
-        $context = $handler(new RunCommandMessage('test:command --throw -v', throwOnFailure: false, catchExceptions: true));
+        $context = $handler(new RunCommandMessage('test:command --throw -v', false, true));
 
         $this->assertSame(1, $context->exitCode);
         $this->assertStringContainsString('[RuntimeException]', $context->output);

Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@ private static function createException(\Throwable $inner): RunCommandFailedExce`
`41`	`41`	`$inner,`
`42`	`42`	`new RunCommandContext(`
`43`	`43`	`new RunCommandMessage('foo'),`
`44`		`- exitCode: Command::FAILURE,`
`45`		`- output: 'bar'`
	`44`	`+ Command::FAILURE,`
	`45`	`+ 'bar'`
`46`	`46`	`)`
`47`	`47`	`);`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`(new class extends Command {`
`19`	`19`	`protected function configure(): void`
`20`	`20`	`{`
`21`		`- $this->addArgument('mode', InputArgument::OPTIONAL, default: 'single');`
	`21`	`+ $this->addArgument('mode', InputArgument::OPTIONAL, '', 'single');`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`protected function execute(InputInterface $input, OutputInterface $output): int`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function testExecutesCommandThatThrowsException()`
`60`	`60`	`public function testExecutesCommandThatCatchesThrownException()`
`61`	`61`	`{`
`62`	`62`	`$handler = new RunCommandMessageHandler($this->createApplicationWithCommand());`
`63`		`- $context = $handler(new RunCommandMessage('test:command --throw -v', throwOnFailure: false, catchExceptions: true));`
	`63`	`+ $context = $handler(new RunCommandMessage('test:command --throw -v', false, true));`
`64`	`64`
`65`	`65`	`$this->assertSame(1, $context->exitCode);`
`66`	`66`	`$this->assertStringContainsString('[RuntimeException]', $context->output);`