From 0bc75c3fb6920798ec5410b912a7fe15d220e24a Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Sat, 31 Dec 2016 16:29:31 +0100 Subject: [PATCH] Bump memory limit to 1.5G --- bin/composer | 6 +++--- src/Composer/Util/IniHelper.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/composer b/bin/composer index ed4979f7b..823f87a4b 100755 --- a/bin/composer +++ b/bin/composer @@ -41,9 +41,9 @@ if (function_exists('ini_set')) { }; $memoryLimit = trim(ini_get('memory_limit')); - // Increase memory_limit if it is lower than 1GB - if ($memoryLimit != -1 && $memoryInBytes($memoryLimit) < 1024 * 1024 * 1024) { - @ini_set('memory_limit', '1G'); + // Increase memory_limit if it is lower than 1.5GB + if ($memoryLimit != -1 && $memoryInBytes($memoryLimit) < 1024 * 1024 * 1536) { + @ini_set('memory_limit', '1536M'); } unset($memoryInBytes, $memoryLimit); } diff --git a/src/Composer/Util/IniHelper.php b/src/Composer/Util/IniHelper.php index f4eaa26f0..0dc0529a5 100644 --- a/src/Composer/Util/IniHelper.php +++ b/src/Composer/Util/IniHelper.php @@ -28,7 +28,7 @@ class IniHelper * * The equivalent of calling php_ini_loaded_file then php_ini_scanned_files. * The loaded ini location is the first entry and may be empty. - + * * @return array */ public static function getAll()