[ClassLoader] Use symfony/polyfill-apcu

nicolas-grekas · nicolas-grekas · commit 586b9d535957 · 2016-01-14T09:18:48.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -38,8 +38,9 @@ before_install:
     - echo session.gc_probability = 0 >> $INI_FILE
     - if [[ $TRAVIS_PHP_VERSION = 5.* ]]; then echo extension = mongo.so >> $INI_FILE; fi;
     - if [[ $TRAVIS_PHP_VERSION = 5.* ]]; then echo extension = memcache.so >> $INI_FILE; fi;
-    - if [[ $TRAVIS_PHP_VERSION = 5.* ]]; then (echo yes | pecl install -f apcu-4.0.10 && echo apc.enable_cli = 1 >> $INI_FILE) || echo "Let's continue without apcu extension"; fi;
-    - if [[ $TRAVIS_PHP_VERSION = 5.* ]]; then pecl install -f memcached-2.1.0 || echo "Let's continue without memcached extension"; fi;
+    - if [[ $TRAVIS_PHP_VERSION = 5.* ]]; then (echo yes | pecl install -f apcu-4.0.10 && echo apc.enable_cli = 1 >> $INI_FILE); fi;
+    - if [[ $TRAVIS_PHP_VERSION = 7.* ]]; then (echo yes | pecl install -f apcu-5.1.2 && echo apc.enable_cli = 1 >> $INI_FILE); fi;
+    - if [[ $TRAVIS_PHP_VERSION = 5.* ]]; then pecl install -f memcached-2.1.0; fi;
     - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo extension = ldap.so >> $INI_FILE; fi;
     - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi;
     - if [[ $TRAVIS_REPO_SLUG = symfony/symfony ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
diff --git a/composer.json b/composer.json
@@ -18,6 +18,7 @@
     "require": {
         "php": ">=5.3.3",
         "doctrine/common": "~2.4",
+        "symfony/polyfill-apcu": "~1.0,>=1.0.2",
         "twig/twig": "~1.23|~2.0",
         "psr/log": "~1.0"
     },
diff --git a/src/Symfony/Component/ClassLoader/ApcClassLoader.php b/src/Symfony/Component/ClassLoader/ApcClassLoader.php
@@ -67,7 +67,7 @@ class ApcClassLoader
      */
     public function __construct($prefix, $decorated)
     {
-        if (!extension_loaded('apc')) {
+        if (!ini_get('apc.enabled') || ('cli' === PHP_SAPI && !ini_get('apc.enable_cli'))) {
             throw new \RuntimeException('Unable to use ApcClassLoader as APC is not enabled.');
         }
 
@@ -122,8 +122,8 @@ public function loadClass($class)
      */
     public function findFile($class)
     {
-        if (false === $file = apc_fetch($this->prefix.$class)) {
-            apc_store($this->prefix.$class, $file = $this->decorated->findFile($class));
+        if (false === $file = apcu_fetch($this->prefix.$class)) {
+            apcu_store($this->prefix.$class, $file = $this->decorated->findFile($class));
         }
 
         return $file;
diff --git a/src/Symfony/Component/ClassLoader/composer.json b/src/Symfony/Component/ClassLoader/composer.json
@@ -17,7 +17,8 @@
     ],
     "minimum-stability": "dev",
     "require": {
-        "php": ">=5.3.3"
+        "php": ">=5.3.3",
+        "symfony/polyfill-apcu": "~1.0,>=1.0.2"
     },
     "require-dev": {
         "symfony/finder": "~2.0,>=2.0.5"

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ class ApcClassLoader`
`67`	`67`	`*/`
`68`	`68`	`public function __construct($prefix, $decorated)`
`69`	`69`	`{`
`70`		`- if (!extension_loaded('apc')) {`
	`70`	`+ if (!ini_get('apc.enabled') \|\| ('cli' === PHP_SAPI && !ini_get('apc.enable_cli'))) {`
`71`	`71`	`throw new \RuntimeException('Unable to use ApcClassLoader as APC is not enabled.');`
`72`	`72`	`}`
`73`	`73`
`@@ -122,8 +122,8 @@ public function loadClass($class)`
`122`	`122`	`*/`
`123`	`123`	`public function findFile($class)`
`124`	`124`	`{`
`125`		`- if (false === $file = apc_fetch($this->prefix.$class)) {`
`126`		`- apc_store($this->prefix.$class, $file = $this->decorated->findFile($class));`
	`125`	`+ if (false === $file = apcu_fetch($this->prefix.$class)) {`
	`126`	`+ apcu_store($this->prefix.$class, $file = $this->decorated->findFile($class));`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`return $file;`