From d169c1fa495de8a42aa5c007cf0972bf53d712e1 Mon Sep 17 00:00:00 2001 From: Aleksandr Fedotov Date: Sun, 24 May 2020 19:40:31 +0300 Subject: [PATCH] Add support for apcu_bc Test: apcu_bc --- data/supported-extensions | 1 + install-php-extensions | 12 ++++++++++++ scripts/check-installed-extension.php | 1 + 3 files changed, 14 insertions(+) diff --git a/data/supported-extensions b/data/supported-extensions index 2b9f871..006cc0c 100644 --- a/data/supported-extensions +++ b/data/supported-extensions @@ -1,5 +1,6 @@ amqp 5.5 5.6 7.0 7.1 7.2 7.3 7.4 apcu 5.5 5.6 7.0 7.1 7.2 7.3 7.4 +apcu_bc 7.0 7.1 7.2 7.3 7.4 bcmath 5.5 5.6 7.0 7.1 7.2 7.3 7.4 bz2 5.5 5.6 7.0 7.1 7.2 7.3 7.4 calendar 5.5 5.6 7.0 7.1 7.2 7.3 7.4 diff --git a/install-php-extensions b/install-php-extensions index f7a2d9e..a1a752e 100755 --- a/install-php-extensions +++ b/install-php-extensions @@ -138,6 +138,14 @@ processCommandArguments() { # Output: # Nothing sortModulesToInstall() { + if stringInList 'apcu_bc' "$PHP_MODULES_TO_INSTALL"; then + PHP_MODULES_TO_INSTALL="$(removeStringFromList 'apcu_bc' "$PHP_MODULES_TO_INSTALL")" + sortModulesToInstall_alreadyInstalled="$(getPHPInstalledModules)" + if ! stringInList 'apcu' "$PHP_MODULES_TO_INSTALL" && ! stringInList 'apcu' "$sortModulesToInstall_alreadyInstalled"; then + PHP_MODULES_TO_INSTALL="$PHP_MODULES_TO_INSTALL apcu" + fi + PHP_MODULES_TO_INSTALL="$PHP_MODULES_TO_INSTALL apcu_bc" + fi if stringInList 'igbinary' "$PHP_MODULES_TO_INSTALL"; then PHP_MODULES_TO_INSTALL="$(removeStringFromList 'igbinary' "$PHP_MODULES_TO_INSTALL")" if test -z "$PHP_MODULES_TO_INSTALL"; then @@ -1302,6 +1310,10 @@ installPECLModule() { printf "$installPECLModule_stdin" | pecl install "$installPECLModule_actual" fi case "$2" in + apcu_bc) + # apcu_bc must be loaded after apcu + docker-php-ext-enable --ini-name "xx-php-ext-$2.ini" apc + ;; http) # http must be loaded after raphf and propro docker-php-ext-enable --ini-name "xx-php-ext-$2.ini" "$2" diff --git a/scripts/check-installed-extension.php b/scripts/check-installed-extension.php index 6dea070..96e3444 100644 --- a/scripts/check-installed-extension.php +++ b/scripts/check-installed-extension.php @@ -4,6 +4,7 @@ $rc = 0; $numTestedExtensions = 0; $nameMap = [ 'opcache' => 'Zend OPcache', + 'apcu_bc' => 'apc', ]; $testsDir = __DIR__ . '/tests'; function runTest($testFile)