Skip to content
Browse files

merged branch pborreli/gc_memory (PR #6063)

This PR was squashed before being merged into the master branch (closes #6063).

Commits
-------

d3d8ff4 [travis-ci] Zend Garbage Collection only for PHP5.4

Discussion
----------

[travis-ci] Zend Garbage Collection only for PHP5.4
  • Loading branch information...
2 parents 6e8115a + d3d8ff4 commit 382d580ed0635a2667762930ea1a1df30ab52292 @fabpot fabpot committed Nov 19, 2012
Showing with 7 additions and 2 deletions.
  1. +0 −2 .travis.yml
  2. +6 −0 autoload.php.dist
  3. +1 −0 phpunit.xml.dist
View
2 .travis.yml
@@ -9,5 +9,3 @@ before_script:
- COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install
- php src/Symfony/Component/Locale/Resources/data/build-data.php
- export USE_INTL_ICU_DATA_VERSION=1
-
-script: phpunit -dzend.enable_gc=0
View
6 autoload.php.dist
@@ -1,5 +1,11 @@
<?php
+if (version_compare(PHP_VERSION, '5.4', '>=') && gc_enabled()) {
+ // Disabling Zend Garbage Collection to prevent segfaults with PHP5.4+
+ // https://bugs.php.net/bug.php?id=53976
+ gc_disable();
+}
+
$loader = require_once __DIR__.'/vendor/autoload.php';
use Doctrine\Common\Annotations\AnnotationRegistry;
View
1 phpunit.xml.dist
@@ -14,6 +14,7 @@
<php>
<ini name="intl.default_locale" value="en"/>
<ini name="intl.error_level" value="0"/>
+ <ini name="memory_limit" value="-1"/>
</php>
<testsuites>

0 comments on commit 382d580

Please sign in to comment.
Something went wrong with that request. Please try again.