Merge branch '7.3' into 7.4

* 7.3:
  [Cache] Fix accepting named closures as early-expiration callbacks
  [Mime] Update mime types
  [Yaml] Align unquoted multiline scalar parsing with spec for comments
  work around limitation in JsonResponse when the data is null
  do not use recipient phone numbers as sender e-mail addresses
  [Dotenv] DotenvDumpCommand cannot be internal

Author: nicolas-grekas

Messenger/EarlyExpirationMessage.php

@@ -31,6 +31,11 @@ public static function create(ReverseContainer $reverseContainer, callable $call
 
         $pool = $reverseContainer->getId($pool);
 
+        if ($callback instanceof \Closure && !($r = new \ReflectionFunction($callback))->isAnonymous()) {
+            $callback = [$r->getClosureThis() ?? $r->getClosureCalledClass()?->name, $r->name];
+            $callback[0] ?: $callback = $r->name;
+        }
+
         if (\is_object($callback)) {
             if (null === $id = $reverseContainer->getId($callback)) {
                 return null;

Tests/Messenger/EarlyExpirationMessageTest.php

@@ -57,4 +57,58 @@ public function __invoke(CacheItem $item)
         $this->assertSame('@computation_service', $msg->getCallback());
         $this->assertSame($computationService, $msg->findCallback($reverseContainer));
     }
+
+    public function testCreateWithNonAnonymousClosureBoundToInstance()
+    {
+        $pool = new ArrayAdapter();
+        $item = $pool->getItem('foo');
+        $item->set(234);
+
+        $computationService = new class {
+            public function compute(CacheItem $item)
+            {
+                return 123;
+            }
+
+            public static function staticCompute(CacheItem $item)
+            {
+                return 123;
+            }
+        };
+
+        $container = new Container();
+        $container->set('computation_service', $computationService);
+        $container->set('cache_pool', $pool);
+
+        $reverseContainer = new ReverseContainer($container, new ServiceLocator([]));
+
+        $closure = $computationService->compute(...);
+        $msg = EarlyExpirationMessage::create($reverseContainer, $closure, $item, $pool);
+        $this->assertSame(['@computation_service', 'compute'], $msg->getCallback());
+
+        $closure = $computationService::staticCompute(...);
+        $msg = EarlyExpirationMessage::create($reverseContainer, $closure, $item, $pool);
+        $this->assertSame([$computationService::class, 'staticCompute'], $msg->getCallback());
+
+        $msg = EarlyExpirationMessage::create($reverseContainer, var_dump(...), $item, $pool);
+        $this->assertSame('var_dump', $msg->getCallback());
+
+        $this->assertSame('cache_pool', $msg->getPool());
+    }
+
+    public function testCreateWithAnonymousClosure()
+    {
+        $pool = new ArrayAdapter();
+        $item = $pool->getItem('foo');
+        $item->set(234);
+
+        $container = new Container();
+        $container->set('cache_pool', $pool);
+
+        $reverseContainer = new ReverseContainer($container, new ServiceLocator([]));
+
+        $msg = EarlyExpirationMessage::create($reverseContainer, static fn () => 123, $item, $pool);
+
+        $this->assertNull($msg);
+    }
 }