installer: Say "APCu" for PHP >= 5.5

Pre-PHP 5.5 the extension was called "APC", and provided opcode caching
and userland object caching. In 5.5, the opcode caching was built-in to
PHP, and the userland object caching was moved into an extension named
"APCu".

Bug: T61998
Change-Id: Id6f4a87bfdb59b2592a56aea9450611238e313ad

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index b863adc..ea700c7 100644 (file)
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -883,7 +883,13 @@ abstract class Installer {
                }
 
                if ( !$caches ) {
-                       $this->showMessage( 'config-no-cache' );
+                       $key = 'config-no-cache';
+                       // PHP >=5.5 is called APCu, earlier versions use APC (T61998).
+                       if ( !wfIsHHVM() && version_compare( PHP_VERSION, '5.5', '>=' ) ) {
+                               // config-no-cache-apcu
+                               $key .= '-apcu';
+                       }
+                       $this->showMessage( $key );
                }
 
                $this->setVar( '_Caches', $caches );

diff --git a/includes/installer/i18n/en.json b/includes/installer/i18n/en.json
index ac3178f..f2ec7a7 100644 (file)
--- a/includes/installer/i18n/en.json
+++ b/includes/installer/i18n/en.json
@@ -69,6 +69,7 @@
        "config-apc": "[http://www.php.net/apc APC] is installed",
        "config-wincache": "[http://www.iis.net/download/WinCacheForPhp WinCache] is installed",
        "config-no-cache": "<strong>Warning:</strong> Could not find [http://www.php.net/apc APC], [http://xcache.lighttpd.net/ XCache] or [http://www.iis.net/download/WinCacheForPhp WinCache].\nObject caching is not enabled.",
+       "config-no-cache-apcu": "<strong>Warning:</strong> Could not find [http://www.php.net/apcu APCu], [http://xcache.lighttpd.net/ XCache] or [http://www.iis.net/download/WinCacheForPhp WinCache].\nObject caching is not enabled.",
        "config-mod-security": "<strong>Warning:</strong> Your web server has [http://modsecurity.org/ mod_security]/mod_security2 enabled. Many common configurations of this will cause problems for MediaWiki and other software that allows users to post arbitrary content.\nIf possible, this should be disabled. Otherwise, refer to [http://modsecurity.org/documentation/ mod_security documentation] or contact your host's support if you encounter random errors.",
        "config-diff3-bad": "GNU diff3 not found.",
        "config-git": "Found the Git version control software: <code>$1</code>.",

diff --git a/includes/installer/i18n/qqq.json b/includes/installer/i18n/qqq.json
index bb42d88..372b228 100644 (file)
--- a/includes/installer/i18n/qqq.json
+++ b/includes/installer/i18n/qqq.json
@@ -87,6 +87,7 @@
        "config-apc": "Message indicates if this program is available",
        "config-wincache": "Message indicates if this program is available",
        "config-no-cache": "Status message in the MediaWiki installer environment checks.",
+       "config-no-cache-apcu": "Status message in the MediaWiki installer environment checks.",
        "config-mod-security": "Status message in the MediaWiki installer environment checks.",
        "config-diff3-bad": "Status message in the MediaWiki installer environment checks.",
        "config-git": "Message if Git version control software is available.\nParameter:\n* $1 is the <code>Git</code> executable file name.",