Merge branch '7.1' into 7.2

* 7.1: (31 commits)
  [Serializer] Remove useless calls to `func_get_arg()`
  fix tests using Twig 3.12
  skip tests requiring the intl extension if it's not installed
  🐛 throw ParseException on invalid date
  [FrameworkBundle] Re-remove redundant name attribute from `default_context`
  fix permitted data type of the default choice
  [ExpressionLanguage] Improve test coverage
  Fix invalid phpdoc in ContainerBuilder
  [HttpKernel] [WebProfileBundle] Fix Routing panel for URLs with a colon
  [Form] NumberType: Fix parsing of numbers in exponential notation with negative exponent
  Fix importing PHP config in prepend extension method
  [Messenger] Prevent waiting time to overflow when using long delays
  [Security] consistent singular/plural translation in Dutch
  reset the validation context after validating nested constraints
  do not duplicate directory separators
  fix handling empty data in ValueToDuplicatesTransformer
  fix compatibility with redis extension 6.0.3+
  synchronize unsupported scheme tests
  [String] Fixed Quorum plural, that was inflected to be only "Quora" and never "Quorums"
  Fix symfony/kaz-info-teh-notifier package
  ...

Author: xabbuh

CHANGELOG-7.0.md

@@ -7,6 +7,34 @@ in 7.0 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/v7.0.0...v7.0.1
 
+* 7.0.10 (2024-07-26)
+
+ * bug #57803 [FrameworkBundle] move adding detailed JSON error messages to the validate phase (xabbuh)
+ * bug #57815 [Console][PhpUnitBridge][VarDumper] Fix `NO_COLOR` empty value handling (alexandre-daubois)
+ * bug #57828 [Translation] Fix CSV escape char in `CsvFileLoader` on PHP >= 7.4 (alexandre-daubois)
+ * bug #57812 [Validator] treat uninitialized properties referenced by property paths as null (xabbuh)
+ * bug #57816 [DoctrineBridge] fix messenger bus dispatch inside an active transaction (IndraGunawan)
+ * bug #57799 [ErrorHandler][VarDumper] Remove PHP 8.4 deprecations (alexandre-daubois)
+ * bug #57772 [WebProfilerBundle] Add word wrap in tables in dialog to see all the text in workflow listeners dialog (SpartakusMd)
+ * bug #57802 [PropertyInfo] Fix nullable value returned from extractFromMutator on CollectionType (benjilebon)
+ * bug #57832 [DependencyInjection] Do not try to load default method name on interface (lyrixx)
+ * bug #57748 [SecurityBundle] use firewall-specific user checkers when manually logging in users (xabbuh)
+ * bug #57753 [ErrorHandler] restrict the maximum length of the X-Debug-Exception header (xabbuh)
+ * bug #57646 [Serializer] Raise correct exception in `ArrayDenormalizer` when called without a nested denormalizer (derrabus)
+ * bug #57674 [Cache] Improve `dbindex` DSN parameter parsing (constantable)
+ * bug #57678 [Validator] Add `setGroupProvider` to `AttributeLoader` (Maximilian Zumbansen)
+ * bug #57679 [WebProfilerBundle] Change incorrect check for the `stateless` request attribute (themasch)
+ * bug #57663 [Cache] use copy() instead of rename() on Windows (xabbuh)
+ * bug #57617 [PropertyInfo] Handle collection in PhpStan same as PhpDoc (mtarld)
+ * bug #54057 [Messenger] Passing actual `Envelope` to `WorkerMessageRetriedEvent`  (daffoxdev)
+ * bug #57645 [Routing] Discard in-memory cache of routes when writing the file-based cache (mpdude)
+ * bug #57621 [Mailer]  force HTTP 1.1 for Mailgun API requests (xabbuh)
+ * bug #57616 [String] Revert "Fixed u()->snake(), b()->snake() and s()->snake() methods" (nicolas-grekas)
+ * bug #57593 [SecurityBundle] Compare paths after realpath() has been applied to both (xabbuh)
+ * bug #57594 [String] Normalize underscores in snake() (xabbuh)
+ * bug #57585 [HttpFoundation] Fix MockArraySessionStorage to generate more conform ids (Seldaek)
+ * bug #57589 [FrameworkBundle] fix AssetMapper usage without assets enabled (xabbuh)
+
 * 7.0.9 (2024-06-28)
 
  * bug #57345 [DependencyInjection] Fix regression in ordering service locators by priority (longwave)

