Merge branch '2.4-develop' of https://github.com/magento/magento2ce into PR-10-14

Author: dhorytskyi

app/code/Magento/Config/Test/Mftf/Suite/AppConfigDumpSuite.xml

@@ -8,6 +8,7 @@
 <suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
     <suite name="AppConfigDumpSuite">
         <before>
+            <!-- Command app:config:dump is not reversible and magento instance stays configuration read only after this test. You need to restore etc/env.php manually to make magento configuration writable again.-->
             <magentoCLI command="app:config:dump" stepKey="configDump"/>
         </before>
         <after>

app/code/Magento/Shipping/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml

@@ -13,13 +13,14 @@
             <features value="Configuration"/>
             <stories value="Disable configuration inputs"/>
             <title value="Check that all input fields disabled after executing CLI app:config:dump"/>
-            <description value="Check that all input fields disabled after executing CLI app:config:dump"/>
+            <description value="Check that all input fields disabled after executing CLI app:config:dump. Command app:config:dump is not reversible and magento instance stays configuration read only after this test. You need to restore etc/env.php manually to make magento configuration writable again."/>
             <severity value="MAJOR"/>
             <testCaseId value="MC-11158"/>
             <useCaseId value="MAGETWO-96428"/>
             <group value="configuration"/>
         </annotations>
         <before>
+            <!-- Command app:config:dump is not reversible and magento instance stays configuration read only after this test. You need to restore etc/env.php manually to make magento configuration writable again.-->
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>

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

@@ -28,6 +28,18 @@ class Config implements ConfigInterface
     /** Configuration path for session cache limiter */
     const PARAM_SESSION_CACHE_LIMITER = 'session/cache_limiter';
 
+    /** Configuration path for session garbage collection probability */
+    private const PARAM_SESSION_GC_PROBABILITY = 'session/gc_probability';
+
+    /** Configuration path for session garbage collection divisor */
+    private const PARAM_SESSION_GC_DIVISOR = 'session/gc_divisor';
+
+    /**
+     * Configuration path for session garbage collection max lifetime.
+     * The number of seconds after which data will be seen as 'garbage'.
+     */
+    private const PARAM_SESSION_GC_MAXLIFETIME = 'session/gc_maxlifetime';
+
     /** Configuration path for cookie domain */
     const XML_PATH_COOKIE_DOMAIN = 'web/cookie/cookie_domain';
 
@@ -102,6 +114,7 @@ class Config implements ConfigInterface
      * @param string $scopeType
      * @param string $lifetimePath
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function __construct(
         \Magento\Framework\ValidatorFactory $validatorFactory,
@@ -149,6 +162,30 @@ public function __construct(
             $this->setOption('session.cache_limiter', $cacheLimiter);
         }
 
+        /**
+         * Session garbage collection probability
+         */
+        $gcProbability = $deploymentConfig->get(self::PARAM_SESSION_GC_PROBABILITY);
+        if ($gcProbability) {
+            $this->setOption('session.gc_probability', $gcProbability);
+        }
+
+        /**
+         * Session garbage collection divisor
+         */
+        $gcDivisor = $deploymentConfig->get(self::PARAM_SESSION_GC_DIVISOR);
+        if ($gcDivisor) {
+            $this->setOption('session.gc_divisor', $gcDivisor);
+        }
+
+        /**
+         * Session garbage collection max lifetime
+         */
+        $gcMaxlifetime = $deploymentConfig->get(self::PARAM_SESSION_GC_MAXLIFETIME);
+        if ($gcMaxlifetime) {
+            $this->setOption('session.gc_maxlifetime', $gcMaxlifetime);
+        }
+
         /**
          * Cookie settings: lifetime, path, domain, httpOnly. These govern settings for the session cookie.
          */