diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor #17396 [ClassLoader] Use symfony/polyfill-apcu (gapple)

Browse Source 
This PR was merged into the 2.3 branch.

Discussion
----------

[ClassLoader] Use symfony/polyfill-apcu

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

#17358 updated ApcClassLoader to use polyfill-apcu, but not ApcUniversalClassLoader

2.7 / 2.8 tests are in LegacyApcUniversalClassLoaderTest

Commits
-------

a0dc399 [ClassLoader] Use symfony/polyfill-apcu
This commit is contained in:
Fabien Potencier 2016-01-25 12:06:45 +01:00
commit 11257ee89a
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
View File

@ -71,7 +71,7 @@ class ApcUniversalClassLoader extends UniversalClassLoader
*/ */
public function __construct($prefix) 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.'); throw new \RuntimeException('Unable to use ApcUniversalClassLoader as APC is not enabled.');
} }
@ -87,8 +87,8 @@ class ApcUniversalClassLoader extends UniversalClassLoader
*/ */
public function findFile($class) public function findFile($class)
{ {
if (false === $file = apc_fetch($this->prefix.$class)) { if (false === $file = apcu_fetch($this->prefix.$class)) {
apc_store($this->prefix.$class, $file = parent::findFile($class)); apcu_store($this->prefix.$class, $file = parent::findFile($class));
} }
return $file; return $file;

9
src/Symfony/Component/ClassLoader/Tests/ApcUniversalClassLoaderTest.php
View File

@ -13,15 +13,12 @@ namespace Symfony\Component\ClassLoader\Tests;
use Symfony\Component\ClassLoader\ApcUniversalClassLoader; use Symfony\Component\ClassLoader\ApcUniversalClassLoader;
/**
* @requires extension apc
*/
class ApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase class ApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
{ {
protected function setUp() protected function setUp()
{ {
if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) { if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) {
apc_clear_cache('user'); apcu_clear_cache();
} else { } else {
$this->markTestSkipped('APC is not enabled.'); $this->markTestSkipped('APC is not enabled.');
} }
@ -30,7 +27,7 @@ class ApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
protected function tearDown() protected function tearDown()
{ {
if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) { if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) {
apc_clear_cache('user'); apcu_clear_cache();
} }
} }
@ -39,7 +36,7 @@ class ApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
$loader = new ApcUniversalClassLoader('test.prefix.'); $loader = new ApcUniversalClassLoader('test.prefix.');
$loader->registerNamespace('Apc\Namespaced', __DIR__.DIRECTORY_SEPARATOR.'Fixtures'); $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');
} }
/** /**