From f8a082daebdd4e02e74eba0861dc6e160cdfc18c Mon Sep 17 00:00:00 2001
From: "simon.chrzanowski" <simon.chrzanowski@quentic.com>
Date: Fri, 18 Jun 2021 10:57:27 +0200
Subject: [PATCH] [HttpFoundation] allow savePath of NativeFileSessionHandler
 to be null

---
 .../Storage/Handler/SessionHandlerFactory.php |  4 +-
 .../Handler/SessionHandlerFactoryTest.php     | 48 +++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/SessionHandlerFactoryTest.php

diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/SessionHandlerFactory.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/SessionHandlerFactory.php
index a5ebd29eba..33453c3208 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/SessionHandlerFactory.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/SessionHandlerFactory.php
@@ -48,7 +48,9 @@ class SessionHandlerFactory
             case !\is_string($connection):
                 throw new \InvalidArgumentException(sprintf('Unsupported Connection: "%s".', \get_class($connection)));
             case 0 === strpos($connection, 'file://'):
-                return new StrictSessionHandler(new NativeFileSessionHandler(substr($connection, 7)));
+                $savePath = substr($connection, 7);
+
+                return new StrictSessionHandler(new NativeFileSessionHandler('' === $savePath ? null : $savePath));
 
             case 0 === strpos($connection, 'redis:'):
             case 0 === strpos($connection, 'rediss:'):
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/SessionHandlerFactoryTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/SessionHandlerFactoryTest.php
new file mode 100644
index 0000000000..46d6cd4015
--- /dev/null
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/SessionHandlerFactoryTest.php
@@ -0,0 +1,48 @@
+<?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\Tests\Session\Storage\Handler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Session\Storage\Handler\SessionHandlerFactory;
+use Symfony\Component\HttpFoundation\Session\Storage\Handler\StrictSessionHandler;
+
+/**
+ * Test class for SessionHandlerFactory.
+ *
+ * @author Simon <simon.chrzanowski@quentic.com>
+ *
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ */
+class SessionHandlerFactoryTest extends TestCase
+{
+    /**
+     * @dataProvider provideConnectionDSN
+     */
+    public function testCreateHandler(string $connectionDSN, string $expectedPath, string $expectedHandlerType)
+    {
+        $handler = SessionHandlerFactory::createHandler($connectionDSN);
+
+        $this->assertInstanceOf($expectedHandlerType, $handler);
+        $this->assertEquals($expectedPath, ini_get('session.save_path'));
+    }
+
+    public function provideConnectionDSN(): array
+    {
+        $base = sys_get_temp_dir();
+
+        return [
+            'native file handler using save_path from php.ini' => ['connectionDSN' => 'file://', 'expectedPath' => ini_get('session.save_path'), 'expectedHandlerType' => StrictSessionHandler::class],
+            'native file handler using provided save_path' => ['connectionDSN' => 'file://'.$base.'/session/storage', 'expectedPath' => $base.'/session/storage', 'expectedHandlerType' => StrictSessionHandler::class],
+        ];
+    }
+}