Merge branch '6.2' into 6.3

derrabus · derrabus · commit 67cb4072ab1a · 2022-12-07T00:37:17.000+01:00
* 6.2: Bump Symfony version to 6.2.2 Update VERSION for 6.2.1 Update CHANGELOG for 6.2.1 [DependencyInjection] Fix `ContainerBuilder` stats env usage with enum [Mailer] Fix rendered templates for notifications [HttpKernel] Fix using entities with the #[Cache()] attribute [DependencyInjection] Remove refs that point to container.excluded services when allowed Revert "bug #48027 [DependencyInjection] Don't autoconfigure tag when it's already set with attributes (nicolas-grekas)" [WebProfilerBundle] Use same color as other icons for the close toolbar btn [Profiler] Fix the dump view panel
diff --git a/CHANGELOG-6.2.md b/CHANGELOG-6.2.md
@@ -7,6 +7,25 @@ in 6.2 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v6.2.0...v6.2.1
 
+* 6.2.1 (2022-12-06)
+
+ * bug #48502 [DependencyInjection] Fix `ContainerBuilder` stats env usage with enum (alamirault)
+ * bug #48509 [HttpKernel] Fix using entities with the `#[Cache()]` attribute (HypeMC)
+ * bug #48505 [Mailer] Fix rendered templates for notifications (fabpot)
+ * bug #48476 [WebProfilerBundle] Use same color as other icons for the close toolbar btn (ogizanagi)
+ * bug #48483 [DependencyInjection] Remove refs that point to container.excluded services when allowed (nicolas-grekas)
+ * bug #48346 [HttpKernel] In DateTimeValueResolver, convert previously defined date attribute to the expected class (GromNaN)
+ * bug #48450 [WebProfilerBundle] Fix form panel expanders (MatTheCat)
+ * bug #48459 [FrameworkBundle] [Framework] Fix Infobip Mailer transport factory import (gnito-org)
+ * bug #48461 [VarExporter] Fix possible memory-leak when using lazy-objects (nicolas-grekas)
+ * bug #48335 [TwigBridge] Amend `MoneyType` twig to include a space (mogilvie)
+ * bug #48046 [WebProfilerBundle] Remove redundant code from logger template (HypeMC)
+ * bug #48428 Fixed undefined variable error (Kevin Meijer)
+ * bug #48416 [FrameworkBundle] don't register the MailerTestCommand symfony/console is not installed (xabbuh)
+ * bug #48395 [String] Fix AsciiSlugger with emojis (fancyweb)
+ * bug #48385 [Security] Reuse `AbstractFactory`'s config tree in `AccessTokenFactory` (chalasr)
+ * bug #48292 [Security] [LoginLink] Throw InvalidLoginLinkException on missing parameter (MatTheCat)
+
 * 6.2.0 (2022-11-30)
 
  * bug #48395 [String] Fix AsciiSlugger with emojis (fancyweb)
diff --git a/src/Symfony/Bridge/Twig/Mime/BodyRenderer.php b/src/Symfony/Bridge/Twig/Mime/BodyRenderer.php
@@ -59,15 +59,13 @@ public function render(Message $message): void
 
         if ($template = $message->getTextTemplate()) {
             $message->text($this->twig->render($template, $vars));
-            $message->textTemplate(null);
         }
 
         if ($template = $message->getHtmlTemplate()) {
             $message->html($this->twig->render($template, $vars));
-            $message->htmlTemplate(null);
         }
 
-        $message->context([]);
+        $message->markAsRendered();
 
         // if text body is empty, compute one from the HTML body
         if (!$message->getTextBody() && null !== $html = $message->getHtmlBody()) {
diff --git a/src/Symfony/Bridge/Twig/Mime/NotificationEmail.php b/src/Symfony/Bridge/Twig/Mime/NotificationEmail.php
@@ -40,6 +40,7 @@ class NotificationEmail extends TemplatedEmail
         'raw' => false,
         'footer_text' => 'Notification e-mail sent by Symfony',
     ];
+    private bool $rendered = false;
 
     public function __construct(Headers $headers = null, AbstractPart $body = null)
     {
@@ -178,6 +179,18 @@ public function getContext(): array
         return array_merge($this->context, parent::getContext());
     }
 
