Upgrade framework

vendor/symfony/http-foundation/Session/Storage/Proxy/AbstractProxy.php

@@ -12,8 +12,6 @@
 namespace Symfony\Component\HttpFoundation\Session\Storage\Proxy;
 
 /**
- * AbstractProxy.
- *
  * @author Drak <drak@zikula.org>
  */
 abstract class AbstractProxy
@@ -32,50 +30,40 @@ abstract class AbstractProxy
 
     /**
      * Gets the session.save_handler name.
-     *
-     * @return string
      */
-    public function getSaveHandlerName()
+    public function getSaveHandlerName(): ?string
     {
         return $this->saveHandlerName;
     }
 
     /**
      * Is this proxy handler and instance of \SessionHandlerInterface.
-     *
-     * @return bool
      */
-    public function isSessionHandlerInterface()
+    public function isSessionHandlerInterface(): bool
     {
         return $this instanceof \SessionHandlerInterface;
     }
 
     /**
      * Returns true if this handler wraps an internal PHP session save handler using \SessionHandler.
-     *
-     * @return bool
      */
-    public function isWrapper()
+    public function isWrapper(): bool
     {
         return $this->wrapper;
     }
 
     /**
      * Has a session started?
-     *
-     * @return bool
      */
-    public function isActive()
+    public function isActive(): bool
     {
         return \PHP_SESSION_ACTIVE === session_status();
     }
 
     /**
      * Gets the session ID.
-     *
-     * @return string
      */
-    public function getId()
+    public function getId(): string
     {
         return session_id();
     }
@@ -83,14 +71,12 @@ abstract class AbstractProxy
     /**
      * Sets the session ID.
      *
-     * @param string $id
-     *
      * @throws \LogicException
      */
-    public function setId($id)
+    public function setId(string $id)
     {
         if ($this->isActive()) {
-            throw new \LogicException('Cannot change the ID of an active session');
+            throw new \LogicException('Cannot change the ID of an active session.');
         }
 
         session_id($id);
@@ -98,10 +84,8 @@ abstract class AbstractProxy
 
     /**
      * Gets the session name.
-     *
-     * @return string
      */
-    public function getName()
+    public function getName(): string
     {
         return session_name();
     }
@@ -109,14 +93,12 @@ abstract class AbstractProxy
     /**
      * Sets the session name.
      *
-     * @param string $name
-     *
      * @throws \LogicException
      */
-    public function setName($name)
+    public function setName(string $name)
     {
         if ($this->isActive()) {
-            throw new \LogicException('Cannot change the name of an active session');
+            throw new \LogicException('Cannot change the name of an active session.');
         }
 
         session_name($name);

vendor/symfony/http-foundation/Session/Storage/Proxy/NativeProxy.php

@@ -1,41 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpFoundation\Session\Storage\Proxy;
-
-/**
- * NativeProxy.
- *
- * This proxy is built-in session handlers in PHP 5.3.x
- *
- * @author Drak <drak@zikula.org>
- */
-class NativeProxy extends AbstractProxy
-{
-    /**
-     * Constructor.
-     */
-    public function __construct()
-    {
-        // this makes an educated guess as to what the handler is since it should already be set.
-        $this->saveHandlerName = ini_get('session.save_handler');
-    }
-
-    /**
-     * Returns true if this handler wraps an internal PHP session save handler using \SessionHandler.
-     *
-     * @return bool False
-     */
-    public function isWrapper()
-    {
-        return false;
-    }
-}

vendor/symfony/http-foundation/Session/Storage/Proxy/SessionHandlerProxy.php

@@ -11,85 +11,66 @@
 
 namespace Symfony\Component\HttpFoundation\Session\Storage\Proxy;
 
+use Symfony\Component\HttpFoundation\Session\Storage\Handler\StrictSessionHandler;
+
 /**
- * SessionHandler proxy.
- *
  * @author Drak <drak@zikula.org>
  */
-class SessionHandlerProxy extends AbstractProxy implements \SessionHandlerInterface
+class SessionHandlerProxy extends AbstractProxy implements \SessionHandlerInterface, \SessionUpdateTimestampHandlerInterface
 {
-    /**
-     * @var \SessionHandlerInterface
-     */
     protected $handler;
 
-    /**
-     * Constructor.
-     *
-     * @param \SessionHandlerInterface $handler
-     */
     public function __construct(\SessionHandlerInterface $handler)
     {
         $this->handler = $handler;
-        $this->wrapper = ($handler instanceof \SessionHandler);
-        $this->saveHandlerName = $this->wrapper ? ini_get('session.save_handler') : 'user';
+        $this->wrapper = $handler instanceof \SessionHandler;
+        $this->saveHandlerName = $this->wrapper || ($handler instanceof StrictSessionHandler && $handler->isWrapper()) ? \ini_get('session.save_handler') : 'user';
     }
 
-    /**
-     * @return \SessionHandlerInterface
-     */
-    public function getHandler()
+    public function getHandler(): \SessionHandlerInterface
     {
         return $this->handler;
     }
 
     // \SessionHandlerInterface
 
-    /**
-     * {@inheritdoc}
-     */
-    public function open($savePath, $sessionName)
+    public function open(string $savePath, string $sessionName): bool
     {
-        return (bool) $this->handler->open($savePath, $sessionName);
+        return $this->handler->open($savePath, $sessionName);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function close()
+    public function close(): bool
     {
-        return (bool) $this->handler->close();
+        return $this->handler->close();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function read($sessionId)
+    public function read(string $sessionId): string|false
     {
-        return (string) $this->handler->read($sessionId);
+        return $this->handler->read($sessionId);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function write($sessionId, $data)
+    public function write(string $sessionId, string $data): bool
     {
-        return (bool) $this->handler->write($sessionId, $data);
+        return $this->handler->write($sessionId, $data);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function destroy($sessionId)
+    public function destroy(string $sessionId): bool
     {
-        return (bool) $this->handler->destroy($sessionId);
+        return $this->handler->destroy($sessionId);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function gc($maxlifetime)
+    public function gc(int $maxlifetime): int|false
     {
-        return (bool) $this->handler->gc($maxlifetime);
+        return $this->handler->gc($maxlifetime);
+    }
+
+    public function validateId(string $sessionId): bool
+    {
+        return !$this->handler instanceof \SessionUpdateTimestampHandlerInterface || $this->handler->validateId($sessionId);
+    }
+
+    public function updateTimestamp(string $sessionId, string $data): bool
+    {
+        return $this->handler instanceof \SessionUpdateTimestampHandlerInterface ? $this->handler->updateTimestamp($sessionId, $data) : $this->write($sessionId, $data);
     }
 }