diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-08-10 14:26:57 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2016-08-10 14:26:57 +0200 |
| commit | c4bd43432df03e4f4835c7689c8ed722cd2c3020 (patch) | |
| tree | 5603166833d78b0581bbe880adb53b6de085719d /tests/Bootstrap.php | |
| parent | 488ad40ba334ca506f07bede97724726eac2b27f (diff) | |
| parent | 9180a1264dc536c34e5cc8a0e44bb399a8ba484f (diff) | |
Merge branch '3.1-stable' into develop
Diffstat (limited to 'tests/Bootstrap.php')
| -rw-r--r-- | tests/Bootstrap.php | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index 8240d2340..b4e56bdae 100644 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -1,10 +1,4 @@ <?php -// For some reason, setting this fixes the 5.2 tests but breaks the 5.3 ones ... -if (version_compare(PHP_VERSION, '5.3.0', '<')) -{ - ini_set('memory_limit', '128M'); -} - // Errors on full! ini_set('display_errors', 1); error_reporting(E_ALL | E_STRICT); |