Merge branch '5.2' into 5.3

* 5.2:
  [Cache] clarify RedisStore::evaluate()
  [Messenger] Fixed BC layer for RedeliveryStamp
  [DoctrineBridge] fix setting default mapping type to attribute/annotation on php 8/7 respectively
  do not render the same label id attribute twice
  make AbstractDataCollector extend DataCollector to reduce boilerplate

Author: nicolas-grekas

DataCollector/AbstractDataCollector.php

@@ -11,16 +11,13 @@
 
 namespace Symfony\Bundle\FrameworkBundle\DataCollector;
 
+use Symfony\Component\HttpKernel\DataCollector\DataCollector;
+
 /**
  * @author Laurent VOULLEMIER <laurent.voullemier@gmail.com>
  */
-abstract class AbstractDataCollector implements TemplateAwareDataCollectorInterface
+abstract class AbstractDataCollector extends DataCollector implements TemplateAwareDataCollectorInterface
 {
-    /**
-     * @var array
-     */
-    protected $data = [];
-
     public function getName(): string
     {
         return static::class;