Merge pull request #184 from magento-commerce/develop

Merge develop into release branch

Author: ashvini22326

src/Config/Factory/Cache.php

@@ -379,4 +379,13 @@ private function isSynchronizedConfigStructure(): bool
         return $redisModel === self::REDIS_BACKEND_REMOTE_SYNCHRONIZED_CACHE ||
           $valkeyModel === self::VALKEY_BACKEND_REMOTE_SYNCHRONIZED_CACHE;
     }
+
+  /**
+   * @return array
+   */
+  public function isValkeyEnabled()
+  {
+    return $this->valkey->getConfiguration();
+  }
+
 }

src/Service/Validator.php

@@ -102,7 +102,8 @@ class Validator
             '>=2.3.0 <2.3.7-p4 || >=2.4.0 <2.4.3-p3' => '~3.5.0 || ~3.7.0 || ~3.8.0',
             '>=2.4.3-p3 <2.4.5-p3 || ~2.3.7-p4' => '~3.5.0 || ~3.7.0 || ~3.8.0 || ~3.9.0',
             '>=2.4.5-p3 <2.4.6-p6' => '~3.9.0 || ~3.11.0',
-            '>=2.4.6-p6 <2.4.9' => '~3.12.0 || ~3.13.0',
+            '>=2.4.6-p6 <2.4.8' => '~3.12.0 || ~3.13.0',
+            '>=2.4.8 <2.4.9' => '>=4.0 <4.1',
         ],
         ServiceInterface::NAME_NODE => [
             '*' => '^6 || ^8 || ^10 || ^11',

src/Step/Deploy/PreDeploy/ConfigUpdate/Cache.php

@@ -181,10 +181,9 @@ private function checkBackendModel(string $backend): void
             CacheFactory::REDIS_BACKEND_REMOTE_SYNCHRONIZED_CACHE
         ];
         $notAllowedValkeyBackend = [
-            CacheFactory::VALKEY_BACKEND_VALKEY_CACHE,
-            CacheFactory::VALKEY_BACKEND_REMOTE_SYNCHRONIZED_CACHE
+            CacheFactory::VALKEY_BACKEND_VALKEY_CACHE
         ];
-
+     //   $isValkeyEnabled=  $this->cacheConfig->isValkeyEnabled();  // @TODO
         try {
             if (in_array($backend, $notAllowedValkeyBackend, true)
               && !$this->magentoVersion->isGreaterOrEqual('2.4.8')) {