Merge remote-tracking branch 'origin/imported-magento-magento2-30866' into 2.4-develop-pr109

Author: zakdma

dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php

@@ -115,6 +115,9 @@ class SessionManagerTest extends \PHPUnit\Framework\TestCase
          */
         private $appState;
 
+        /**
+         * @inheritdoc
+         */
         protected function setUp(): void
         {
             $this->sessionName = 'frontEndSession';
@@ -250,8 +253,6 @@ public function testIsValidForHost()
             $this->model->destroy();
         }
 
-        /**
-         */
         public function testStartAreaNotSet()
         {
             $this->expectException(\Magento\Framework\Exception\SessionException::class);
@@ -283,17 +284,23 @@ public function testStartAreaNotSet()
             $this->model->start();
         }
 
-        public function testConstructor()
+        /**
+         * @param string $saveMethod
+         * @dataProvider dataConstructor
+         *
+         * @return void
+         */
+        public function testConstructor(string $saveMethod): void
         {
             global $mockPHPFunctions;
             $mockPHPFunctions = true;
 
             $deploymentConfigMock = $this->createMock(DeploymentConfig::class);
             $deploymentConfigMock->method('get')
-                ->willReturnCallback(function ($configPath) {
+                ->willReturnCallback(function ($configPath) use ($saveMethod) {
                     switch ($configPath) {
                         case Config::PARAM_SESSION_SAVE_METHOD:
-                            return 'db';
+                            return $saveMethod;
                         case Config::PARAM_SESSION_CACHE_LIMITER:
                             return 'private_no_expire';
                         case Config::PARAM_SESSION_SAVE_PATH:
@@ -313,13 +320,13 @@ public function testConstructor()
                     'sessionConfig' => $sessionConfig,
                 ]
             );
-            $this->assertEquals('db', $sessionConfig->getOption('session.save_handler'));
+            $this->assertEquals($saveMethod, $sessionConfig->getOption('session.save_handler'));
             $this->assertEquals('private_no_expire', $sessionConfig->getOption('session.cache_limiter'));
             $this->assertEquals('explicit_save_path', $sessionConfig->getOption('session.save_path'));
             $this->assertArrayHasKey('session.use_only_cookies', self::$isIniSetInvoked);
             $this->assertEquals('1', self::$isIniSetInvoked['session.use_only_cookies']);
             foreach ($sessionConfig->getOptions() as $option => $value) {
-                if ($option=='session.save_handler') {
+                if ($option === 'session.save_handler' && $value !== 'memcached') {
                     $this->assertArrayNotHasKey('session.save_handler', self::$isIniSetInvoked);
                 } else {
                     $this->assertArrayHasKey($option, self::$isIniSetInvoked);
@@ -329,6 +336,19 @@ public function testConstructor()
             $this->assertTrue(self::$isSessionSetSaveHandlerInvoked);
         }
 
+        /**
+         * @return array
+         */
+        public function dataConstructor(): array
+        {
+            return [
+                [Config::PARAM_SESSION_SAVE_METHOD =>'db'],
+                [Config::PARAM_SESSION_SAVE_METHOD =>'redis'],
+                [Config::PARAM_SESSION_SAVE_METHOD =>'memcached'],
+                [Config::PARAM_SESSION_SAVE_METHOD =>'user'],
+            ];
+        }
+
         private function initializeModel(): void
         {
             $this->model = $this->objectManager->create(

lib/internal/Magento/Framework/Session/SessionManager.php

@@ -619,7 +619,9 @@ private function initIniOptions()
         }
 
         foreach ($this->sessionConfig->getOptions() as $option => $value) {
-            if ($option=='session.save_handler') {
+            // Since PHP 7.2 it is explicitly forbidden to set the module name to "user".
+            // https://bugs.php.net/bug.php?id=77384
+            if ($option === 'session.save_handler' && $value !== 'memcached') {
                 continue;
             } else {
                 $result = ini_set($option, $value);