From 04133991027e48f589bbaf8c5939dcdf3429613c Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandrocelaya@gmail.com>
Date: Fri, 4 Oct 2024 12:33:27 +0200
Subject: [PATCH] Make sure MEMORY_LIMIT env var is read after config options
 have been promoted to env vars

---
 config/container.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/config/container.php b/config/container.php
index bfab7763..7ae58b75 100644
--- a/config/container.php
+++ b/config/container.php
@@ -12,8 +12,6 @@ chdir(dirname(__DIR__));
 
 require 'vendor/autoload.php';
 
-// Set a default memory limit, but allow custom values
-ini_set('memory_limit', EnvVars::MEMORY_LIMIT->loadFromEnv('512M'));
 // This is one of the first files loaded. Configure the timezone here
 date_default_timezone_set(EnvVars::TIMEZONE->loadFromEnv(date_default_timezone_get()));
 
@@ -25,6 +23,10 @@ if (! class_exists(LOCAL_LOCK_FACTORY)) {
 
 return (static function (): ServiceManager {
     $config = require __DIR__ . '/config.php';
+
+    // Set a default memory limit right after loading config, to ensure installer config has been promoted as env vars
+    ini_set('memory_limit', EnvVars::MEMORY_LIMIT->loadFromEnv('512M'));
+
     $container = new ServiceManager($config['dependencies']);
     $container->setService('config', $config);