Merge branch '5.4' into 6.0

* 5.4:
  [Cache] clarify RedisStore::evaluate()
  [FrameworkBundle] distinguish system and app cache dirs
  [Messenger] Fixed BC layer for RedeliveryStamp
  AmqpTransport implements QueueReceiverInterface
  [DoctrineBridge] fix setting default mapping type to attribute/annotation on php 8/7 respectively
  Remove internal from setContainer
  do not render the same label id attribute twice
  make AbstractDataCollector extend DataCollector to reduce boilerplate

Author: nicolas-grekas

Store/RedisStore.php

@@ -275,16 +275,14 @@ private function evaluate(string $script, string $resource, array $args)
             }
 
             return $result;
-
-            return $this->redis->_instance($this->redis->_target($resource))->eval($script, array_merge([$resource], $args), 1);
         }
 
-        if ($this->redis instanceof \Predis\ClientInterface) {
-            try {
-                return $this->redis->eval(...array_merge([$script, 1, $resource], $args));
-            } catch (ServerException $e) {
-                throw new LockStorageException($e->getMessage(), $e->getCode(), $e);
-            }
+        \assert($this->redis instanceof \Predis\ClientInterface);
+
+        try {
+            return $this->redis->eval(...array_merge([$script, 1, $resource], $args));
+        } catch (ServerException $e) {
+            throw new LockStorageException($e->getMessage(), $e->getCode(), $e);
         }
     }