Merge branch '7.0' into 7.1

* 7.0:
  fix merge
  fix test
  fix test
  [SecurityBundle] Fix failing tests
  fix tests
  [DependencyInjection] fix unable to make lazy service from readonly class
  [Dotenv] Specify envKey while loading variables with the dotenv:dump command
  [Mailer][Postmark][Webhook] Accept different date formats

Author: xabbuh

src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php

@@ -609,7 +609,9 @@ private function generateProxyClasses(): array
                 $proxyCode = substr(self::stripComments($proxyCode), 5);
             }
 
-            $proxyClass = explode(' ', $this->inlineRequires ? substr($proxyCode, \strlen($code)) : $proxyCode, 3)[1];
+            $proxyClass = $this->inlineRequires ? substr($proxyCode, \strlen($code)) : $proxyCode;
+            $i = strpos($proxyClass, 'class');
+            $proxyClass = substr($proxyClass, 6 + $i, strpos($proxyClass, ' ', 7 + $i) - $i - 6);
 
             if ($this->asFiles || $this->namespace) {
                 $proxyCode .= "\nif (!\\class_exists('$proxyClass', false)) {\n    \\class_alias(__NAMESPACE__.'\\\\$proxyClass', '$proxyClass', false);\n}\n";

src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/LazyServiceDumper.php

@@ -105,7 +105,7 @@ public function getProxyCode(Definition $definition, ?string $id = null): string
 
         if ($asGhostObject) {
             try {
-                return 'class '.$proxyClass.ProxyHelper::generateLazyGhost($class);
+                return (\PHP_VERSION_ID >= 80200 && $class?->isReadOnly() ? 'readonly ' : '').'class '.$proxyClass.ProxyHelper::generateLazyGhost($class);
             } catch (LogicException $e) {
                 throw new InvalidArgumentException(sprintf('Cannot generate lazy ghost for service "%s".', $id ?? $definition->getClass()), 0, $e);
             }

src/Symfony/Component/DependencyInjection/Tests/Fixtures/ReadOnlyClass.php

@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
+
+readonly class ReadOnlyClass
+{
+    public function say(): string
+    {
+        return 'hello';
+    }
+}

src/Symfony/Component/DependencyInjection/Tests/LazyProxy/PhpDumper/LazyServiceDumperTest.php

@@ -16,6 +16,7 @@
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\LazyServiceDumper;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\ReadOnlyClass;
 
 class LazyServiceDumperTest extends TestCase
 {
@@ -52,6 +53,18 @@ public function testInvalidClass()
         $this->expectExceptionMessage('Invalid "proxy" tag for service "stdClass": class "stdClass" doesn\'t implement "Psr\Container\ContainerInterface".');
         $dumper->getProxyCode($definition);
     }
+
+    /**
+     * @requires PHP 8.3
+     */
+    public function testReadonlyClass()
+    {
+        $dumper = new LazyServiceDumper();
+        $definition = (new Definition(ReadOnlyClass::class))->setLazy(true);
+
+        $this->assertTrue($dumper->isProxyCandidate($definition));
+        $this->assertStringContainsString('readonly class ReadOnlyClassGhost', $dumper->getProxyCode($definition));
+    }
 }
 
 final class TestContainer implements ContainerInterface

src/Symfony/Component/Dotenv/Command/DotenvDumpCommand.php

@@ -91,10 +91,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
     private function loadEnv(string $dotenvPath, string $env, array $config): array
     {
-        $dotenv = new Dotenv();
         $envKey = $config['env_var_name'] ?? 'APP_ENV';
         $testEnvs = $config['test_envs'] ?? ['test'];
 
+        $dotenv = new Dotenv($envKey);
+
         $globalsBackup = [$_SERVER, $_ENV];
         unset($_SERVER[$envKey]);
         $_ENV = [$envKey => $env];

src/Symfony/Component/Mailer/Bridge/Postmark/RemoteEvent/PostmarkPayloadConverter.php

@@ -47,7 +47,14 @@ public function convert(array $payload): AbstractMailerEvent
             'SpamComplaint' => $payload['BouncedAt'],
             default => throw new ParseException(sprintf('Unsupported event "%s".', $payload['RecordType'])),
         };
-        if (!$date = \DateTimeImmutable::createFromFormat('Y-m-d\TH:i:sT', $payloadDate)) {
+
+        $date = \DateTimeImmutable::createFromFormat(\DateTimeInterface::ATOM, $payloadDate)
+            // microseconds, 6 digits
+            ?: \DateTimeImmutable::createFromFormat('Y-m-d\TH:i:s.uP', $payloadDate)
+            // microseconds, 7 digits
+            ?: \DateTimeImmutable::createFromFormat('Y-m-d\TH:i:s.u?P', $payloadDate);
+
+        if (!$date) {
             throw new ParseException(sprintf('Invalid date "%s".', $payloadDate));
         }
         $event->setDate($date);

src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/bounce.json

@@ -16,7 +16,7 @@
     "Details": "Test bounce details",
     "Email": "[email protected]",
     "From": "[email protected]",
-    "BouncedAt": "2022-09-02T14:29:19Z",
+    "BouncedAt": "2022-09-02T14:29:19.1234567Z",
     "DumpAvailable": true,
     "Inactive": true,
     "CanActivate": true,

src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/bounce.php

@@ -7,6 +7,6 @@
 $wh->setTags(['Test']);
 $wh->setMetadata(['example' => 'value', 'example_2' => 'value']);
 $wh->setReason('The server was unable to deliver your message (ex: unknown user, mailbox not found).');
-$wh->setDate(\DateTimeImmutable::createFromFormat('Y-m-d\TH:i:sT', '2022-09-02T14:29:19Z'));
+$wh->setDate(\DateTimeImmutable::createFromFormat('Y-m-d\TH:i:s.uP', '2022-09-02T14:29:19.123456Z'));
 
 return $wh;

src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/delivery.php

@@ -7,6 +7,6 @@
 $wh->setTags(['welcome-email']);
 $wh->setMetadata(['example' => 'value', 'example_2' => 'value']);
 $wh->setReason('');
-$wh->setDate(\DateTimeImmutable::createFromFormat('Y-m-d\TH:i:sT', '2022-09-02T11:49:27Z'));
+$wh->setDate(\DateTimeImmutable::createFromFormat(\DateTimeInterface::ATOM, '2022-09-02T11:49:27Z'));
 
 return $wh;

src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/link_click.php

@@ -6,6 +6,6 @@
 $wh->setRecipientEmail('[email protected]');
 $wh->setTags(['welcome-email']);
 $wh->setMetadata(['example' => 'value', 'example_2' => 'value']);
-$wh->setDate(\DateTimeImmutable::createFromFormat('Y-m-d\TH:i:sT', '2022-09-02T14:31:09Z'));
+$wh->setDate(\DateTimeImmutable::createFromFormat(\DateTimeInterface::ATOM, '2022-09-02T14:31:09Z'));
 
 return $wh;