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

Merge pull request #9208 from simonberger/cleanup-memory-limit-logic 

Cleaned up memory_limit set logic
pull/9232/head
Jordi Boggiano 2020-09-14 21:26:48 +02:00 committed by GitHub
parent 99300f6dc0 3aadbaa6c4
commit bd2f321527
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/composer
View File

@ -26,6 +26,10 @@ if (defined('HHVM_VERSION') && version_compare(HHVM_VERSION, '4.0', '>=')) {
if (function_exists('ini_set')) { if (function_exists('ini_set')) {
@ini_set('display_errors', 1); @ini_set('display_errors', 1);
// Set user defined memory limit
if ($memoryLimit = getenv('COMPOSER_MEMORY_LIMIT')) {
@ini_set('memory_limit', $memoryLimit);
} else {
$memoryInBytes = function ($value) { $memoryInBytes = function ($value) {
$unit = strtolower(substr($value, -1, 1)); $unit = strtolower(substr($value, -1, 1));
$value = (int) $value; $value = (int) $value;
@ -48,11 +52,9 @@ if (function_exists('ini_set')) {
if ($memoryLimit != -1 && $memoryInBytes($memoryLimit) < 1024 * 1024 * 1536) { if ($memoryLimit != -1 && $memoryInBytes($memoryLimit) < 1024 * 1024 * 1536) {
@ini_set('memory_limit', '1536M'); @ini_set('memory_limit', '1536M');
} }
// Set user defined memory limit unset($memoryInBytes);
if ($memoryLimit = getenv('COMPOSER_MEMORY_LIMIT')) {
@ini_set('memory_limit', $memoryLimit);
} }
unset($memoryInBytes, $memoryLimit); unset($memoryLimit);
} }
putenv('COMPOSER_BINARY='.realpath($_SERVER['argv'][0])); putenv('COMPOSER_BINARY='.realpath($_SERVER['argv'][0]));