[ClassLoader] Use symfony/polyfill-apcu

gapple · Geoff Appleby · commit 29bc90ddd8b7 · 2016-01-15T15:40:15.000-08:00
diff --git a/src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php b/src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
@@ -71,7 +71,7 @@ class ApcUniversalClassLoader extends UniversalClassLoader
      */
     public function __construct($prefix)
     {
-        if (!extension_loaded('apc')) {
+        if (!function_exists('apcu_fetch')) {
             throw new \RuntimeException('Unable to use ApcUniversalClassLoader as APC is not enabled.');
         }
 
@@ -87,8 +87,8 @@ public function __construct($prefix)
      */
     public function findFile($class)
     {
-        if (false === $file = apc_fetch($this->prefix.$class)) {
-            apc_store($this->prefix.$class, $file = parent::findFile($class));
+        if (false === $file = apcu_fetch($this->prefix.$class)) {
+            apcu_store($this->prefix.$class, $file = parent::findFile($class));
         }
 
         return $file;
diff --git a/src/Symfony/Component/ClassLoader/Tests/ApcUniversalClassLoaderTest.php b/src/Symfony/Component/ClassLoader/Tests/ApcUniversalClassLoaderTest.php
@@ -14,14 +14,14 @@
 use Symfony\Component\ClassLoader\ApcUniversalClassLoader;
 
 /**
- * @requires extension apc
+ *
  */
 class ApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()
     {
         if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) {
-            apc_clear_cache('user');
+            apcu_clear_cache();
         } else {
             $this->markTestSkipped('APC is not enabled.');
         }
@@ -30,7 +30,7 @@ protected function setUp()
     protected function tearDown()
     {
         if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) {
-            apc_clear_cache('user');
+            apcu_clear_cache();
         }
     }
 
@@ -39,7 +39,7 @@ public function testConstructor()
         $loader = new ApcUniversalClassLoader('test.prefix.');
         $loader->registerNamespace('Apc\Namespaced', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
 
-        $this->assertEquals($loader->findFile('\Apc\Namespaced\FooBar'), apc_fetch('test.prefix.\Apc\Namespaced\FooBar'), '__construct() takes a prefix as its first argument');
+        $this->assertEquals($loader->findFile('\Apc\Namespaced\FooBar'), apcu_fetch('test.prefix.\Apc\Namespaced\FooBar'), '__construct() takes a prefix as its first argument');
     }
 
    /**

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ class ApcUniversalClassLoader extends UniversalClassLoader`
`71`	`71`	`*/`
`72`	`72`	`public function __construct($prefix)`
`73`	`73`	`{`
`74`		`- if (!extension_loaded('apc')) {`
	`74`	`+ if (!function_exists('apcu_fetch')) {`
`75`	`75`	`throw new \RuntimeException('Unable to use ApcUniversalClassLoader as APC is not enabled.');`
`76`	`76`	`}`
`77`	`77`
`@@ -87,8 +87,8 @@ public function __construct($prefix)`
`87`	`87`	`*/`
`88`	`88`	`public function findFile($class)`
`89`	`89`	`{`
`90`		`- if (false === $file = apc_fetch($this->prefix.$class)) {`
`91`		`- apc_store($this->prefix.$class, $file = parent::findFile($class));`
	`90`	`+ if (false === $file = apcu_fetch($this->prefix.$class)) {`
	`91`	`+ apcu_store($this->prefix.$class, $file = parent::findFile($class));`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`return $file;`
Original file line number	Diff line number	Diff line change
`@@ -14,14 +14,14 @@`
`14`	`14`	`use Symfony\Component\ClassLoader\ApcUniversalClassLoader;`
`15`	`15`
`16`	`16`	`/**`
`17`		`- * @requires extension apc`
	`17`	`+ *`
`18`	`18`	`*/`
`19`	`19`	`class ApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase`
`20`	`20`	`{`
`21`	`21`	`protected function setUp()`
`22`	`22`	`{`
`23`	`23`	`if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) {`
`24`		`- apc_clear_cache('user');`
	`24`	`+ apcu_clear_cache();`
`25`	`25`	`} else {`
`26`	`26`	`$this->markTestSkipped('APC is not enabled.');`
`27`	`27`	`}`
`@@ -30,7 +30,7 @@ protected function setUp()`
`30`	`30`	`protected function tearDown()`
`31`	`31`	`{`
`32`	`32`	`if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) {`
`33`		`- apc_clear_cache('user');`
	`33`	`+ apcu_clear_cache();`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
`@@ -39,7 +39,7 @@ public function testConstructor()`
`39`	`39`	`$loader = new ApcUniversalClassLoader('test.prefix.');`
`40`	`40`	`$loader->registerNamespace('Apc\Namespaced', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');`
`41`	`41`
`42`		`- $this->assertEquals($loader->findFile('\Apc\Namespaced\FooBar'), apc_fetch('test.prefix.\Apc\Namespaced\FooBar'), '__construct() takes a prefix as its first argument');`
	`42`	`+ $this->assertEquals($loader->findFile('\Apc\Namespaced\FooBar'), apcu_fetch('test.prefix.\Apc\Namespaced\FooBar'), '__construct() takes a prefix as its first argument');`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`/**`