Merge branch '5.4' into 6.2

* 5.4:
  [Translation] Fix merge
  [MonologBridge] FirePHPHandler::onKernelResponse throws PHP 8.1 deprecation when no user agent is set
  Update Redis version to 6.2.8
  [Contracts] Fix setting $container before calling parent::setContainer in ServiceSubscriberTrait
  [Messenger][Cache] fixed CallbackInterface support in async expiration handler
  do not drop embed label classes

Author: nicolas-grekas

Service/ServiceSubscriberTrait.php

@@ -66,12 +66,13 @@ public static function getSubscribedServices(): array
     #[Required]
     public function setContainer(ContainerInterface $container): ?ContainerInterface
     {
-        $this->container = $container;
-
+        $ret = null;
         if (method_exists(get_parent_class(self::class) ?: '', __FUNCTION__)) {
-            return parent::setContainer($container);
+            $ret = parent::setContainer($container);
         }
 
-        return null;
+        $this->container = $container;
+
+        return $ret;
     }
 }

Tests/Service/ServiceSubscriberTraitTest.php

@@ -68,6 +68,18 @@ public function testParentNotCalledIfNoParent()
         $this->assertNull($service->setContainer($container));
         $this->assertSame([], $service::getSubscribedServices());
     }
+
+    public function testSetContainerCalledFirstOnParent()
+    {
+        $container1 = new class([]) implements ContainerInterface {
+            use ServiceLocatorTrait;
+        };
+        $container2 = clone $container1;
+
+        $testService = new TestService2();
+        $this->assertNull($testService->setContainer($container1));
+        $this->assertSame($container1, $testService->setContainer($container2));
+    }
 }
 
 class ParentTestService
@@ -126,3 +138,22 @@ public static function __callStatic($method, $args)
 class Service3
 {
 }
+
+class ParentTestService2
+{
+    /** @var ContainerInterface */
+    protected $container;
+
+    public function setContainer(ContainerInterface $container)
+    {
+        $previous = $this->container;
+        $this->container = $container;
+
+        return $previous;
+    }
+}
+
+class TestService2 extends ParentTestService2 implements ServiceSubscriberInterface
+{
+    use ServiceSubscriberTrait;
+}