diff --git a/lib/Alchemy/Phrasea/Core/Configuration.php b/lib/Alchemy/Phrasea/Core/Configuration.php index 70d8bba84e..3ba2277570 100644 --- a/lib/Alchemy/Phrasea/Core/Configuration.php +++ b/lib/Alchemy/Phrasea/Core/Configuration.php @@ -82,8 +82,6 @@ class Configuration { $this->initialize(); - $cacheService = "Cache\array_cache"; - $retrieve_old_credentials = function(\SplFileObject $connexionInc) { require $connexionInc->getPathname(); @@ -131,29 +129,10 @@ class Configuration } $configs[$env]['phraseanet']['servername'] = $old_parameters['servername']; - - if ($env === 'prod' && isset($configs[$env]['cache'])) - { - $configs[$env]["cache"] = $cacheService; - } - if ($env === 'prod' && isset($configs[$env]['opcodecache'])) - { - $configs[$env]["opcodecache"] = $cacheService; - } } + $this->setConfigurations($configs); - $services = $this->getServices(); - - if (isset($services['Orm']["doctrine_prod"]["options"]["cache"])) - { - $services['Orm']["doctrine_prod"]["options"]["cache"]['query']['service'] = $cacheService; - $services['Orm']["doctrine_prod"]["options"]["cache"]['result']['service'] = $cacheService; - $services['Orm']["doctrine_prod"]["options"]["cache"]['metadata']['service'] = $cacheService; - } - - $this->setServices($services); - $this->setEnvironnement('prod'); return $this; diff --git a/lib/classes/patch/3602.class.php b/lib/classes/patch/3602.class.php index 43b3be5780..f198b3590d 100644 --- a/lib/classes/patch/3602.class.php +++ b/lib/classes/patch/3602.class.php @@ -22,7 +22,7 @@ class patch_3602 implements patchInterface * * @var string */ - private $release = '3.6.0a2'; + private $release = '3.6.0a1'; /** * * @var Array @@ -40,7 +40,7 @@ class patch_3602 implements patchInterface public function require_all_upgrades() { - return true; + return false; } /**