+    public function isRendered(): bool
+    {
+        return $this->rendered;
+    }
+
+    public function markAsRendered(): void
+    {
+        parent::markAsRendered();
+
+        $this->rendered = true;
+    }
+
     public function getPreparedHeaders(): Headers
     {
         $headers = parent::getPreparedHeaders();
@@ -225,15 +238,17 @@ private function getExceptionAsString(\Throwable|FlattenException $exception): s
      */
     public function __serialize(): array
     {
-        return [$this->context, $this->theme, parent::__serialize()];
+        return [$this->context, $this->theme, $this->rendered, parent::__serialize()];
     }
 
     /**
      * @internal
      */
     public function __unserialize(array $data): void
     {
-        if (3 === \count($data)) {
+        if (4 === \count($data)) {
+            [$this->context, $this->theme, $this->rendered, $parentData] = $data;
+        } elseif (3 === \count($data)) {
             [$this->context, $this->theme, $parentData] = $data;
         } else {
             // Backwards compatibility for deserializing data structures that were serialized without the theme
diff --git a/src/Symfony/Bridge/Twig/Mime/TemplatedEmail.php b/src/Symfony/Bridge/Twig/Mime/TemplatedEmail.php
@@ -67,6 +67,18 @@ public function getContext(): array
         return $this->context;
     }
 
+    public function isRendered(): bool
+    {
+        return null === $this->htmlTemplate && null === $this->textTemplate;
+    }
+
+    public function markAsRendered(): void
+    {
+        $this->textTemplate = null;
+        $this->htmlTemplate = null;
+        $this->context = [];
+    }
+
     /**
      * @internal
      */
diff --git a/src/Symfony/Bundle/DebugBundle/Resources/views/Profiler/dump.html.twig b/src/Symfony/Bundle/DebugBundle/Resources/views/Profiler/dump.html.twig
@@ -68,7 +68,7 @@
             {{ dump.data|raw }}
         </div>
     {% else %}
-        <div class="empty">
+        <div class="empty empty-panel">
             <p>No content was dumped.</p>
         </div>
     {% endfor %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
@@ -125,6 +125,7 @@
 
 .sf-toolbarreset .hide-button {
     background: var(--sf-toolbar-gray-800);
+    color: var(--sf-toolbar-gray-300);
     display: block;
     position: absolute;
     top: 2px;
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
@@ -126,7 +126,7 @@ private function processDefinition(ContainerBuilder $container, string $id, Defi
                 foreach ($instanceofTags[$i] as $k => $v) {
                     if (null === $definition->getDecoratedService() || \in_array($k, $tagsToKeep, true)) {
                         foreach ($v as $v) {
-                            if ($definition->hasTag($k) && (!$v || \in_array($v, $definition->getTag($k)))) {
+                            if ($definition->hasTag($k) && \in_array($v, $definition->getTag($k))) {
                                 continue;
                             }
                             $definition->addTag($k, $v);
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php
@@ -95,7 +95,7 @@ private function processValue(mixed $value, int $rootLevel = 0, int $level = 0):
                 $value = array_values($value);
             }
         } elseif ($value instanceof Reference) {
-            if ($this->container->has($id = (string) $value)) {
+            if ($this->container->hasDefinition($id = (string) $value) ? !$this->container->getDefinition($id)->hasTag('container.excluded') : $this->container->hasAlias($id)) {
                 return $value;
             }
 
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
@@ -49,7 +49,7 @@ public function get(string $name): array|bool|string|int|float|\UnitEnum|null
             }
 
             $uniqueName = md5($name.'_'.self::$counter++);
-            $placeholder = sprintf('%s_%s_%s', $this->getEnvPlaceholderUniquePrefix(), strtr($env, ':-.', '___'), $uniqueName);
+            $placeholder = sprintf('%s_%s_%s', $this->getEnvPlaceholderUniquePrefix(), strtr($env, ':-.\\', '____'), $uniqueName);
             $this->envPlaceholders[$env][$placeholder] = $placeholder;
 
             return $placeholder;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php
@@ -849,7 +849,6 @@ static function (ChildDefinition $definition, CustomAutoconfiguration $attribute
                 $definition->addTag('app.custom_tag', get_object_vars($attribute) + ['class' => $reflector->getName()]);
             }
         );
-        $container->registerForAutoconfiguration(TaggedService1::class)->addTag('app.custom_tag');
 
         $container->register('one', TaggedService1::class)
             ->setPublic(true)
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInvalidReferencesPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInvalidReferencesPassTest.php
@@ -165,6 +165,17 @@ public function testProcessSetOnlyDecoratedAsNullOnInvalid()
         $this->assertEquals($unknownArgument, $decoratorDefinition->getArguments()[1]);
     }
 
+    public function testProcessExcludedServiceAndNullOnInvalid()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', \stdClass::class)->addTag('container.excluded');
+        $container->register('bar', \stdClass::class)->addArgument(new Reference('foo', $container::NULL_ON_INVALID_REFERENCE));
+
+        $this->process($container);
+
+        $this->assertSame([null], $container->getDefinition('bar')->getArguments());
+    }
+
     protected function process(ContainerBuilder $container)
     {
         $pass = new ResolveInvalidReferencesPass();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -51,6 +51,7 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\FooWithAbstractArgument;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\ScalarFactory;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\SimilarArgumentsDummy;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\StringBackedEnum;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\WitherStaticReturnType;
 use Symfony\Component\DependencyInjection\TypedReference;
 use Symfony\Component\ExpressionLanguage\Expression;
@@ -545,6 +546,23 @@ public function testEnvExpressionFunction()
         $this->assertEquals('Foo value', $container->get('bar')->foo);
     }
 
+    public function testGetEnvCountersWithEnum()
+    {
+        $bag = new EnvPlaceholderParameterBag();
+        $config = new ContainerBuilder($bag);
+        $config->resolveEnvPlaceholders([
+            $bag->get('env(enum:'.StringBackedEnum::class.':foo)'),
+            $bag->get('env(Bar)'),
+        ]);
+
+        $expected = [
+            'enum:Symfony\Component\DependencyInjection\Tests\Fixtures\StringBackedEnum:foo' => 1,
+            'Bar' => 1,
+        ];
+
+        $this->assertSame($expected, $config->getEnvCounters());
+    }
+
     public function testCreateServiceWithAbstractArgument()
     {
         $this->expectException(RuntimeException::class);
diff --git a/src/Symfony/Component/HttpKernel/EventListener/CacheAttributeListener.php b/src/Symfony/Component/HttpKernel/EventListener/CacheAttributeListener.php
@@ -16,7 +16,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Attribute\Cache;
-use Symfony\Component\HttpKernel\Event\ControllerEvent;
+use Symfony\Component\HttpKernel\Event\ControllerArgumentsEvent;
 use Symfony\Component\HttpKernel\Event\ResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 
@@ -47,7 +47,7 @@ public function __construct(
     /**
      * Handles HTTP validation headers.
      */
-    public function onKernelController(ControllerEvent $event)
+    public function onKernelControllerArguments(ControllerArgumentsEvent $event)
     {
         $request = $event->getRequest();
 
@@ -63,12 +63,12 @@ public function onKernelController(ControllerEvent $event)
         /** @var Cache[] $attributes */
         foreach ($attributes as $cache) {
             if (null !== $cache->lastModified) {
-                $lastModified = $this->getExpressionLanguage()->evaluate($cache->lastModified, $request->attributes->all());
+                $lastModified = $this->getExpressionLanguage()->evaluate($cache->lastModified, array_merge($request->attributes->all(), $event->getNamedArguments()));
                 ($response ??= new Response())->setLastModified($lastModified);
             }
 
             if (null !== $cache->etag) {
-                $etag = hash('sha256', $this->getExpressionLanguage()->evaluate($cache->etag, $request->attributes->all()));
+                $etag = hash('sha256', $this->getExpressionLanguage()->evaluate($cache->etag, array_merge($request->attributes->all(), $event->getNamedArguments())));
                 ($response ??= new Response())->setEtag($etag);
             }
         }
@@ -169,7 +169,7 @@ public function onKernelResponse(ResponseEvent $event)
     public static function getSubscribedEvents(): array
     {
         return [
-            KernelEvents::CONTROLLER => ['onKernelController', 10],
+            KernelEvents::CONTROLLER_ARGUMENTS => ['onKernelControllerArguments', 10],
             KernelEvents::RESPONSE => ['onKernelResponse', -10],
         ];
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/CacheAttributeListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/CacheAttributeListenerTest.php
diff --git a/src/Symfony/Component/Mailer/Transport/AbstractTransport.php b/src/Symfony/Component/Mailer/Transport/AbstractTransport.php
diff --git a/src/Symfony/Component/Mailer/composer.json b/src/Symfony/Component/Mailer/composer.json

Original file line number	Diff line number	Diff line change
`@@ -59,15 +59,13 @@ public function render(Message $message): void`
`59`	`59`
`60`	`60`	`if ($template = $message->getTextTemplate()) {`
`61`	`61`	`$message->text($this->twig->render($template, $vars));`
`62`		`- $message->textTemplate(null);`
`63`	`62`	`}`
`64`	`63`
`65`	`64`	`if ($template = $message->getHtmlTemplate()) {`
`66`	`65`	`$message->html($this->twig->render($template, $vars));`
`67`		`- $message->htmlTemplate(null);`
`68`	`66`	`}`
`69`	`67`
`70`		`- $message->context([]);`
	`68`	`+ $message->markAsRendered();`
`71`	`69`
`72`	`70`	`// if text body is empty, compute one from the HTML body`
`73`	`71`	`if (!$message->getTextBody() && null !== $html = $message->getHtmlBody()) {`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ private function processDefinition(ContainerBuilder $container, string $id, Defi`
`126`	`126`	`foreach ($instanceofTags[$i] as $k => $v) {`
`127`	`127`	`if (null === $definition->getDecoratedService() \|\| \in_array($k, $tagsToKeep, true)) {`
`128`	`128`	`foreach ($v as $v) {`
`129`		`- if ($definition->hasTag($k) && (!$v \|\| \in_array($v, $definition->getTag($k)))) {`
	`129`	`+ if ($definition->hasTag($k) && \in_array($v, $definition->getTag($k))) {`
`130`	`130`	`continue;`
`131`	`131`	`}`
`132`	`132`	`$definition->addTag($k, $v);`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ private function processValue(mixed $value, int $rootLevel = 0, int $level = 0):`
`95`	`95`	`$value = array_values($value);`
`96`	`96`	`}`
`97`	`97`	`} elseif ($value instanceof Reference) {`
`98`		`- if ($this->container->has($id = (string) $value)) {`
	`98`	`+ if ($this->container->hasDefinition($id = (string) $value) ? !$this->container->getDefinition($id)->hasTag('container.excluded') : $this->container->hasAlias($id)) {`
`99`	`99`	`return $value;`
`100`	`100`	`}`
`101`	`101`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function get(string $name): array\|bool\|string\|int\|float\|\UnitEnum\|null`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`$uniqueName = md5($name.'_'.self::$counter++);`
`52`		`- $placeholder = sprintf('%s_%s_%s', $this->getEnvPlaceholderUniquePrefix(), strtr($env, ':-.', '___'), $uniqueName);`
	`52`	`+ $placeholder = sprintf('%s_%s_%s', $this->getEnvPlaceholderUniquePrefix(), strtr($env, ':-.\\', '____'), $uniqueName);`
`53`	`53`	`$this->envPlaceholders[$env][$placeholder] = $placeholder;`
`54`	`54`
`55`	`55`	`return $placeholder;`
Original file line number	Diff line number	Diff line change
`@@ -849,7 +849,6 @@ static function (ChildDefinition $definition, CustomAutoconfiguration $attribute`
`849`	`849`	`$definition->addTag('app.custom_tag', get_object_vars($attribute) + ['class' => $reflector->getName()]);`
`850`	`850`	`}`
`851`	`851`	`);`
`852`		`- $container->registerForAutoconfiguration(TaggedService1::class)->addTag('app.custom_tag');`
`853`	`852`
`854`	`853`	`$container->register('one', TaggedService1::class)`
`855`	`854`	`->setPublic(true)`