diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index 145a67195a5121851355f2e9574ae1f3e2074af7..27494e744b096730b631cf52ad46c2678bfa2c24 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -26,8 +26,11 @@ /** * Minimum recommended value of PHP memory_limit. + * + * @todo Reduce the memory required to install on some environments in + * https://www.drupal.org/node/2289201 and then decrease this limit. */ -const DRUPAL_MINIMUM_PHP_MEMORY_LIMIT = '32M'; +const DRUPAL_MINIMUM_PHP_MEMORY_LIMIT = '64M'; /** * Error reporting level: display no errors. diff --git a/core/modules/simpletest/simpletest.install b/core/modules/simpletest/simpletest.install index 3b2226ebeb642adbd84b75ef38768d0303754a9a..0094e53314e6b8ee7b22f016bdd0ec244fcf1741 100644 --- a/core/modules/simpletest/simpletest.install +++ b/core/modules/simpletest/simpletest.install @@ -10,8 +10,12 @@ /** * Minimum value of PHP memory_limit for SimpleTest. + * + * @todo Reduce the memory required to use SimpleTest on some environments in + * https://www.drupal.org/node/2289201 and + * https://www.drupal.org/node/2307163 and then decrease this limit. */ -const SIMPLETEST_MINIMUM_PHP_MEMORY_LIMIT = '64M'; +const SIMPLETEST_MINIMUM_PHP_MEMORY_LIMIT = '320M'; /** * Implements hook_requirements(). @@ -57,7 +61,7 @@ function simpletest_requirements($phase) { // to load all tests and throw a fatal error. $memory_limit = ini_get('memory_limit'); if (!Environment::checkMemoryLimit(SIMPLETEST_MINIMUM_PHP_MEMORY_LIMIT, $memory_limit)) { - $requirements['php_memory_limit']['severity'] = REQUIREMENT_ERROR; + $requirements['php_memory_limit']['severity'] = REQUIREMENT_WARNING; $requirements['php_memory_limit']['description'] = t('The testing framework requires the PHP memory limit to be at least %memory_minimum_limit. The current value is %memory_limit. <a href="@url">Follow these steps to continue</a>.', array('%memory_limit' => $memory_limit, '%memory_minimum_limit' => SIMPLETEST_MINIMUM_PHP_MEMORY_LIMIT, '@url' => 'http://drupal.org/node/207036')); }