Merge branch '3.8'

Conflicts:
	tests/classes/PhraseanetPHPUnitAbstract.php
This commit is contained in:
Romain Neutron
2014-03-05 11:06:48 +01:00

View File

@@ -80,6 +80,8 @@ abstract class PhraseanetTestCase extends WebTestCase
ini_set('memory_limit', '4096M');
error_reporting(-1);
set_exception_handler(null);
\PHPUnit_Framework_Error_Warning::$enabled = true;
\PHPUnit_Framework_Error_Notice::$enabled = true;