public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Bump memory limit to 1.5G

pull/6023/head
Jordi Boggiano 2016-12-31 16:29:31 +01:00
parent ab4322148f
commit 0bc75c3fb6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/composer
View File

@ -41,9 +41,9 @@ if (function_exists('ini_set')) {
}; };
$memoryLimit = trim(ini_get('memory_limit')); $memoryLimit = trim(ini_get('memory_limit'));
// Increase memory_limit if it is lower than 1GB // Increase memory_limit if it is lower than 1.5GB
if ($memoryLimit != -1 && $memoryInBytes($memoryLimit) < 1024 * 1024 * 1024) { if ($memoryLimit != -1 && $memoryInBytes($memoryLimit) < 1024 * 1024 * 1536) {
@ini_set('memory_limit', '1G'); @ini_set('memory_limit', '1536M');
} }
unset($memoryInBytes, $memoryLimit); unset($memoryInBytes, $memoryLimit);
} }

2
src/Composer/Util/IniHelper.php
View File

@ -28,7 +28,7 @@ class IniHelper
* *
* The equivalent of calling php_ini_loaded_file then php_ini_scanned_files. * 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. * The loaded ini location is the first entry and may be empty.
*
* @return array * @return array
*/ */
public static function getAll() public static function getAll()