Merge branch '6.0' into 6.1

* 6.0: (27 commits)
  [DoctrineBridge] fix tests
  [HttpKernel] Fix session test cases for symfony
  [FrameworkBundle] Fix missing arguments when a serialization default context is bound
  [Runtime] Fix --env and --no-debug with dotenv_overload
  [Cache] fix merge
  cs fix
  [Finder] Fix finding VCS re-included files in excluded directory
  [Yaml] Improve the deprecation warnings for octal numbers to suggest migrating
  Fix Choice constraint with associative choices array
  [Form] UrlType should not add protocol to emails
  [Dotenv] Fix bootEnv() override with .env.local.php when the env key already exists
  Silence isatty warnings during tty detection
  [Serializer] Fix AbstractObjectNormalizer not considering pseudo type false
  [Notifier] Fix encoding of messages with FreeMobileTransport
  [Cache] workaround PHP crash
  [Console] Fix PHP 8.1 deprecation in ChoiceQuestion
  [HttpKernel] Fix compatibility with php bridge and already started php sessions
  [Notifier] smsapi-notifier - correct encoding
  Replaced full CoC text with link to documentation
  Making the parser stateless
  ...

Author: nicolas-grekas

SymfonyRuntime.php

@@ -98,13 +98,24 @@ public function __construct(array $options = [])
         } elseif (isset($_SERVER['argv']) && class_exists(ArgvInput::class)) {
             $this->options = $options;
             $this->getInput();
+            $inputEnv = $_SERVER[$envKey] ?? null;
+            $inputDebug = $_SERVER[$debugKey] ?? null;
         }
 
         if (!($options['disable_dotenv'] ?? false) && isset($options['project_dir']) && !class_exists(MissingDotenv::class, false)) {
             (new Dotenv($envKey, $debugKey))
                 ->setProdEnvs((array) ($options['prod_envs'] ?? ['prod']))
                 ->usePutenv($options['use_putenv'] ?? false)
-                ->bootEnv($options['project_dir'].'/'.($options['dotenv_path'] ?? '.env'), 'dev', (array) ($options['test_envs'] ?? ['test']), $options['dotenv_overload'] ?? false);
+                ->bootEnv($options['project_dir'].'/'.($options['dotenv_path'] ?? '.env'), 'dev', (array) ($options['test_envs'] ?? ['test']), $dotenvOverload = $options['dotenv_overload'] ?? false);
+            if ($dotenvOverload) {
+                if (isset($inputEnv) && $inputEnv !== $_SERVER[$envKey]) {
+                    throw new \LogicException(sprintf('Cannot use "--env" or "-e" when the "%s" file defines "%s" and the "dotenv_overload" runtime option is true.', $options['dotenv_path'] ?? '.env', $envKey));
+                }
+
+                if (isset($inputDebug) && $inputDebug !== $_SERVER[$debugKey]) {
+                    putenv($debugKey.'='.$_SERVER[$debugKey] = $_ENV[$debugKey] = $inputDebug);
+                }
+            }
             $options['debug'] ??= '1' === $_SERVER[$debugKey];
             $options['disable_dotenv'] = true;
         } else {

Tests/phpt/.env

@@ -1,3 +1,4 @@
 SOME_VAR=foo_bar
 ENV_MODE=foo
 DEBUG_MODE=0
+DEBUG_ENABLED=1

Tests/phpt/dotenv_overload_command_env_conflict.php

@@ -0,0 +1,10 @@
+<?php
+
+$_SERVER['APP_RUNTIME_OPTIONS'] = [
+    'env_var_name' => 'ENV_MODE',
+    'dotenv_overload' => true,
+];
+
+require __DIR__.'/autoload.php';
+
+return static function (): void {};

Tests/phpt/dotenv_overload_command_env_conflict.phpt

@@ -0,0 +1,17 @@
+--TEST--
+Test that a command --env option conflicts with the different one defined in .env when the dotenv_overload option is true
+--INI--
+display_errors=1
+--FILE--
+<?php
+
+$_SERVER['argv'] = [
+    'my_app',
+    '--env=ccc',
+];
+$_SERVER['argc'] = 2;
+require $_SERVER['SCRIPT_FILENAME'] = __DIR__.'/dotenv_overload_command_env_conflict.php';
+
+?>
+--EXPECTF--
+Fatal error: Uncaught LogicException: Cannot use "--env" or "-e" when the ".env" file defines "ENV_MODE" and the "dotenv_overload" runtime option is true.%a

Tests/phpt/dotenv_overload_command_no_debug.php

@@ -0,0 +1,17 @@
+<?php
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Output\OutputInterface;
+
+$_SERVER['APP_RUNTIME_OPTIONS'] = [
+    'debug_var_name' => 'DEBUG_ENABLED',
+    'dotenv_overload' => true,
+];
+
+require __DIR__.'/autoload.php';
+
+return static function (Command $command, OutputInterface $output, array $context): Command {
+    return $command->setCode(static function () use ($output, $context): void {
+        $output->writeln($context['DEBUG_ENABLED']);
+    });
+};

Tests/phpt/dotenv_overload_command_no_debug.phpt

@@ -0,0 +1,17 @@
+--TEST--
+Test that a command --no-debug option has a higher priority than the debug value defined in .env when the dotenv_overload option is true
+--INI--
+display_errors=1
+--FILE--
+<?php
+
+$_SERVER['argv'] = [
+    'my_app',
+    '--no-debug'
+];
+$_SERVER['argc'] = 2;
+require $_SERVER['SCRIPT_FILENAME'] = __DIR__.'/dotenv_overload_command_no_debug.php';
+
+?>
+--EXPECTF--
+0