src/Symfony/Bridge/Twig/Tests/Extension/HttpKernelExtensionTest.php

@@ -70,7 +70,7 @@ public function testGenerateFragmentUri()
             'index' => \sprintf(<<<TWIG
 {{ fragment_uri(controller("%s::templateAction", {template: "foo.html.twig"})) }}
 TWIG
-                , TemplateController::class), ]);
+                , str_replace('\\', '\\\\', TemplateController::class)), ]);
         $twig = new Environment($loader, ['debug' => true, 'cache' => false]);
         $twig->addExtension(new HttpKernelExtension());
 
@@ -80,7 +80,7 @@ public function testGenerateFragmentUri()
         ]);
         $twig->addRuntimeLoader($loader);
 
-        $this->assertSame('/_fragment?_hash=PP8%2FeEbn1pr27I9wmag%2FM6jYGVwUZ0l2h0vhh2OJ6CI%3D&amp;_path=template%3Dfoo.html.twig%26_format%3Dhtml%26_locale%3Den%26_controller%3DSymfonyBundleFrameworkBundleControllerTemplateController%253A%253AtemplateAction', $twig->render('index'));
+        $this->assertSame('/_fragment?_hash=XCg0hX8QzSwik8Xuu9aMXhoCeI4oJOob7lUVacyOtyY%3D&amp;_path=template%3Dfoo.html.twig%26_format%3Dhtml%26_locale%3Den%26_controller%3DSymfony%255CBundle%255CFrameworkBundle%255CController%255CTemplateController%253A%253AtemplateAction', $twig->render('index'));
     }
 
     protected function getFragmentHandler($returnOrException): FragmentHandler

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

