mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
3873e4ba00
See https://github.com/silverstripe/silverstripe-framework/pull/7037 and https://github.com/silverstripe/silverstripe-framework/issues/6681 Squashed commit of the following: commit8f65e56532
Author: Ingo Schommer <me@chillu.com> Date: Thu Jun 22 22:25:50 2017 +1200 Fixed upgrade guide spelling commit76f95944fa
Author: Damian Mooyman <damian@silverstripe.com> Date: Thu Jun 22 16:38:34 2017 +1200 BUG Fix non-test class manifest including sapphiretest / functionaltest commit9379834cb4
Author: Damian Mooyman <damian@silverstripe.com> Date: Thu Jun 22 15:50:47 2017 +1200 BUG Fix nesting bug in Kernel commit188ce35d82
Author: Damian Mooyman <damian@silverstripe.com> Date: Thu Jun 22 15:14:51 2017 +1200 BUG fix db bootstrapping issues commit7ed4660e7a
Author: Damian Mooyman <damian@silverstripe.com> Date: Thu Jun 22 14:49:07 2017 +1200 BUG Fix issue in DetailedErrorFormatter commit738f50c497
Author: Damian Mooyman <damian@silverstripe.com> Date: Thu Jun 22 11:49:19 2017 +1200 Upgrading notes on mysite/_config.php commit6279d28e5e
Author: Damian Mooyman <damian@silverstripe.com> Date: Thu Jun 22 11:43:28 2017 +1200 Update developer documentation commit5c90d53a84
Author: Damian Mooyman <damian@silverstripe.com> Date: Thu Jun 22 10:48:44 2017 +1200 Update installer to not use global databaseConfig commitf9b2ba4755
Author: Damian Mooyman <damian@silverstripe.com> Date: Wed Jun 21 21:04:39 2017 +1200 Fix behat issues commit5b59a912b6
Author: Damian Mooyman <damian@silverstripe.com> Date: Wed Jun 21 17:07:11 2017 +1200 Move HTTPApplication to SilverStripe\Control namespace commite2c4a18f63
Author: Damian Mooyman <damian@silverstripe.com> Date: Wed Jun 21 16:29:03 2017 +1200 More documentation Fix up remaining tests Refactor temp DB into TempDatabase class so it’s available outside of unit tests. commit5d235e64f3
Author: Damian Mooyman <damian@silverstripe.com> Date: Wed Jun 21 12:13:15 2017 +1200 API HTTPRequestBuilder::createFromEnvironment() now cleans up live globals BUG Fix issue with SSViewer Fix Security / View tests commitd88d4ed4e4
Author: Damian Mooyman <damian@silverstripe.com> Date: Tue Jun 20 16:39:43 2017 +1200 API Refactor AppKernel into CoreKernel commitf7946aec33
Author: Damian Mooyman <damian@silverstripe.com> Date: Tue Jun 20 16:00:40 2017 +1200 Docs and minor cleanup commit12bd31f936
Author: Damian Mooyman <damian@silverstripe.com> Date: Tue Jun 20 15:34:34 2017 +1200 API Remove OutputMiddleware API Move environment / global / ini management into Environment class API Move getTempFolder into TempFolder class API Implement HTTPRequestBuilder / CLIRequestBuilder BUG Restore SS_ALLOWED_HOSTS check in original location API CoreKernel now requires $basePath to be passed in API Refactor installer.php to use application to bootstrap API move memstring conversion globals to Convert BUG Fix error in CoreKernel nesting not un-nesting itself properly. commitbba9791146
Author: Damian Mooyman <damian@silverstripe.com> Date: Mon Jun 19 18:07:53 2017 +1200 API Create HTTPMiddleware and standardise middleware for request handling commit2a10c2397b
Author: Damian Mooyman <damian@silverstripe.com> Date: Mon Jun 19 17:42:42 2017 +1200 Fixed ORM tests commitd75a8d1d93
Author: Damian Mooyman <damian@silverstripe.com> Date: Mon Jun 19 17:15:07 2017 +1200 FIx i18n tests commit06364af3c3
Author: Damian Mooyman <damian@silverstripe.com> Date: Mon Jun 19 16:59:34 2017 +1200 Fix controller namespace Move states to sub namespace commit2a278e2953
Author: Damian Mooyman <damian@silverstripe.com> Date: Mon Jun 19 12:49:45 2017 +1200 Fix forms namespace commitb65c21241b
Author: Damian Mooyman <damian@silverstripe.com> Date: Thu Jun 15 18:56:48 2017 +1200 Update API usages commitd1d4375c95
Author: Damian Mooyman <damian@silverstripe.com> Date: Thu Jun 15 18:41:44 2017 +1200 API Refactor $flush into HTPPApplication API Enforce health check in Controller::pushCurrent() API Better global backup / restore Updated Director::test() to use new API commitb220534f06
Author: Damian Mooyman <damian@silverstripe.com> Date: Tue Jun 13 22:05:57 2017 +1200 Move app nesting to a test state helper commit603704165c
Author: Damian Mooyman <damian@silverstripe.com> Date: Tue Jun 13 21:46:04 2017 +1200 Restore kernel stack to fix multi-level nesting commit2f6336a15b
Author: Damian Mooyman <damian@silverstripe.com> Date: Tue Jun 13 17:23:21 2017 +1200 API Implement kernel nesting commitfc7188da7d
Author: Damian Mooyman <damian@silverstripe.com> Date: Tue Jun 13 15:43:13 2017 +1200 Fix core tests commita0ae723514
Author: Damian Mooyman <damian@silverstripe.com> Date: Tue Jun 13 15:23:52 2017 +1200 Fix manifest tests commitca03395251
Author: Damian Mooyman <damian@silverstripe.com> Date: Tue Jun 13 15:00:00 2017 +1200 API Move extension management into test state commitc66d433977
Author: Damian Mooyman <damian@silverstripe.com> Date: Tue Jun 13 14:10:59 2017 +1200 API Refactor SapphireTest state management into SapphireTestState API Remove Injector::unregisterAllObjects() API Remove FakeController commitf26ae75c6e
Author: Damian Mooyman <damian@silverstripe.com> Date: Mon Jun 12 18:04:34 2017 +1200 Implement basic CLI application object commit001d559662
Author: Damian Mooyman <damian@silverstripe.com> Date: Mon Jun 12 17:39:38 2017 +1200 Remove references to SapphireTest::is_running_test() Upgrade various code commitde079c041d
Author: Damian Mooyman <damian@silverstripe.com> Date: Wed Jun 7 18:07:33 2017 +1200 API Implement APP object API Refactor of Session
98 lines
3.3 KiB
PHP
98 lines
3.3 KiB
PHP
<?php
|
|
|
|
namespace SilverStripe\Core\Tests;
|
|
|
|
use SilverStripe\Core\Environment;
|
|
use SilverStripe\Dev\SapphireTest;
|
|
|
|
class MemoryLimitTest extends SapphireTest
|
|
{
|
|
protected $origMemLimitMax;
|
|
protected $origTimeLimitMax;
|
|
protected $origMemLimit;
|
|
protected $origTimeLimit;
|
|
|
|
protected function setUp()
|
|
{
|
|
parent::setUp();
|
|
|
|
// see http://www.hardened-php.net/suhosin/configuration.html#suhosin.memory_limit
|
|
if (in_array('suhosin', get_loaded_extensions())) {
|
|
$this->markTestSkipped("This test cannot be run with suhosin installed");
|
|
} else {
|
|
$this->origMemLimit = ini_get('memory_limit');
|
|
$this->origTimeLimit = ini_get('max_execution_time');
|
|
$this->origMemLimitMax = Environment::getMemoryLimitMax();
|
|
$this->origTimeLimitMax = Environment::getTimeLimitMax();
|
|
Environment::setMemoryLimitMax(null);
|
|
Environment::setTimeLimitMax(null);
|
|
}
|
|
}
|
|
|
|
protected function tearDown()
|
|
{
|
|
if (!in_array('suhosin', get_loaded_extensions())) {
|
|
ini_set('memory_limit', $this->origMemLimit);
|
|
set_time_limit($this->origTimeLimit);
|
|
Environment::setMemoryLimitMax($this->origMemLimitMax);
|
|
Environment::setTimeLimitMax($this->origTimeLimitMax);
|
|
}
|
|
parent::tearDown();
|
|
}
|
|
|
|
public function testIncreaseMemoryLimitTo()
|
|
{
|
|
ini_set('memory_limit', '64M');
|
|
Environment::setMemoryLimitMax('256M');
|
|
|
|
// It can go up
|
|
Environment::increaseMemoryLimitTo('128M');
|
|
$this->assertEquals('128M', ini_get('memory_limit'));
|
|
|
|
// But not down
|
|
Environment::increaseMemoryLimitTo('64M');
|
|
$this->assertEquals('128M', ini_get('memory_limit'));
|
|
|
|
// Test the different kinds of syntaxes
|
|
Environment::increaseMemoryLimitTo(1024*1024*200);
|
|
$this->assertEquals('200M', ini_get('memory_limit'));
|
|
|
|
Environment::increaseMemoryLimitTo('109600K');
|
|
$this->assertEquals('200M', ini_get('memory_limit'));
|
|
|
|
// Attempting to increase past max size only sets to max
|
|
Environment::increaseMemoryLimitTo('1G');
|
|
$this->assertEquals('256M', ini_get('memory_limit'));
|
|
|
|
// No argument means unlimited (but only if originally allowed)
|
|
if (is_numeric($this->origMemLimitMax) && $this->origMemLimitMax < 0) {
|
|
Environment::increaseMemoryLimitTo();
|
|
$this->assertEquals(-1, ini_get('memory_limit'));
|
|
}
|
|
}
|
|
|
|
public function testIncreaseTimeLimitTo()
|
|
{
|
|
// Can't change time limit
|
|
if (!set_time_limit(6000)) {
|
|
$this->markTestSkipped("Cannot change time limit");
|
|
}
|
|
|
|
// It can go up
|
|
$this->assertTrue(Environment::increaseTimeLimitTo(7000));
|
|
$this->assertEquals(7000, ini_get('max_execution_time'));
|
|
|
|
// But not down
|
|
$this->assertTrue(Environment::increaseTimeLimitTo(5000));
|
|
$this->assertEquals(7000, ini_get('max_execution_time'));
|
|
|
|
// 0/nothing means infinity
|
|
$this->assertTrue(Environment::increaseTimeLimitTo());
|
|
$this->assertEquals(0, ini_get('max_execution_time'));
|
|
|
|
// Can't go down from there
|
|
$this->assertTrue(Environment::increaseTimeLimitTo(10000));
|
|
$this->assertEquals(0, ini_get('max_execution_time'));
|
|
}
|
|
}
|