N°6934 - Symfony 6.4 - upgrade Symfony bundles to 6.4 (#580)

* Update Symfony lib to version ~6.4.0
* Update code missing return type
* Add an iTop general configuration entry to store application secret (Symfony mandatory parameter)
* Use dependency injection in ExceptionListener & UserProvider classes

lib/symfony/http-foundation/Session/Storage/Handler/RedisSessionHandler.php

@@ -12,8 +12,7 @@
 namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
 
 use Predis\Response\ErrorInterface;
-use Symfony\Component\Cache\Traits\RedisClusterProxy;
-use Symfony\Component\Cache\Traits\RedisProxy;
+use Relay\Relay;
 
 /**
  * Redis based session storage handler based on the Redis class
@@ -23,78 +22,56 @@ use Symfony\Component\Cache\Traits\RedisProxy;
  */
 class RedisSessionHandler extends AbstractSessionHandler
 {
-    private $redis;
+    /**
+     * Key prefix for shared environments.
+     */
+    private string $prefix;
 
     /**
-     * @var string Key prefix for shared environments
+     * Time to live in seconds.
      */
-    private $prefix;
-
-    /**
-     * @var int Time to live in seconds
-     */
-    private $ttl;
+    private int|\Closure|null $ttl;
 
     /**
      * List of available options:
      *  * prefix: The prefix to use for the keys in order to avoid collision on the Redis server
      *  * ttl: The time to live in seconds.
      *
-     * @param \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|RedisProxy|RedisClusterProxy $redis
-     *
      * @throws \InvalidArgumentException When unsupported client or options are passed
      */
-    public function __construct($redis, array $options = [])
-    {
-        if (
-            !$redis instanceof \Redis &&
-            !$redis instanceof \RedisArray &&
-            !$redis instanceof \RedisCluster &&
-            !$redis instanceof \Predis\ClientInterface &&
-            !$redis instanceof RedisProxy &&
-            !$redis instanceof RedisClusterProxy
-        ) {
-            throw new \InvalidArgumentException(sprintf('"%s()" expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\ClientInterface, "%s" given.', __METHOD__, get_debug_type($redis)));
-        }
-
+    public function __construct(
+        private \Redis|Relay|\RedisArray|\RedisCluster|\Predis\ClientInterface $redis,
+        array $options = [],
+    ) {
         if ($diff = array_diff(array_keys($options), ['prefix', 'ttl'])) {
             throw new \InvalidArgumentException(sprintf('The following options are not supported "%s".', implode(', ', $diff)));
         }
 
-        $this->redis = $redis;
         $this->prefix = $options['prefix'] ?? 'sf_s';
         $this->ttl = $options['ttl'] ?? null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function doRead(string $sessionId): string
+    protected function doRead(#[\SensitiveParameter] string $sessionId): string
     {
         return $this->redis->get($this->prefix.$sessionId) ?: '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function doWrite(string $sessionId, string $data): bool
+    protected function doWrite(#[\SensitiveParameter] string $sessionId, string $data): bool
     {
-        $result = $this->redis->setEx($this->prefix.$sessionId, (int) ($this->ttl ?? \ini_get('session.gc_maxlifetime')), $data);
+        $ttl = ($this->ttl instanceof \Closure ? ($this->ttl)() : $this->ttl) ?? \ini_get('session.gc_maxlifetime');
+        $result = $this->redis->setEx($this->prefix.$sessionId, (int) $ttl, $data);
 
         return $result && !$result instanceof ErrorInterface;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDestroy(string $sessionId): bool
+    protected function doDestroy(#[\SensitiveParameter] string $sessionId): bool
     {
         static $unlink = true;
 
         if ($unlink) {
             try {
                 $unlink = false !== $this->redis->unlink($this->prefix.$sessionId);
-            } catch (\Throwable $e) {
+            } catch (\Throwable) {
                 $unlink = false;
             }
         }
@@ -106,32 +83,21 @@ class RedisSessionHandler extends AbstractSessionHandler
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     #[\ReturnTypeWillChange]
     public function close(): bool
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return int|false
-     */
-    #[\ReturnTypeWillChange]
-    public function gc($maxlifetime)
+    public function gc(int $maxlifetime): int|false
     {
         return 0;
     }
 
-    /**
-     * @return bool
-     */
-    #[\ReturnTypeWillChange]
-    public function updateTimestamp($sessionId, $data)
+    public function updateTimestamp(#[\SensitiveParameter] string $sessionId, string $data): bool
     {
-        return (bool) $this->redis->expire($this->prefix.$sessionId, (int) ($this->ttl ?? \ini_get('session.gc_maxlifetime')));
+        $ttl = ($this->ttl instanceof \Closure ? ($this->ttl)() : $this->ttl) ?? \ini_get('session.gc_maxlifetime');
+
+        return $this->redis->expire($this->prefix.$sessionId, (int) $ttl);
     }
 }