@@ -1118,7 +1118,6 @@ private function addSerializerSection(ArrayNodeDefinition $rootNode, callable $e
                         ->end()
                         ->arrayNode('default_context')
                             ->normalizeKeys(false)
-                            ->useAttributeAsKey('name')
                             ->validate()
                                 ->ifTrue(fn () => $this->debug && class_exists(JsonParser::class))
                                 ->then(fn (array $v) => $v + [JsonDecode::DETAILED_ERROR_MESSAGES => true])

src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php

@@ -79,10 +79,10 @@ public function panelAction(string $token): Response
      */
     private function getTraces(RequestDataCollector $request, string $method): array
     {
-        $traceRequest = Request::create(
-            $request->getPathInfo(),
-            $request->getRequestServer(true)->get('REQUEST_METHOD'),
-            \in_array($request->getMethod(), ['DELETE', 'PATCH', 'POST', 'PUT'], true) ? $request->getRequestRequest()->all() : $request->getRequestQuery()->all(),
+        $traceRequest = new Request(
+            $request->getRequestQuery()->all(),
+            $request->getRequestRequest()->all(),
+            $request->getRequestAttributes()->all(),
             $request->getRequestCookies(true)->all(),
             [],
             $request->getRequestServer(true)->all()

src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/RouterControllerTest.php

@@ -0,0 +1,48 @@
+<?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\Bundle\WebProfilerBundle\Tests\Controller;
+
+use Symfony\Bundle\FrameworkBundle\KernelBrowser;
+use Symfony\Bundle\FrameworkBundle\Routing\Router;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Bundle\WebProfilerBundle\Tests\Functional\WebProfilerBundleKernel;
+use Symfony\Component\DomCrawler\Crawler;
+use Symfony\Component\Routing\Route;
+
+class RouterControllerTest extends WebTestCase
+{
+    public function testFalseNegativeTrace()
+    {
+        $path = '/foo/bar:123/baz';
+
+        $kernel = new WebProfilerBundleKernel();
+        $client = new KernelBrowser($kernel);
+        $client->disableReboot();
+        $client->getKernel()->boot();
+
+        /** @var Router $router */
+        $router = $client->getContainer()->get('router');
+        $router->getRouteCollection()->add('route1', new Route($path));
+
+        $client->request('GET', $path);
+
+        $crawler = $client->request('GET', '/_profiler/latest?panel=router&type=request');
+
+        $matchedRouteCell = $crawler
+            ->filter('#router-logs .status-success td')
+            ->reduce(function (Crawler $td) use ($path): bool {
+                return $td->text() === $path;
+            });
+
+        $this->assertSame(1, $matchedRouteCell->count());
+    }
+}

src/Symfony/Component/Cache/Tests/Traits/RedisProxiesTest.php

@@ -30,15 +30,34 @@ public function testRedisProxy($class)
     {
         $version = version_compare(phpversion('redis'), '6', '>') ? '6' : '5';
         $proxy = file_get_contents(\dirname(__DIR__, 2)."/Traits/{$class}{$version}Proxy.php");
+        $proxy = substr($proxy, 0, 2 + strpos($proxy, '[];'));
         $expected = substr($proxy, 0, 2 + strpos($proxy, '}'));
         $methods = [];
 
+        foreach ((new \ReflectionClass(sprintf('Symfony\Component\Cache\Traits\\%s%dProxy', $class, $version)))->getMethods() as $method) {
+            if ('reset' === $method->name || method_exists(LazyProxyTrait::class, $method->name)) {
+                continue;
+            }
+            $return = '__construct' === $method->name || $method->getReturnType() instanceof \ReflectionNamedType && 'void' === (string) $method->getReturnType() ? '' : 'return ';
+            $methods[$method->name] = "\n    ".ProxyHelper::exportSignature($method, false, $args)."\n".<<<EOPHP
+                {
+                    {$return}\$this->initializeLazyObject()->{$method->name}({$args});
+                }
+
+            EOPHP;
+        }
+
+        uksort($methods, 'strnatcmp');
+        $proxy .= implode('', $methods)."}\n";
+
+        $methods = [];
+
         foreach ((new \ReflectionClass($class))->getMethods() as $method) {
             if ('reset' === $method->name || method_exists(RedisProxyTrait::class, $method->name)) {
                 continue;
             }
             $return = '__construct' === $method->name || $method->getReturnType() instanceof \ReflectionNamedType && 'void' === (string) $method->getReturnType() ? '' : 'return ';
-            $methods[] = "\n    ".ProxyHelper::exportSignature($method, false, $args)."\n".<<<EOPHP
+            $methods[$method->name] = "\n    ".ProxyHelper::exportSignature($method, false, $args)."\n".<<<EOPHP
                 {
                     {$return}\$this->initializeLazyObject()->{$method->name}({$args});
                 }

src/Symfony/Component/Cache/Traits/Redis6Proxy.php

@@ -24,6 +24,7 @@ class_exists(\Symfony\Component\VarExporter\Internal\LazyObjectState::class);
  */
 class Redis6Proxy extends \Redis implements ResetInterface, LazyObjectInterface
 {
+    use Redis6ProxyTrait;
     use RedisProxyTrait {
         resetLazyObject as reset;
     }
@@ -223,11 +224,6 @@ public function discard(): \Redis|bool
         return $this->initializeLazyObject()->discard(...\func_get_args());
     }
 
-    public function dump($key): \Redis|string
-    {
-        return $this->initializeLazyObject()->dump(...\func_get_args());
-    }
-
     public function echo($str): \Redis|false|string
     {
         return $this->initializeLazyObject()->echo(...\func_get_args());
@@ -508,16 +504,6 @@ public function hMset($key, $fieldvals): \Redis|bool
         return $this->initializeLazyObject()->hMset(...\func_get_args());
     }
 
-    public function hRandField($key, $options = null): \Redis|array|string
-    {
-        return $this->initializeLazyObject()->hRandField(...\func_get_args());
-    }
-
-    public function hSet($key, $member, $value): \Redis|false|int
-    {
-        return $this->initializeLazyObject()->hSet(...\func_get_args());
-    }
-
     public function hSetNx($key, $field, $value): \Redis|bool
     {
         return $this->initializeLazyObject()->hSetNx(...\func_get_args());
@@ -648,11 +634,6 @@ public function ltrim($key, $start, $end): \Redis|bool
         return $this->initializeLazyObject()->ltrim(...\func_get_args());
     }
 
-    public function mget($keys): \Redis|array
-    {
-        return $this->initializeLazyObject()->mget(...\func_get_args());
-    }
-
     public function migrate($host, $port, $key, $dstdb, $timeout, $copy = false, $replace = false, #[\SensitiveParameter] $credentials = null): \Redis|bool
     {
         return $this->initializeLazyObject()->migrate(...\func_get_args());
@@ -863,11 +844,6 @@ public function sPop($key, $count = 0): \Redis|array|false|string
         return $this->initializeLazyObject()->sPop(...\func_get_args());
     }
 
-    public function sRandMember($key, $count = 0): \Redis|array|false|string
-    {
-        return $this->initializeLazyObject()->sRandMember(...\func_get_args());
-    }
-
     public function sUnion($key, ...$other_keys): \Redis|array|false
     {
         return $this->initializeLazyObject()->sUnion(...\func_get_args());

src/Symfony/Component/Cache/Traits/Redis6ProxyTrait.php

@@ -0,0 +1,81 @@
+<?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\Cache\Traits;
+
+if (version_compare(phpversion('redis'), '6.1.0', '>=')) {
+    /**
+     * @internal
+     */
+    trait Redis6ProxyTrait
+    {
+        public function dump($key): \Redis|string|false
+        {
+            return $this->initializeLazyObject()->dump(...\func_get_args());
+        }
+
+        public function hRandField($key, $options = null): \Redis|array|string|false
+        {
+            return $this->initializeLazyObject()->hRandField(...\func_get_args());
+        }
+
+        public function hSet($key, $fields_and_vals): \Redis|false|int
+        {
+            return $this->initializeLazyObject()->hSet(...\func_get_args());
+        }
+
+        public function mget($keys): \Redis|array|false
+        {
+            return $this->initializeLazyObject()->mget(...\func_get_args());
+        }
+
+        public function sRandMember($key, $count = 0): mixed
+        {
+            return $this->initializeLazyObject()->sRandMember(...\func_get_args());
+        }
+
+        public function waitaof($numlocal, $numreplicas, $timeout): \Redis|array|false
+        {
+            return $this->initializeLazyObject()->waitaof(...\func_get_args());
+        }
+    }
+} else {
+    /**
+     * @internal
+     */
+    trait Redis6ProxyTrait
+    {
+        public function dump($key): \Redis|string
+        {
+            return $this->initializeLazyObject()->dump(...\func_get_args());
+        }
+
+        public function hRandField($key, $options = null): \Redis|array|string
+        {
+            return $this->initializeLazyObject()->hRandField(...\func_get_args());
+        }
+
+        public function hSet($key, $member, $value): \Redis|false|int
+        {
+            return $this->initializeLazyObject()->hSet(...\func_get_args());
+        }
+
+        public function mget($keys): \Redis|array
+        {
+            return $this->initializeLazyObject()->mget(...\func_get_args());
+        }
+
+        public function sRandMember($key, $count = 0): \Redis|array|false|string
+        {
+            return $this->initializeLazyObject()->sRandMember(...\func_get_args());
+        }
+    }
+}

src/Symfony/Component/Cache/Traits/RedisCluster6Proxy.php

@@ -24,6 +24,7 @@ class_exists(\Symfony\Component\VarExporter\Internal\LazyObjectState::class);
  */
 class RedisCluster6Proxy extends \RedisCluster implements ResetInterface, LazyObjectInterface
 {
+    use RedisCluster6ProxyTrait;
     use RedisProxyTrait {
         resetLazyObject as reset;
     }
@@ -653,11 +654,6 @@ public function pttl($key): \RedisCluster|false|int
         return $this->initializeLazyObject()->pttl(...\func_get_args());
     }
 
-    public function publish($channel, $message): \RedisCluster|bool
-    {
-        return $this->initializeLazyObject()->publish(...\func_get_args());
-    }
-
     public function pubsub($key_or_address, ...$values): mixed
     {
         return $this->initializeLazyObject()->pubsub(...\func_get_args());

src/Symfony/Component/Cache/Traits/RedisCluster6ProxyTrait.php

@@ -0,0 +1,46 @@
+<?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\Cache\Traits;
+
+if (version_compare(phpversion('redis'), '6.1.0', '>')) {
+    /**
+     * @internal
+     */
+    trait RedisCluster6ProxyTrait
+    {
+        public function getex($key, $options = []): \RedisCluster|string|false
+        {
+            return $this->initializeLazyObject()->getex(...\func_get_args());
+        }
+
+        public function publish($channel, $message): \RedisCluster|bool|int
+        {
+            return $this->initializeLazyObject()->publish(...\func_get_args());
+        }
+
+        public function waitaof($key_or_address, $numlocal, $numreplicas, $timeout): \RedisCluster|array|false
+        {
+            return $this->initializeLazyObject()->waitaof(...\func_get_args());
+        }
+    }
+} else {
+    /**
+     * @internal
+     */
+    trait RedisCluster6ProxyTrait
+    {
+        public function publish($channel, $message): \RedisCluster|bool
+        {
+            return $this->initializeLazyObject()->publish(...\func_get_args());
+        }
+    }
+}