Compare commits

...

2 Commits

Author SHA1 Message Date
Fabien Potencier
517ab0554b Merge branch '2.7' into 2.8
* 2.7:
  [2.7] Fix tests
  pass triggerDeprecationError arg to parent class
  remove default null value for asset version
  remove duplicated value
  [DependencyInjection] simplify the BC layer
  Change couple of occurences of a public setUp() method to protected
2016-01-30 16:58:35 +01:00
Paráda József
283e453827 [2.7] Fix tests 2016-01-30 16:53:18 +01:00

View File

@@ -21,7 +21,7 @@ class LegacyApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) {
apcu_clear_cache('user');
apcu_clear_cache();
} else {
$this->markTestSkipped('APC is not enabled.');
}
@@ -30,7 +30,7 @@ class LegacyApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
protected function tearDown()
{
if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) {
apcu_clear_cache('user');
apcu_clear_cache();
}
}