Merge branch '5.4' into 6.0

* 5.4:
  Add some missing return types to internal/final classes

Author: nicolas-grekas

CacheWarmer/CacheWarmerAggregate.php

@@ -44,9 +44,7 @@ public function enableOnlyOptionalWarmers()
     }
 
     /**
-     * Warms up the cache.
-     *
-     * @return string[] A list of classes or files to preload on PHP 7.4+
+     * {@inheritdoc}
      */
     public function warmUp(string $cacheDir): array
     {

DataCollector/AjaxDataCollector.php

@@ -15,8 +15,6 @@
 use Symfony\Component\HttpFoundation\Response;
 
 /**
- * AjaxDataCollector.
- *
  * @author Bart van den Burg <bart@burgov.nl>
  *
  * @final

DataCollector/ConfigDataCollector.php

@@ -91,11 +91,17 @@ public function lateCollect()
         $this->data = $this->cloneVar($this->data);
     }
 
+    /**
+     * Gets the token.
+     */
     public function getToken(): ?string
     {
         return $this->data['token'];
     }
 
+    /**
+     * Gets the Symfony version.
+     */
     public function getSymfonyVersion(): string
     {
         return $this->data['symfony_version'];
@@ -142,11 +148,17 @@ public function getSymfonyEol(): string
         return $this->data['symfony_eol'];
     }
 
+    /**
+     * Gets the PHP version.
+     */
     public function getPhpVersion(): string
     {
         return $this->data['php_version'];
     }
 
+    /**
+     * Gets the PHP version extra part.
+     */
     public function getPhpVersionExtra(): ?string
     {
         return $this->data['php_version_extra'] ?? null;
@@ -167,6 +179,9 @@ public function getPhpTimezone(): string
         return $this->data['php_timezone'];
     }
 
+    /**
+     * Gets the environment.
+     */
     public function getEnv(): string
     {
         return $this->data['env'];
@@ -182,16 +197,25 @@ public function isDebug(): bool|string
         return $this->data['debug'];
     }
 
+    /**
+     * Returns true if the XDebug is enabled.
+     */
     public function hasXDebug(): bool
     {
         return $this->data['xdebug_enabled'];
     }
 
+    /**
+     * Returns true if APCu is enabled.
+     */
     public function hasApcu(): bool
     {
         return $this->data['apcu_enabled'];
     }
 
+    /**
+     * Returns true if Zend OPcache is enabled.
+     */
     public function hasZendOpcache(): bool
     {
         return $this->data['zend_opcache_enabled'];
@@ -202,6 +226,9 @@ public function getBundles()
         return $this->data['bundles'];
     }
 
+    /**
+     * Gets the PHP SAPI name.
+     */
     public function getSapiName(): string
     {
         return $this->data['sapi_name'];

DataCollector/EventDataCollector.php

@@ -70,31 +70,51 @@ public function lateCollect()
         $this->data = $this->cloneVar($this->data);
     }
 
+    /**
+     * @see TraceableEventDispatcher
+     */
     public function setCalledListeners(array $listeners)
     {
         $this->data['called_listeners'] = $listeners;
     }
 
+    /**
+     * @see TraceableEventDispatcher
+     */
     public function getCalledListeners(): array
     {
         return $this->data['called_listeners'];
     }
 
+    /**
+     * @see TraceableEventDispatcher
+     */
     public function setNotCalledListeners(array $listeners)
     {
         $this->data['not_called_listeners'] = $listeners;
     }
 
+    /**
+     * @see TraceableEventDispatcher
+     */
     public function getNotCalledListeners(): array
     {
         return $this->data['not_called_listeners'];
     }
 
+    /**
+     * @param array $events An array of orphaned events
+     *
+     * @see TraceableEventDispatcher
+     */
     public function setOrphanedEvents(array $events)
     {
         $this->data['orphaned_events'] = $events;
     }
 
+    /**
+     * @see TraceableEventDispatcher
+     */
     public function getOrphanedEvents(): array
     {
         return $this->data['orphaned_events'];

DataCollector/ExceptionDataCollector.php

@@ -48,8 +48,6 @@ public function hasException(): bool
     }
 
     /**
-     * Gets the exception.
-     *
      * @return \Exception|FlattenException
      */
     public function getException(): \Exception|FlattenException

DataCollector/MemoryDataCollector.php

@@ -63,9 +63,6 @@ public function getMemoryLimit(): int
         return $this->data['memory_limit'];
     }
 
-    /**
-     * Updates the memory usage data.
-     */
     public function updateMemoryUsage()
     {
         $this->data['memory'] = memory_get_peak_usage(true);

DataCollector/RequestDataCollector.php

@@ -31,7 +31,7 @@
  */
 class RequestDataCollector extends DataCollector implements EventSubscriberInterface, LateDataCollectorInterface
 {
-    protected $controllers;
+    private $controllers;
     private $sessionUsages = [];
     private $requestStack;
 
@@ -428,11 +428,9 @@ public function collectSessionUsage(): void
     }
 
     /**
-     * Parse a controller.
-     *
      * @return array|string An array of controller data or a simple string
      */
-    protected function parseController(array|object|string|null $controller): array|string
+    private function parseController(array|object|string|null $controller): array|string
     {
         if (\is_string($controller) && str_contains($controller, '::')) {
             $controller = explode('::', $controller);

DataCollector/TimeDataCollector.php

@@ -24,8 +24,8 @@
  */
 class TimeDataCollector extends DataCollector implements LateDataCollectorInterface
 {
-    protected $kernel;
-    protected $stopwatch;
+    private $kernel;
+    private $stopwatch;
 
     public function __construct(KernelInterface $kernel = null, Stopwatch $stopwatch = null)
     {
@@ -76,8 +76,6 @@ public function lateCollect()
     }
 
     /**
-     * Sets the request events.
-     *
      * @param StopwatchEvent[] $events The request events
      */
     public function setEvents(array $events)
@@ -97,6 +95,9 @@ public function getEvents(): array
         return $this->data['events'];
     }
 
+    /**
+     * Gets the request elapsed time.
+     */
     public function getDuration(): float
     {
         if (!isset($this->data['events']['__section__'])) {