Fix merge

nicolas-grekas · nicolas-grekas · commit d36e28419250 · 2015-10-12T11:27:31.000+02:00
diff --git a/src/Symfony/Component/ClassLoader/Tests/ApcClassLoaderTest.php b/src/Symfony/Component/ClassLoader/Tests/ApcClassLoaderTest.php
@@ -21,10 +21,10 @@ class ApcClassLoaderTest extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()
     {
-        if (!(ini_get('apc.enabled') && ini_get('apc.enable_cli'))) {
-            $this->markTestSkipped('The apc extension is available, but not enabled.');
-        } else {
+        if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) {
             apc_clear_cache('user');
+        } else {
+            $this->markTestSkipped('APC is not enabled.');
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,10 @@ class ApcClassLoaderTest extends \PHPUnit_Framework_TestCase`
`21`	`21`	`{`
`22`	`22`	`protected function setUp()`
`23`	`23`	`{`
`24`		`- if (!(ini_get('apc.enabled') && ini_get('apc.enable_cli'))) {`
`25`		`- $this->markTestSkipped('The apc extension is available, but not enabled.');`
`26`		`- } else {`
	`24`	`+ if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) {`
`27`	`25`	`apc_clear_cache('user');`
	`26`	`+ } else {`
	`27`	`+ $this->markTestSkipped('APC is not enabled.');`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`